diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 6dec3563..56c2bf52 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2033,14 +2033,20 @@ button::after {
.card_itemCode {
font-size: 38rpx;
font-weight: bold;
- /* font-weight: 500; */
- padding: 5rpx 10rpx;
+ font-weight: 500;
+/* padding: 5rpx 10rpx; */
+ /* width: 210rpx; */
+ word-wrap: break-word;
+ word-break: break-all;
}
.card_itemName {
color: #909399;
font-size: 30rpx;
- padding: 5rpx 20rpx;
+ /* padding: 5rpx 10rpx; */
+ /* width: 210rpx; */
+ word-wrap: break-word;
+ word-break: break-all;
}
.card_ProdLine {
diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
index 1886ea25..86762135 100644
--- a/src/mycomponents/balance/balance.vue
+++ b/src/mycomponents/balance/balance.vue
@@ -8,19 +8,21 @@
-
+
+ :handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack"
+ :isShowStatus='isShowStatus'>
+
- 复制采购
- |制品
+ 复制
+
@@ -144,4 +146,4 @@
+
\ No newline at end of file
diff --git a/src/mycomponents/item/item.vue b/src/mycomponents/item/item.vue
index abcceaa4..f6cfc843 100644
--- a/src/mycomponents/item/item.vue
+++ b/src/mycomponents/item/item.vue
@@ -1,8 +1,6 @@
-
+
{{dataContent.itemCode}}
diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue
index ed980091..fb792eba 100644
--- a/src/mycomponents/item/itemQty.vue
+++ b/src/mycomponents/item/itemQty.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/mycomponents/qty/compareQty.vue b/src/mycomponents/qty/compareQty.vue
index f4a148eb..d2b3dbdb 100644
--- a/src/mycomponents/qty/compareQty.vue
+++ b/src/mycomponents/qty/compareQty.vue
@@ -1,8 +1,8 @@
-
+
-
-
+
+
diff --git a/src/mycomponents/qty/packUnit.vue b/src/mycomponents/qty/packUnit.vue
index de9e930a..599d8d59 100644
--- a/src/mycomponents/qty/packUnit.vue
+++ b/src/mycomponents/qty/packUnit.vue
@@ -1,7 +1,8 @@
- {{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}}/{{getPackUnitName(dataContent.packUnit)}}
+
+ {{getPackUnitName(dataContent.packUnit)}}({{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}})
diff --git a/src/mycomponents/qty/qty.vue b/src/mycomponents/qty/qty.vue
index 06a4a5fc..31c148ed 100644
--- a/src/mycomponents/qty/qty.vue
+++ b/src/mycomponents/qty/qty.vue
@@ -1,11 +1,11 @@
+
-
{{Number(dataContent.qty)}}
-
+
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index e2273eb4..1aacd9e3 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -3,21 +3,28 @@
-
+
+
+
+ 库位
+ {{fromLocationCode}}
+
+
+ 包装规格
+ {{getPackUnitName(fromPack.packUnit)}}
+
+
+ 包装数量
+ {{fromPack.packQty}}{{getUomInfo(fromPack.uom)}}
+
+
+
+
-
- 来源库位 : {{item.subList[0].locationCode}}
-
- 来源包装规格 :
- {{fromPackUnit}}/{{item.subList[0].packQty}}{{getUomInfo(item.subList[0].uom)}}
-
-
-
-
@@ -32,15 +39,14 @@
-
- 目标包装规格 :
+
+ 目标包装规格:
{{toPackUnitShow}}
-
@@ -122,9 +128,10 @@
businessType: {},
dataContent: {},
fromPackUnit: "",
+ fromPack: {},
packageList: [],
show: false,
- toPackUnitShow: "包装规格",
+ toPackUnitShow: "请选择",
toPackQty: "",
itemCode: ""
};
@@ -170,9 +177,11 @@
getPackUnitByItemCode(this.itemCode).then(res => {
if (res.data != null && res.data.list.length > 0) {
res.data.list.forEach(item => {
- item.value = item.packQty;
- item.label = item.packUnit + "/" + item.packQty + this
- .getUomInfo(item.uom);
+ // item.value = item.packQty;
+ item.value = item.packUnit;
+ item.label = this.getPackUnitName(item.packUnit) + "(" + item.packQty + this
+ .getUomInfo(item.uom) + ")";
+ item.data = 'a';
})
this.packageList = res.data.list
this.show = true;
@@ -183,17 +192,19 @@
}).catch(error => {
this.showErrorMessage("未查找到包装规格" + error);
})
-
},
confirmSelect(e) {
if (this.fromPackUnit == e[0].label) {
this.showErrorMessage("来源包装规格【" + this.fromPackUnit + "】与目标包装规格【" + e[0].label + "】不能相等")
return
}
+ // var toPackUnit = e[0].label.split("(")[0]
+ // this.toPackUnit = toPackUnit
+ // this.toPackQty = e[0].value
+ this.toPackUnit = e[0].value
+ let pack = this.packageList.filter(r => r.packUnit == this.toPackUnit)[0];
+ this.toPackQty = pack.packQty;
this.toPackUnitShow = e[0].label
- var toPackUnit = e[0].label.split("/")[0]
- this.toPackUnit =toPackUnit
- this.toPackQty = e[0].value
},
getScanResult(result) {
@@ -201,6 +212,7 @@
let label = result.label;
let pack = result.package;
this.fromPackUnit = pack.packUnit;
+ this.fromPack = pack;
var item = this.detailSource.find(res => {
if (res.itemCode == balance.itemCode) {
return res
@@ -308,7 +320,7 @@
//包装提示
if (tempHandleQty % toPackQty > 0) {
// var count = Math.ceil(tempHandleQty / toPackQty);
- this.$refs.comMessage.showQuestionMessage( "扫描数量【" + tempHandleQty +
+ this.$refs.comMessage.showQuestionMessage("扫描数量【" + tempHandleQty +
"】,将有1个非整包,是否提交?", res => {
if (res) {
this.submitJob()
diff --git a/src/pages/query/coms/comItemBalance.vue b/src/pages/query/coms/comItemBalance.vue
index 3205e090..0a16c2f5 100644
--- a/src/pages/query/coms/comItemBalance.vue
+++ b/src/pages/query/coms/comItemBalance.vue
@@ -1,6 +1,6 @@
-
+