From db2b76947ea1335d39d7812cd0d7e0b6e4887943 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 13 Mar 2024 14:36:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BD=8D=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/basic.js | 6 +-- src/common/detail.js | 4 +- src/common/directory.js | 2 +- src/common/record.js | 8 ++-- src/mycomponents/detail/detailBalanceInfo.vue | 2 +- src/mycomponents/detail/detailHandleInfo.vue | 2 +- src/mycomponents/detail/detailPackageInfo.vue | 4 +- .../detail/detailRecommendInfo.vue | 2 +- src/mycomponents/detail/jobDetailPopup.vue | 6 +-- src/mycomponents/job/jobDetailPopup.vue | 6 +-- .../package/packageDetailPopup.vue | 4 +- src/mycomponents/partCode/partCode.vue | 4 +- src/mycomponents/qty/balanceQty.vue | 8 ++-- src/mycomponents/qty/balanceQtyEdit.vue | 8 ++-- src/mycomponents/qty/compareQty.vue | 4 +- src/mycomponents/qty/countQtyEdit.vue | 16 ++++---- src/mycomponents/qty/inspectQtyEdit.vue | 2 +- src/mycomponents/qty/packQty.vue | 37 +++++++++++++++++++ src/mycomponents/qty/qty.vue | 4 +- src/mycomponents/qty/recommendQty.vue | 4 +- src/mycomponents/qty/recommendQtyEdit.vue | 6 +-- src/mycomponents/qty/stdPackQty.vue | 37 ------------------- src/mycomponents/qty/stdUom.vue | 8 ++-- src/mycomponents/wincom/basicCom/winHint.vue | 2 +- .../container/record/containerBindRecord.vue | 4 +- .../record/containerUnBindRecord.vue | 4 +- src/pages/count/job/countDetail.vue | 20 +++++----- src/pages/count/record/countRecord.vue | 8 ++-- src/pages/customerReturn/job/returnDetail.vue | 8 ++-- .../deliver/coms/comDeliverRequestPopup.vue | 2 +- src/pages/deliver/coms/comScanDeliverPack.vue | 4 +- src/pages/demo/demo.vue | 12 +++--- .../inventoryMove/job/inventoryMoveDetail.vue | 8 ++-- .../issue-按批次推荐/job/issueDetail.vue | 4 +- src/pages/issue/coms/comIssueRequestPopup.vue | 6 +-- src/pages/issue/coms/comScanIssuePack.vue | 4 +- src/pages/issue/js/issue.js | 2 +- .../job/productPutawayDetail.vue | 8 ++-- .../productReceipt/coms/detailInfoPopup.vue | 4 +- .../coms/productDetailInfoPopup.vue | 10 ++--- .../record/productReceiptRecord.vue | 8 ++-- .../job/productionReceiptDetail.vue | 8 ++-- src/pages/productionReturn/coms/comReturn.vue | 8 ++-- .../coms/comReturnRequestPopup.vue | 6 +-- .../coms/comScanReturnPack.vue | 4 +- .../coms/returnDetailInfoPopup.vue | 10 ++--- .../productionReturn/job/returnDetail.vue | 12 +++--- .../productionReturn/record/returnToHold.vue | 8 ++-- .../productionReturn/record/returnToStore.vue | 8 ++-- .../coms/receiptDetailInfoPopup.vue | 12 +++--- src/pages/purchaseReturn/job/returnDetail.vue | 8 ++-- src/pages/putaway/job/putawayDetail.vue | 8 ++-- .../coms/comRepleinshRequestPopup.vue | 6 +-- .../repleinsh/coms/comScanReplishPack.vue | 4 +- src/pages/scrap/coms/scrapDetailInfoPopup.vue | 4 +- src/pages/scrap/job/scrapJobDetail.vue | 8 ++-- .../coms/recordDetailInfoPopup.vue | 4 +- .../coms/recordtDetailInfoPopup.vue | 4 +- src/pages/transfer/job/issueDetail.vue | 8 ++-- src/pages/transfer/job/receiptDetail.vue | 10 ++--- src/pages/transfer/job/transferDetail.vue | 4 +- .../unPlanned/coms/comReceiptRequestPopup.vue | 6 +-- src/pages/unPlanned/job/issueJobDetail.vue | 8 ++-- src/pages/unPlanned/job/receiptJobDetail.vue | 2 +- src/pages/unPlanned/record/receiptRecord.vue | 8 ++-- 65 files changed, 235 insertions(+), 235 deletions(-) create mode 100644 src/mycomponents/qty/packQty.vue delete mode 100644 src/mycomponents/qty/stdPackQty.vue diff --git a/src/common/basic.js b/src/common/basic.js index 2c70dc66..3288bec0 100644 --- a/src/common/basic.js +++ b/src/common/basic.js @@ -191,7 +191,7 @@ export function getUomInfo(value) { } //获取包装单位 -export function getStdPackUnitInfo(value) { +export function getPackUnitInfo(value) { var resultInfo = ""; if (packUnitList.length == 0) { packUnitList = getDirectoryInfo("pack_unit") @@ -957,8 +957,8 @@ export function createItemInfo(res) { let item = { itemCode: res.itemCode, itemName: res.itemName, - stdPackQty: Number(res.stdPackQty), - stdPackUnit: res.stdPackUnit, + packQty: Number(res.packQty), + packUnit: res.packUnit, qty: Number(res.qty), handleQty: 0, uom: res.uom, diff --git a/src/common/detail.js b/src/common/detail.js index 993f2fb8..4fd36866 100644 --- a/src/common/detail.js +++ b/src/common/detail.js @@ -67,8 +67,8 @@ export function createItemInfo(detail) { let item = { itemCode: detail.itemCode, itemName: detail.itemName, - stdPackQty: Number(detail.stdPackQty) || undefined, - stdPackUnit: detail.stdPackUnit, + packQty: Number(detail.packQty) || undefined, + packUnit: detail.packUnit, qty: Number(detail.qty), handleQty: 0, uom: detail.uom, diff --git a/src/common/directory.js b/src/common/directory.js index e7aa2ebc..63139129 100644 --- a/src/common/directory.js +++ b/src/common/directory.js @@ -263,7 +263,7 @@ export function getUomInfo(value) { } //获取包装单位 -export function getStdPackUnitInfo(value) { +export function getPackUnitInfo(value) { var resultInfo = ""; if (packUnitList.length == 0) { packUnitList = getDirectoryInfo("pack_unit") diff --git a/src/common/record.js b/src/common/record.js index f4a988c1..65f102f2 100644 --- a/src/common/record.js +++ b/src/common/record.js @@ -15,8 +15,8 @@ export function createItemInfo(balance, pack) { let item = { itemCode: pack.itemCode, itemName: pack.itemName, - stdPackQty: pack.stdPackQty, - stdPackUnit: pack.stdPackUnit, + packQty: pack.packQty, + packUnit: pack.packUnit, qty: new Decimal(balance.qty).toNumber(), handleQty:new Decimal(0).toNumber(), uom: pack.uom, @@ -32,8 +32,8 @@ export function createDetailInfo(balance, pack) { 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.packQty = new Decimal(pack.packQty).toNumber() + detail.packUnit = pack.packUnit detail.handleQty = new Decimal(detail.qty).toNumber() ; detail.package = pack; diff --git a/src/mycomponents/detail/detailBalanceInfo.vue b/src/mycomponents/detail/detailBalanceInfo.vue index 573e393f..43cfb89b 100644 --- a/src/mycomponents/detail/detailBalanceInfo.vue +++ b/src/mycomponents/detail/detailBalanceInfo.vue @@ -32,7 +32,7 @@ + + + diff --git a/src/mycomponents/qty/qty.vue b/src/mycomponents/qty/qty.vue index f2d55dcc..827b92dc 100644 --- a/src/mycomponents/qty/qty.vue +++ b/src/mycomponents/qty/qty.vue @@ -15,13 +15,13 @@ - - - diff --git a/src/mycomponents/qty/stdUom.vue b/src/mycomponents/qty/stdUom.vue index 03508a7f..7a495d07 100644 --- a/src/mycomponents/qty/stdUom.vue +++ b/src/mycomponents/qty/stdUom.vue @@ -1,13 +1,13 @@