|
|
@@ -253,7 +253,8 @@ export default {
|
|
|
date: [{ required: true, message: '请选择预约日期', trigger: 'change' }],
|
|
|
timeSlot: [{ required: true, message: '请选择预约时段', trigger: 'change' }],
|
|
|
pickupWay: [{ required: true, message: '请选择提货方式', trigger: 'change' }],
|
|
|
- pickupMan: [{ required: true, message: '请选择提货人', trigger: 'change' }]
|
|
|
+ pickupMan: [{ required: true, message: '请选择提货人', trigger: 'change' }],
|
|
|
+ company:[{ required: true, message: '请选择物流公司', trigger: 'change' }]
|
|
|
// receivingName: [{ required: true, message: '请填写收货客户', trigger: 'change' }],
|
|
|
// phone: [{ required: true, message: '请填写电话', trigger: 'change' }]
|
|
|
// address: [{ required: true, message: '请填写收货地址', trigger: 'change' }]
|
|
|
@@ -538,6 +539,19 @@ export default {
|
|
|
delete k.address
|
|
|
})
|
|
|
}
|
|
|
+ this.deliverList.forEach(k => {
|
|
|
+ if (!k.warehouseFlag) {
|
|
|
+ this.$set(k, 'warehouseFlag', null)
|
|
|
+ if (this.mainForm.pickupWay == 2 && this.logisticsNumber === '001' ) {
|
|
|
+ if (k.refLinkman || k.refPhone || k.refInstallAddress) {
|
|
|
+ this.$set(k, 'warehouseFlag', 1)
|
|
|
+ }else{
|
|
|
+ this.$set(k, 'warehouseFlag', 0)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
},
|
|
|
// 查询列表
|
|
|
getDeliverList() {
|
zhouhao