From c96b458756520c2e312dbe90f1b7823e01cf840c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 17:02:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/detail.js | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/src/common/detail.js b/src/common/detail.js index 35ef4ba1..5c6570a0 100644 --- a/src/common/detail.js +++ b/src/common/detail.js @@ -45,43 +45,26 @@ export function getTreeDataSource(dataList) { } export function getThreeDataSource(data) { let items = [] - // let obj ={ - // ...data.subList[0] - // } - // console.log(12) - // data.subList.forEach((item)=>{ - // item.threeList = [{ - // fromLocationCode:item.fromLocationCode, - // batch:item.batch, - // handleQty:0, - // qty:item.qty, - // inventoryStatus:item.inventoryStatus, - // toLocationCode:item.toLocationCode, - // }] - // item.packList=[{ - // scaned : false, - // scanDate: new Date() - // }] - // }) - // obj.subList = data.subList - // items.push(obj) - // return items; + let obj ={ + ...data.subList[0] + } + console.log(12) data.subList.forEach((item)=>{ - item.subList = [{ + item.threeList = [{ fromLocationCode:item.fromLocationCode, batch:item.batch, handleQty:0, qty:item.qty, inventoryStatus:item.inventoryStatus, toLocationCode:item.toLocationCode, - // packList:[{ - // scaned : false, - // scanDate: new Date() - // }] }] - + item.packList=[{ + scaned : false, + scanDate: new Date() + }] }) - items = data.subList + obj.subList = data.subList + items.push(obj) return items; } From 5ed99168d07b05f05edc0a755ef171cc97a85413 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 18:19:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?YT-1189=E7=9B=B4=E6=8E=A5=E7=89=A9=E6=96=99?= =?UTF-8?q?=E9=9A=94=E7=A6=BB=EF=BC=8C=E6=95=B0=E9=87=8F=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=BA=94=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/coms/comMoveRecord.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 3199956d..6371a5bb 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -287,12 +287,14 @@ this.toLocationInfo = location; }, getScanResult(result, managementTypeParams) { + console.log(222,result) this.fromWarehouseCode =result.fromWarehouseCode this.managementType = managementTypeParams if (this.showOnePop) { if (this.isJustReplay) { this.$refs.okToHoldRecordPackRef.itemCode = result.label.itemCode this.$refs.okToHoldRecordPackRef.batch = result.label.batch + this.$refs.okToHoldRecordPackRef.uom = result.package.uom this.getResult = result //存储接受的结果 this.$refs.scanPopup.closeScanPopup() } else { @@ -546,6 +548,7 @@ } else if (fromWitch == 'itemCodeScanMsg') { result.fromLocationCode = this.fromLocationCode this.$refs.scanPopup.getScanResult(result) + console.log(result) } }, // 清除来源库位 From e08aab3ce11e78c3e51efe27a92566481712e56b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 19:59:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?YT-981=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E6=8C=89=E7=85=A7=E4=B8=80=E4=B8=AA=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=B8=80=E4=B8=AA=E4=BB=BB=E5=8A=A1=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=8B=86=E5=88=86=EF=BC=8C=E7=8E=B0=E4=B8=80=E4=B8=AA=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=8E=A8=E8=8D=90=E5=A4=9A=E4=B8=AA=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E6=88=90=E4=BA=86=E5=A4=9A=E4=B8=AA=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E5=BA=94=E7=94=9F=E6=88=90=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/job/issueDetailBatch.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue index ddcc65ea..1a33e01a 100644 --- a/src/pages/issue/job/issueDetailBatch.vue +++ b/src/pages/issue/job/issueDetailBatch.vue @@ -368,6 +368,7 @@ detail.handleQty = 0 detail.qty = 0 detail.subList.forEach(item=>{ + item.handleQty =item.handleQty || 0 detail.handleQty = calc.add(detail.handleQty,item.handleQty) detail.qty = calc.add(detail.qty,item.qty) // item.packList.forEach(cur=>{ @@ -396,6 +397,7 @@ detail.handleQty = 0 detail.balance = result.balance, detail.subList.forEach(item=>{ + item.handleQty =item.handleQty || 0 detail.handleQty = calc.add(detail.handleQty,item.handleQty) // item.packList.forEach(cur=>{ // cur.handleQty = calc.add(detail.handleQty,item.handleQty) // }) }) @@ -445,6 +447,8 @@ // }) detail.handleQty = 0 detail.subList.forEach(item=>{ + console.log(item.handleQty) + item.handleQty =item.handleQty || 0 detail.handleQty = calc.add(detail.handleQty,item.handleQty) // item.packList.forEach(cur=>{ // cur.handleQty = calc.add(detail.handleQty,item.handleQty) // }) })