diff --git a/src/common/record.js b/src/common/record.js index c6b44261..c8d98642 100644 --- a/src/common/record.js +++ b/src/common/record.js @@ -19,6 +19,7 @@ export function createItemInfo(balance, pack) { let item = { itemCode: pack.itemCode, itemName: pack.itemName, + itemDesc1:balance && balance.itemDesc1 ? balance.itemDesc1 : pack && pack.itemDesc1 ? pack.itemDesc1:'', packQty: pack.packQty, packUnit: pack.packUnit, qty: new Decimal(balance.qty).toNumber(), @@ -34,7 +35,8 @@ export function createItemInfo(balance, pack) { export function createItemInfoForLabel(balance, label) { let item = { itemCode: label.itemCode, - itemName: label.itemName, + itemName: balance.itemName, + itemDesc1: balance.itemDesc1, packQty: '', packUnit: '', qty: new Decimal(balance.qty).toNumber(), diff --git a/src/mycomponents/item/item.vue b/src/mycomponents/item/item.vue index 3cc76361..a19b1279 100644 --- a/src/mycomponents/item/item.vue +++ b/src/mycomponents/item/item.vue @@ -1,11 +1,11 @@