|
@@ -25,9 +25,9 @@
|
|
<a-form-model-item label="收货客户名称" extra="如果收货客户和下单客户相同,则不需要选择收货客户名称">
|
|
<a-form-model-item label="收货客户名称" extra="如果收货客户和下单客户相同,则不需要选择收货客户名称">
|
|
<dealerSubareaScopeList ref="dealerSubareaScopeList" defValKey="buyerSn" @change="custChange" v-model="form.receiverSn" />
|
|
<dealerSubareaScopeList ref="dealerSubareaScopeList" defValKey="buyerSn" @change="custChange" v-model="form.receiverSn" />
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
- <a-form-model-item label="收货地址" prop="consigneeTel" v-if="form.receiverSn">
|
|
|
|
- <div>
|
|
|
|
- {{ chooseAddr }}
|
|
|
|
|
|
+ <a-form-model-item label="收货地址" prop="dealerRecevieAddressSn" v-if="form.receiverSn">
|
|
|
|
+ <div style="display:flex;">
|
|
|
|
+ <div style="width:80%;flex-grow:1;line-height: 24px;">{{ chooseAddr }}</div>
|
|
<a-button type="link" @click="openAddrModal = true">{{ addressVal }} >></a-button>
|
|
<a-button type="link" @click="openAddrModal = true">{{ addressVal }} >></a-button>
|
|
</div>
|
|
</div>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
@@ -97,20 +97,12 @@ export default {
|
|
buyerName: '',
|
|
buyerName: '',
|
|
receiverSn: '',
|
|
receiverSn: '',
|
|
receiverName: '',
|
|
receiverName: '',
|
|
- shippingAddrProvinceSn: '',
|
|
|
|
- shippingAddrProvinceName: '', // 省
|
|
|
|
- shippingAddrCitySn: '',
|
|
|
|
- shippingAddrCityName: '', // 市
|
|
|
|
- shippingAddrCountySn: '',
|
|
|
|
- shippingAddrCountyName: '', // 区
|
|
|
|
- shippingAddr: '', // 详细地址
|
|
|
|
- consigneeTel: '', // 联系电话
|
|
|
|
- consigneeName: '' // 联系人名称
|
|
|
|
|
|
+ dealerRecevieAddressSn: undefined // 地址sn
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
sendNo: [{ required: true, message: '请输入发货编号', trigger: 'change' }],
|
|
sendNo: [{ required: true, message: '请输入发货编号', trigger: 'change' }],
|
|
printStatus: [{ required: true, message: '请选择备货打印', trigger: 'change' }],
|
|
printStatus: [{ required: true, message: '请选择备货打印', trigger: 'change' }],
|
|
- consigneeTel: [ { required: true, message: '收货人手机号码不能为空', trigger: ['change', 'blur'] } ]
|
|
|
|
|
|
+ dealerRecevieAddressSn: [ { required: true, message: '请选择收货地址', trigger: ['change', 'blur'] } ]
|
|
},
|
|
},
|
|
detailData: null, // 详情数据
|
|
detailData: null, // 详情数据
|
|
addressVal: '选择地址', // 选择地址/更换地址
|
|
addressVal: '选择地址', // 选择地址/更换地址
|
|
@@ -153,15 +145,7 @@ export default {
|
|
if (id == this.addressId) {
|
|
if (id == this.addressId) {
|
|
this.chooseAddr = ''
|
|
this.chooseAddr = ''
|
|
this.addressVal = '选择地址'
|
|
this.addressVal = '选择地址'
|
|
- this.form.shippingAddrProvinceSn = ''
|
|
|
|
- this.form.shippingAddrProvinceName = ''// 省
|
|
|
|
- this.form.shippingAddrCitySn = ''
|
|
|
|
- this.form.shippingAddrCityName = '' // 市
|
|
|
|
- this.form.shippingAddrCountySn = ''
|
|
|
|
- this.form.shippingAddrCountyName = '' // 区
|
|
|
|
- this.form.shippingAddr = ''// 详细地址
|
|
|
|
- this.form.consigneeTel = '' // 联系电话
|
|
|
|
- this.form.consigneeName = ''
|
|
|
|
|
|
+ this.form.dealerRecevieAddressSn = undefined
|
|
}
|
|
}
|
|
},
|
|
},
|
|
// 保存
|
|
// 保存
|
|
@@ -179,21 +163,14 @@ export default {
|
|
},
|
|
},
|
|
// 地址保存
|
|
// 地址保存
|
|
handleOk (data) {
|
|
handleOk (data) {
|
|
|
|
+ console.log(data, 'chooseAddr')
|
|
this.chooseAddr = (data.consigneeName || '') + '(' + (data.consigneeTel || '-') + ')' + ' ' + (data.address || '')
|
|
this.chooseAddr = (data.consigneeName || '') + '(' + (data.consigneeTel || '-') + ')' + ' ' + (data.address || '')
|
|
this.addressVal = '更换地址'
|
|
this.addressVal = '更换地址'
|
|
- this.form.shippingAddrProvinceSn = data.provinceSn || ''
|
|
|
|
- this.form.shippingAddrProvinceName = data.provinceName || '' // 省
|
|
|
|
- this.form.shippingAddrCitySn = data.citySn || ''
|
|
|
|
- this.form.shippingAddrCityName = data.cityName || '' // 市
|
|
|
|
- this.form.shippingAddrCountySn = data.countySn || ''
|
|
|
|
- this.form.shippingAddrCountyName = data.countyName || '' // 区
|
|
|
|
- this.form.shippingAddr = data.addr || ''// 详细地址
|
|
|
|
- this.form.consigneeTel = data.consigneeTel || '' // 联系电话
|
|
|
|
- this.form.consigneeName = data.consigneeName || ''
|
|
|
|
|
|
+ this.form.dealerRecevieAddressSn = data.dealerRecevieAddressSn || undefined
|
|
this.addressId = data.id || undefined
|
|
this.addressId = data.id || undefined
|
|
this.openAddrModal = false
|
|
this.openAddrModal = false
|
|
// 移除表单项的校验结果
|
|
// 移除表单项的校验结果
|
|
- this.$refs.ruleForm.clearValidate('consigneeTel')
|
|
|
|
|
|
+ this.$refs.ruleForm.clearValidate('dealerRecevieAddressSn')
|
|
},
|
|
},
|
|
// 获取详情
|
|
// 获取详情
|
|
setDetail (data) {
|
|
setDetail (data) {
|