diff --git a/src/option/distribution/distributionParcelList.js b/src/option/distribution/distributionParcelList.js index 7f2a89e0..f8f68db5 100644 --- a/src/option/distribution/distributionParcelList.js +++ b/src/option/distribution/distributionParcelList.js @@ -58,6 +58,11 @@ export default { display: false, hide: true, }, + + + + + { label: "预留1", prop: "reserve1", diff --git a/src/views/distribution/signdetail/distributionSigndetaledt.vue b/src/views/distribution/signdetail/distributionSigndetaledt.vue index 0c9babb0..4b546fe6 100644 --- a/src/views/distribution/signdetail/distributionSigndetaledt.vue +++ b/src/views/distribution/signdetail/distributionSigndetaledt.vue @@ -498,6 +498,19 @@ export default { search: true, width: '100px', }, + + { + label: '签收人员', + prop: 'signingUser', + search: true, + width: '100px', + }, + { + label: '签收时间', + prop: 'signingTime', + search: true, + width: '100px', + }, { label: '物料编号', prop: 'materialCode', diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue index 84e5ec4c..c867dc90 100644 --- a/src/views/distribution/turndelivery/deliveryMarket.vue +++ b/src/views/distribution/turndelivery/deliveryMarket.vue @@ -1362,6 +1362,8 @@ export default { }, // 提交(配送内容) async onSubmitOrder() { + // console.log(this.reservationData,'表格参数'); + // return try { this.loadingObj.submitBtnLoading = true; @@ -1481,6 +1483,7 @@ export default { } console.log('this.data------------>', this.data); if (!this.deliveryListId) { + // this.reservationData.map(item=>item.id).join(',') data.reservationIds = this.reservationIds; data.reservationIds = this.reservationData.map(val => val.id).join(','); if (this.reservationData.length < 1) { @@ -1490,7 +1493,7 @@ export default { }); return; } - + console.log('>>>>>>>>>>>>', data); const res = await deliveryTask(data); diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue index 04fa1ce2..6ef4af25 100644 --- a/src/views/warehouse/parcelList/distributionParcelList.vue +++ b/src/views/warehouse/parcelList/distributionParcelList.vue @@ -299,15 +299,42 @@ export default { sortable: false, head: false, }, + { - prop: 'materialCode', - label: '物料编码', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, + label: '预约单号', + prop: 'reservationCode', + display: false, + hide: true, + }, + { + label: '配送单号', + prop: 'noteNumber', + display: false, + hide: true, + }, + { + label: '签收司机', + prop: 'driverName', + display: false, + hide: true, + }, + { + label: '装车时间', + prop: 'scanTime', + display: false, + hide: true, + }, + { + label: '配送车次', + prop: 'dvehicleName', + display: false, + hide: true, + }, + { + label: '签收车次', + prop: 'zvehicleName', + display: false, + hide: true, }, { prop: 'firsts', @@ -339,6 +366,16 @@ export default { fixed: false, sortable: true, }, + { + prop: 'materialCode', + label: '物料编码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'orderPackageStockupStatusName', label: '备货状态',