From 408657861bb537f77494fb7ffbd0be6ffef2382a Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 11 Jun 2024 15:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E7=BA=BF=E6=8F=90=E8=B4=A7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=AE=A1=E5=88=92=E4=BB=B6=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arteryDistrilbutionBillLadingList.js | 11 +++++++ .../addArteryDistrilbutionBillLadingList.vue | 30 +++++++++++++++++-- ...teryDistrilbutionBillLadingListDetails.vue | 11 +++++++ 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js index aa03ec24..8ace0887 100644 --- a/src/option/distribution/arteryDistrilbutionBillLadingList.js +++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js @@ -585,6 +585,17 @@ export const columnNewList = [ sortable: true, isshowSummary: true, }, + { + prop: 'planNum', + label: '计划件数', + type: 6, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + isshowSummary: true, + }, { prop: 'totalWeghit', label: '重量', diff --git a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue index 02f8542c..4ab7735b 100644 --- a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue @@ -304,6 +304,11 @@ @selectCheck="selectsc" @selection="list => selectionChange(list, 1)" > + @@ -359,6 +364,17 @@ @selectCheck="selectsc" @selection="list => selectionChange(list, 2)" > + @@ -674,6 +690,12 @@ const initPage = async () => { details.addInfo.newData = data.waybillList || []; details.waybillNosList = data.waybillList.map(item => item.waybillNo); + for (let i = 0; i < details.addInfo.newData.length; i++) { + const value = details.addInfo.newData[i]; + + value.totalPlanNum = value.totalPlanNum + (value.planNum || 0); + } + newInputsc('', { prop: 'aaa' }); // 节点 @@ -1012,9 +1034,9 @@ const handleAddWaybill = () => { for (let item of details.addInfo.oldSelectionList) { if (!details.waybillNosList.includes(item.waybillNo)) { - item.planNum = item.stockNum; - item.loadingNum = 0; - _arr.push(item); + item.planNum = item.totalPlanNum; + // item.loadingNum = 0; + _arr.push({ ...item }); details.waybillNosList.push(item.waybillNo); } } @@ -1093,6 +1115,7 @@ const addSubmit = async nodeArr => { _submitData.billladingWaybillList.push({ waybillId: item.waybillId, waybillNo: item.waybillNo, + planNum: item.planNum, }); } @@ -1148,6 +1171,7 @@ const editSubmit = async nodeArr => { _submitData.billladingWaybillList.push({ waybillId: item.waybillId, waybillNo: item.waybillNo, + planNum: item.planNum, }); } diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue index 1ea58bde..83404b03 100644 --- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue +++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue @@ -339,6 +339,17 @@ export default { fixed: false, sortable: true, }, + { + prop: 'planNum', + label: '计划件数', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + isshowSummary: true, + }, { prop: 'realNum', label: '提货件数',