diff --git a/src/common/record.js b/src/common/record.js index 899af2e..cca2d81 100644 --- a/src/common/record.js +++ b/src/common/record.js @@ -26,6 +26,22 @@ export function createItemInfo(balance, pack) { return item; } +export function createItemInfoForLabel(balance, label) { + let item = { + itemCode: label.itemCode, + itemName: label.itemName, + packQty: '', + packUnit: '', + qty: new Decimal(balance.qty).toNumber(), + handleQty: new Decimal(0).toNumber(), + uom: balance.uom, + subList: [], + // packingNumber: pack.number, + // parentPackingNumber: pack.parentNumber, + } + item.containerNumber = balance.parentNumber ? balance.parentNumber : balance.number; + return item; +} export function createDetailInfo(balance, pack) { balance.scaned = true; // data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus; @@ -59,6 +75,25 @@ export function createDetailInfoForLabel(balance, pack,label) { return detail; } + +export function createDetailInfoForLabel(balance, pack,label) { + balance.scaned = true; + // data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus; + // data.inventoryStatus = data.inventoryStatus; + let detail = deepCopyData(balance); + detail.balanceQty = new Decimal(detail.qty).toNumber() + detail.qty = new Decimal(balance.qty).toNumber(); + detail.packQty ='' + detail.packUnit ='' + console.log(988,label.qty) + detail.handleQty = new Decimal(label.qty).toNumber(); + // detail.package = pack; + // detail.productionlineCode = pack.productionLineCode; // 制品回收记录需要加的 + // detail.toInventoryStatus = balance.inventoryStatus; // 制品回收记录需要加的 + + return detail; +} + export function createDetailByPackInfo(pack) { // data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus; diff --git a/src/mycomponents/balance/pack.vue b/src/mycomponents/balance/pack.vue index 0114c85..120a6a9 100644 --- a/src/mycomponents/balance/pack.vue +++ b/src/mycomponents/balance/pack.vue @@ -1,14 +1,14 @@ diff --git a/src/mycomponents/detail/comRecommendDetailCard.vue b/src/mycomponents/detail/comRecommendDetailCard.vue index e300da8..032d540 100644 --- a/src/mycomponents/detail/comRecommendDetailCard.vue +++ b/src/mycomponents/detail/comRecommendDetailCard.vue @@ -1,53 +1,44 @@ - \ No newline at end of file +