|
@@ -32,8 +32,7 @@
|
|
|
</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
|
- <a-form-model-item>
|
|
|
- <span slot="label"><i style="color: red;">*</i> 收货地址</span>
|
|
|
+ <a-form-model-item label="收货地址" prop="consigneeTel">
|
|
|
{{ chooseAddr }}
|
|
|
<a-button type="link" id="purchaseOrder-basicInfo-chooseAddr" @click="handleChoose">{{ addressVal }} >></a-button>
|
|
|
</a-form-model-item>
|
|
@@ -91,6 +90,9 @@ export default {
|
|
|
],
|
|
|
settleStyleSn: [
|
|
|
{ required: true, message: '请选择支付方式', trigger: 'change' }
|
|
|
+ ],
|
|
|
+ consigneeTel: [
|
|
|
+ { required: true, message: '请选择收货地址(联系电话不能为空)', trigger: 'change' }
|
|
|
]
|
|
|
},
|
|
|
purchaseTragetType: [],
|
|
@@ -140,10 +142,10 @@ export default {
|
|
|
_this.isShow = false
|
|
|
_this.$emit('ok', res.data)
|
|
|
_this.spinning = false
|
|
|
+ _this.$message.info(res.message)
|
|
|
} else {
|
|
|
_this.spinning = false
|
|
|
}
|
|
|
- _this.$message.info(res.message)
|
|
|
})
|
|
|
} else {
|
|
|
return false
|
|
@@ -160,7 +162,7 @@ export default {
|
|
|
},
|
|
|
// 地址保存
|
|
|
handleOk (data) {
|
|
|
- this.chooseAddr = (data.consigneeName || '') + '(' + (data.consigneeTel || '') + ')' + ' ' + (data.address || '')
|
|
|
+ this.chooseAddr = (data.consigneeName || '') + '(' + (data.consigneeTel || '--') + ')' + ' ' + (data.address || '')
|
|
|
this.addressVal = '更换地址'
|
|
|
this.form.shippingAddressProvinceName = data.provinceName // 省
|
|
|
this.form.shippingAddressCityName = data.cityName // 市
|
|
@@ -173,7 +175,7 @@ export default {
|
|
|
// 编辑信息
|
|
|
setData (data) {
|
|
|
this.form = JSON.parse(JSON.stringify(data))
|
|
|
- this.chooseAddr = data.consigneeName + '(' + data.consigneeTel + ')' + ' ' + data.shippingAddressProvinceName + '-' + data.shippingAddressCityName + '-' + data.shippingAddressCountyName + ' ' + data.shippingAddress
|
|
|
+ this.chooseAddr = data.consigneeName + '(' + (data.consigneeTel || '--') + ')' + ' ' + data.shippingAddressProvinceName + '-' + data.shippingAddressCityName + '-' + data.shippingAddressCountyName + ' ' + data.shippingAddress
|
|
|
this.addressVal = '更换地址'
|
|
|
},
|
|
|
// 获取收款方式
|