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 @@
- {{getStdPackUnit(uom)}}
+ {{getPackUnit(uom)}}