|
|
|
@ -774,7 +774,12 @@ import {
|
|
|
|
|
} from '@/api/distribution/distributionDeliveryList'; |
|
|
|
|
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList'; |
|
|
|
|
import { update as updatesign, getOneclickq, deliveryPicture,recheck } from '@/api/distribution/distributionSignfor'; |
|
|
|
|
import { |
|
|
|
|
update as updatesign, |
|
|
|
|
getOneclickq, |
|
|
|
|
deliveryPicture, |
|
|
|
|
recheck, |
|
|
|
|
} from '@/api/distribution/distributionSignfor'; |
|
|
|
|
import option from '@/option/basic/basicPdarecords'; |
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
@ -2145,7 +2150,7 @@ export default {
|
|
|
|
|
clientQuery: {}, |
|
|
|
|
inventoryQuery: {}, |
|
|
|
|
packageQuery: {}, |
|
|
|
|
formCustomer: {}, |
|
|
|
|
formCustomer: { deliveryWay: '10' }, |
|
|
|
|
formCustomerRolus: { |
|
|
|
|
consignee: [{ required: true, message: '请输入姓名', trigger: 'blur' }], |
|
|
|
|
isUrgent: [{ required: true, message: '请选择是否加急', trigger: 'change' }], |
|
|
|
@ -3603,7 +3608,7 @@ export default {
|
|
|
|
|
this.formCustomer.deliveryAddress = row.deliveryAddress; |
|
|
|
|
this.formCustomer.remarks = row.remarks; |
|
|
|
|
this.formCustomer.otherFee = row.otherFee; |
|
|
|
|
this.formCustomer.deliveryWay = row.deliveryWay; |
|
|
|
|
this.formCustomer.deliveryWay = row.deliveryWay || '10'; |
|
|
|
|
if (row.isUrgentName === '否' || row.isUrgentName === '1') { |
|
|
|
|
this.formCustomer.isUrgent = '1'; |
|
|
|
|
} else { |
|
|
|
@ -4090,22 +4095,22 @@ export default {
|
|
|
|
|
ElMessage({ |
|
|
|
|
message: '至少上传一张上门照片', |
|
|
|
|
type: 'warning', |
|
|
|
|
}) |
|
|
|
|
return |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if (!this.StackingPhoto.length) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '至少上传一张堆码照片', |
|
|
|
|
type: 'warning', |
|
|
|
|
}) |
|
|
|
|
return |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if (!this.SignForPhotos.length) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '至少上传一张签收照片', |
|
|
|
|
type: 'warning', |
|
|
|
|
}) |
|
|
|
|
return |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
console.log(this.reservationId); |
|
|
|
|
console.log(this.CheckStore, '要处理的值'); |
|
|
|
@ -4180,7 +4185,6 @@ export default {
|
|
|
|
|
this.checkloading = false; //取消限制 |
|
|
|
|
this.TCloading = false; //取消限制 |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
} else if (this.signtitle === '复核签收') { |
|
|
|
|
recheck(row) |
|
|
|
|
.then(res => { |
|
|
|
@ -4193,7 +4197,6 @@ export default {
|
|
|
|
|
}); |
|
|
|
|
this.onLoad(); |
|
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
ElMessage.error('操作失败'); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
@ -4330,19 +4333,19 @@ export default {
|
|
|
|
|
this.loading = true; |
|
|
|
|
console.log(this.loading, 'this.loading'); |
|
|
|
|
params.deliveryId = this.deliverydata.id; |
|
|
|
|
getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.packageQuery)).then( |
|
|
|
|
res => { |
|
|
|
|
getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.packageQuery)) |
|
|
|
|
.then(res => { |
|
|
|
|
console.log(res); |
|
|
|
|
this.loading = false; |
|
|
|
|
console.log('查看>>>>>包间>>', res.data.data.records); |
|
|
|
|
if (res.data.data.records) { |
|
|
|
|
const data = res.data.data.records; |
|
|
|
|
this.packpage.total= res.data.data.total |
|
|
|
|
this.packpage.total = res.data.data.total; |
|
|
|
|
this.packdata = data; |
|
|
|
|
// this.packpage.total = data.length; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
).catch(res=>{ |
|
|
|
|
}) |
|
|
|
|
.catch(res => { |
|
|
|
|
this.loading = false; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|