From 7f6036b54d79461ecf4acb00cc327d78e66fee21 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 10 Jan 2024 11:04:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E5=92=8C=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/customerReturn/record/returnRecord.vue | 50 +++++++++++--------- pages/scrap/record/scrapRecord.vue | 41 +++++++++------- 2 files changed, 52 insertions(+), 39 deletions(-) diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue index fc4f596a..3dc6a45e 100644 --- a/pages/customerReturn/record/returnRecord.vue +++ b/pages/customerReturn/record/returnRecord.vue @@ -56,7 +56,8 @@ import { goHome, updateTitle, - getPackingNumberAndBatchByList + getPackingNumberAndBatchByList, + deepCopyData } from '@/common/basic.js'; import { @@ -323,27 +324,32 @@ if (detail.scaned) { var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch); - detail.itemCode = detail.itemCode; - detail.itemName = detail.package.itemName; - detail.itemDesc1 = detail.package.itemDesc1; - detail.itemDesc2 = detail.package.itemDesc2; - - detail.inventoryStatus = detail.inventoryStatus; - detail.toInventoryStatus = detail.inventoryStatus; - - detail.fromPackingNumber = info.packingNumber; - detail.toPackingNumber = info.packingNumber; - - detail.fromContainerNumber = detail.containerNumber; - detail.toContainerNumber = detail.containerNumber - - detail.fromBatch = info.batch; - detail.toBatch = info.batch; - - detail.fromLocationCode = detail.locationCode; - detail.toLocationCode = detail.toLocationCode; - - subList.push(detail) + var submitItem = deepCopyData(detail) + + submitItem.itemCode = detail.itemCode; + submitItem.itemName = detail.package.itemName; + submitItem.itemDesc1 = detail.package.itemDesc1; + submitItem.itemDesc2 = detail.package.itemDesc2; + + submitItem.inventoryStatus = detail.inventoryStatus; + submitItem.toInventoryStatus = detail.inventoryStatus; + + submitItem.fromPackingNumber = info.packingNumber; + submitItem.toPackingNumber = info.packingNumber; + + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber + + submitItem.fromBatch = info.batch; + submitItem.toBatch = info.batch; + + submitItem.fromLocationCode = detail.locationCode; + submitItem.toLocationCode = detail.toLocationCode; + + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.package =""; + subList.push(submitItem) + } }) }) diff --git a/pages/scrap/record/scrapRecord.vue b/pages/scrap/record/scrapRecord.vue index 6f6a2871..421d14b1 100644 --- a/pages/scrap/record/scrapRecord.vue +++ b/pages/scrap/record/scrapRecord.vue @@ -19,6 +19,7 @@ @@ -55,6 +56,7 @@ import { goHome, + deepCopyData } from '@/common/basic.js'; import { @@ -274,30 +276,34 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { - detail.itemCode = detail.itemCode; - detail.itemName = detail.package.itemName; - detail.itemDesc1 = detail.package.itemDesc1; - detail.itemDesc2 = detail.package.itemDesc2; + var submitItem = deepCopyData(detail) + submitItem.itemCode = detail.itemCode; + submitItem.itemName = detail.package.itemName; + submitItem.itemDesc1 = detail.package.itemDesc1; + submitItem.itemDesc2 = detail.package.itemDesc2; - detail.inventoryStatus = detail.inventoryStatus; + submitItem.inventoryStatus = detail.inventoryStatus; detail.fromPackingNumber = detail.packingNumber; detail.toPackingNumber = detail.packingNumber; - detail.fromContainerNumber = detail.containerNumber; - detail.toContainerNumber = detail.containerNumber + submitItem.fromContainerNumber = detail.containerNumber; + submitItem.toContainerNumber = detail.containerNumber - detail.fromBatch = detail.batch; - detail.toBatch = detail.batch; + submitItem.fromBatch = detail.batch; + submitItem.toBatch = detail.batch; - detail.fromLocationCode = detail.locationCode; - detail.toLocationCode = ""; + submitItem.fromLocationCode = detail.locationCode; + submitItem.toLocationCode = ""; - detail.reason = this.reasonCode; - subList.push(detail) + submitItem.reason = this.reasonCode; + submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.package =""; + subList.push(submitItem) } }) }) + this.dataContent.subList =subList this.dataContent.creator = creator; return this.dataContent; @@ -337,12 +343,13 @@ }) }, clearData(){ - this.reasonCode = "" + this.reasonCode = ""; + this.fromLocationCode = ""; this.reasonText = ""; this.detailSource = []; - this.subList =[]; - this.managementList =[]; - this.dataContent ={} + this.subList = []; + this.managementList = []; + this.dataContent = {} }, updateData() {