|
|
@@ -133,22 +133,22 @@
|
|
|
{
|
|
|
width: 120,
|
|
|
title: '省',
|
|
|
- field: 'tmsShipmentProvince',
|
|
|
+ field: 'province',
|
|
|
},
|
|
|
{
|
|
|
width: 120,
|
|
|
title: '市',
|
|
|
- field: 'tmsShipmentCity',
|
|
|
+ field: 'city',
|
|
|
},
|
|
|
{
|
|
|
width: 150,
|
|
|
title: '县/区',
|
|
|
- field: 'tmsShipmentRegion',
|
|
|
+ field: 'region',
|
|
|
},
|
|
|
{
|
|
|
width: 150,
|
|
|
title: '街道',
|
|
|
- field: 'tmsShipmentStreet',
|
|
|
+ field: 'street',
|
|
|
},
|
|
|
{
|
|
|
width: 200,
|
|
|
@@ -321,7 +321,7 @@
|
|
|
address: [{
|
|
|
required: true, message: '请输入详细地址', trigger: 'blur'
|
|
|
}],
|
|
|
- tmsShipmentProvince: [{
|
|
|
+ province: [{
|
|
|
required: true, message: '请选择仓库地址', trigger: 'change'
|
|
|
}],
|
|
|
}
|
|
|
@@ -360,18 +360,18 @@
|
|
|
[{
|
|
|
labelWidth: '110px',
|
|
|
label: '仓库地址',
|
|
|
- prop: 'tmsShipmentProvince',
|
|
|
+ prop: 'province',
|
|
|
component: 'by-area',
|
|
|
compConfig: {
|
|
|
attr: {
|
|
|
- province: 'tmsShipmentProvince', //省
|
|
|
- provinceCode: 'tmsShipmentProvinceNo', //省编码
|
|
|
- city: 'tmsShipmentCity', //市
|
|
|
- cityCode: 'tmsShipmentCityNo', //市编码
|
|
|
- county: 'tmsShipmentRegion', //县/区
|
|
|
- countyCode: 'tmsShipmentRegionNo', //县/区编码
|
|
|
- town: 'tmsShipmentStreet', //街道
|
|
|
- townCode: 'tmsShipmentStreetNo', //街道编码
|
|
|
+ province: 'province', //省
|
|
|
+ provinceCode: 'provinceCode', //省编码
|
|
|
+ city: 'city', //市
|
|
|
+ cityCode: 'cityCode', //市编码
|
|
|
+ county: 'region', //县/区
|
|
|
+ countyCode: 'regionCode', //县/区编码
|
|
|
+ town: 'street', //街道
|
|
|
+ townCode: 'streetCode', //街道编码
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -640,10 +640,9 @@
|
|
|
}
|
|
|
// 打开编辑
|
|
|
openEdit(e : any) {
|
|
|
+ console.log(e);
|
|
|
this.popTitle = '编辑'
|
|
|
this.dialogFormVisible = true;
|
|
|
- e.tmsShipmentProvince = "北京市"
|
|
|
- e.tmsShipmentProvinceNo= "110000"
|
|
|
setTimeout(() => {
|
|
|
if ((this as any).$refs.addFormId) (this as any).$refs.addFormId.setValue(e);
|
|
|
}, 0)
|
AlanWong