|
@@ -26,8 +26,8 @@
|
|
|
<dealerSubareaScopeList ref="dealerSubareaScopeList" defValKey="buyerSn" @change="custChange" v-model="form.receiverSn" />
|
|
|
</a-form-model-item>
|
|
|
<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;" v-if="!!chooseAddr">{{ chooseAddr }}</div>
|
|
|
+ <div style="display:flex;padding-top:6px;">
|
|
|
+ <div style="width:80%;flex-grow:1;line-height: 24px;">{{ chooseAddr }}</div>
|
|
|
<a-button size="small" type="link" @click="openAddrModal = true">{{ addressVal }} >></a-button>
|
|
|
</div>
|
|
|
</a-form-model-item>
|
|
@@ -97,17 +97,18 @@ export default {
|
|
|
buyerName: '',
|
|
|
receiverSn: '',
|
|
|
receiverName: '',
|
|
|
- dealerRecevieAddressSn: undefined // 地址sn
|
|
|
+ dealerRecevieAddressSn: '' // 地址sn
|
|
|
},
|
|
|
rules: {
|
|
|
sendNo: [{ required: true, message: '请输入发货编号', trigger: 'change' }],
|
|
|
printStatus: [{ required: true, message: '请选择备货打印', trigger: 'change' }],
|
|
|
- dealerRecevieAddressSn: [ { required: true, message: '请选择收货地址', trigger: ['change', 'blur'] } ]
|
|
|
+ dealerRecevieAddressSn: [ { required: true, message: '请选择收货地址', trigger: 'change' } ]
|
|
|
},
|
|
|
detailData: null, // 详情数据
|
|
|
addressVal: '选择地址', // 选择地址/更换地址
|
|
|
chooseAddr: '', // 当前已选地址信息
|
|
|
- openAddrModal: false // 选择地址弹框是否显示
|
|
|
+ openAddrModal: false, // 选择地址弹框是否显示
|
|
|
+ addressId: undefined
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -133,7 +134,6 @@ export default {
|
|
|
if (res.data.length == 1) {
|
|
|
const ret = res.data[0]
|
|
|
ret.address = (ret.provinceName ? (ret.provinceName + '-') : '') + (ret.cityName ? (ret.cityName + '-') : '') + (ret.countyName ? (ret.countyName + '-') : '') + ret.addr
|
|
|
- this.addressId = ret.id || undefined
|
|
|
this.handleOk(ret)
|
|
|
} else {
|
|
|
this.verifyFun(this.addressId)
|
|
@@ -145,7 +145,7 @@ export default {
|
|
|
if (id == this.addressId) {
|
|
|
this.chooseAddr = ''
|
|
|
this.addressVal = '选择地址'
|
|
|
- this.form.dealerRecevieAddressSn = undefined
|
|
|
+ this.form.dealerRecevieAddressSn = ''
|
|
|
}
|
|
|
},
|
|
|
// 保存
|
|
@@ -166,11 +166,12 @@ export default {
|
|
|
console.log(data, 'chooseAddr')
|
|
|
this.chooseAddr = (data.consigneeName || '') + '(' + (data.consigneeTel || '-') + ')' + ' ' + (data.address || '')
|
|
|
this.addressVal = '更换地址'
|
|
|
- this.form.dealerRecevieAddressSn = data.dealerRecevieAddressSn || undefined
|
|
|
+ this.form.dealerRecevieAddressSn = data.dealerRecevieAddressSn || ''
|
|
|
this.addressId = data.id || undefined
|
|
|
this.openAddrModal = false
|
|
|
// 移除表单项的校验结果
|
|
|
- this.$refs.ruleForm.clearValidate('dealerRecevieAddressSn')
|
|
|
+ console.log(this.form.dealerRecevieAddressSn)
|
|
|
+ this.$refs.ruleForm.validateField('dealerRecevieAddressSn')
|
|
|
},
|
|
|
// 获取详情
|
|
|
setDetail (data) {
|
|
@@ -185,7 +186,8 @@ export default {
|
|
|
printStatus: undefined,
|
|
|
buyerName: '',
|
|
|
receiverSn: '',
|
|
|
- receiverName: ''
|
|
|
+ receiverName: '',
|
|
|
+ dealerRecevieAddressSn: ''
|
|
|
}
|
|
|
this.$refs.dealerSubareaScopeList.resetForm()
|
|
|
this.verifyFun(this.addressId)
|