From e49387b9ede209c30276bc79d0f387a675651cc0 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 23 Jan 2024 10:58:39 +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=E7=94=B3=E8=AF=B7=E6=95=B0=E5=AD=97=E7=B2=BE?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/calc.js | 8 +++--- common/record.js | 27 ++++++++++--------- mycomponents/item/itemQty.vue | 2 +- mycomponents/qty/balanceQtyEdit.vue | 4 +-- mycomponents/record/recordComDetailCard.vue | 4 +-- mycomponents/status/balanceStatus.vue | 2 +- pages/customerReturn/record/returnRecord.vue | 5 ++-- .../request/customerReturnRequestCreate.vue | 3 ++- static/config.json | 2 +- 9 files changed, 31 insertions(+), 26 deletions(-) diff --git a/common/calc.js b/common/calc.js index 358252ee..2b48e481 100644 --- a/common/calc.js +++ b/common/calc.js @@ -2,16 +2,16 @@ import { Decimal } from 'decimal.js';//引入 class Calc { add(num1,num2) { - return new Decimal(num1).add(new Decimal(num2)) + return new Decimal(num1).add(new Decimal(num2)).toNumber() } sub(num1,num2) { - return new Decimal(num1).sub(new Decimal(num2)) + return new Decimal(num1).sub(new Decimal(num2)).toNumber() } mul(num1,num2) { - return new Decimal(num1).mul(new Decimal(num2)) + return new Decimal(num1).mul(new Decimal(num2)).toNumber() } div(num1,num2) { - return new Decimal(num1).div(new Decimal(num2)) + return new Decimal(num1).div(new Decimal(num2)).toNumber() } } export const calc = new Calc(); \ No newline at end of file diff --git a/common/record.js b/common/record.js index 2e457395..f1184254 100644 --- a/common/record.js +++ b/common/record.js @@ -6,6 +6,10 @@ import { getDirectoryItemArray, } from '@/common/directory.js'; import { calc } from '@/common/calc' +import { Decimal } from 'decimal.js';//引入 + import { + deepCopyData + } from '@/common/basic.js'; export function createItemInfo(balance, pack) { let item = { @@ -13,25 +17,24 @@ export function createItemInfo(balance, pack) { itemName: pack.itemName, stdPackQty: pack.stdPackQty, stdPackUnit: pack.stdPackUnit, - qty: Number(balance.qty), - handleQty: 0, + qty: new Decimal(balance.qty).toNumber(), + handleQty:new Decimal(0).toNumber(), uom: pack.uom, subList: [] } return item; } -export function createDetailInfo(data, pack) { - data.scaned = true; +export function createDetailInfo(balance, pack) { + balance.scaned = true; // data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus; // data.inventoryStatus = data.inventoryStatus; - let detail = {}; - Object.assign(detail, data) - detail.balanceQty = Number(detail.qty) - detail.qty = Number(detail.qty); - detail.stdPackQty = Number(pack.stdPackQty) + let detail = deepCopyData(balance); + detail.balanceQty = new Decimal(detail.qty).toNumber() + detail.qty = new Decimal(detail.qty).toNumber(); + detail.stdPackQty = new Decimal(pack.stdPackQty).toNumber() detail.stdPackUnit = pack.stdPackUnit - detail.handleQty =0; + detail.handleQty = new Decimal(detail.qty).toNumber() ; detail.package = pack; return detail; @@ -40,10 +43,10 @@ export function createDetailInfo(data, pack) { //计算实际数量 export function calcHandleQty(detailSource) { for (let item of detailSource) { - item.qty = 0; + item.handleQty = new Decimal(0).toNumber(); for (let detail of item.subList) { if (detail != undefined && detail.scaned) { - item.qty = calc.add(item.qty,detail.qty); + item.handleQty = calc.add(item.handleQty,detail.handleQty); } } } diff --git a/mycomponents/item/itemQty.vue b/mycomponents/item/itemQty.vue index 6851b19e..12da2d8a 100644 --- a/mycomponents/item/itemQty.vue +++ b/mycomponents/item/itemQty.vue @@ -6,7 +6,7 @@ + :handleQty="dataContent.handleQty" :isShowStatus="false"> - + diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue index bfe6611a..aac1152a 100644 --- a/pages/customerReturn/record/returnRecord.vue +++ b/pages/customerReturn/record/returnRecord.vue @@ -149,8 +149,10 @@ } }) if (item == undefined) { + var itemp = createItemInfo(balance, pack); let newDetail = createDetailInfo(balance, pack); // + itemp.subList.push(newDetail); this.detailSource.push(itemp) } else { @@ -316,7 +318,6 @@ }, setParams() { - var subList = [] var creator = this.$store.state.user.id this.detailSource.forEach(item => { @@ -346,7 +347,7 @@ submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = detail.toLocationCode; - submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty; submitItem.package =""; subList.push(submitItem) diff --git a/pages/customerReturn/request/customerReturnRequestCreate.vue b/pages/customerReturn/request/customerReturnRequestCreate.vue index c91ed6dc..01f1c890 100644 --- a/pages/customerReturn/request/customerReturnRequestCreate.vue +++ b/pages/customerReturn/request/customerReturnRequestCreate.vue @@ -56,6 +56,7 @@