Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

pages/issue/coms/comScanIssuePack.vue

@@ -124,7 +124,6 @@
 				type: String,
 				default: ''
 			},
-
 		},
 		data() {
 			return {
@@ -146,6 +145,8 @@
 				positionList: [],
 				defaultValueList: [],
 				fromInventoryStatuses: "",
+				packageInfo: {},
+				label: {}
 			}
 		},
 		created() {
@@ -215,7 +216,7 @@
 					this.showErrorMessage('发料库位【' + fromlocation + '】不存在')
 				}
 			},
-			
+
 
 			onScan(result) {
 				try {
@@ -226,7 +227,10 @@
 						});
 						return;
 					}
-					let packageInfo = result.package;
+
+					that.label = result.label;
+					that.packageInfo = result.package;
+					// let packageInfo = result.package;
 					let itemCode = result.label.itemCode;
 					let packingCode = result.label.packingNumber;
 					let lot = result.label.batch;
@@ -254,7 +258,7 @@
 											})
 									} else if (balanceRes.data.list.length == 1) {
 										let balance = balanceRes.data.list[0];
-										this.afterGetBalance(result.label, balance, packageInfo);
+										this.afterGetBalance(result.label, balance, that.packageInfo);
 									} else {
 										this.showBalanceSelect(balanceRes.data.list);
 									}
@@ -271,12 +275,12 @@
 			},
 
 			selectBalanceItem(balance) {
-				this.afterGetBalance(this.label, balance);
+				this.afterGetBalance(this.label, balance, this.packageInfo);
 			},
 
 			afterGetBalance(label, balance, packageInfo) {
+				let that = this;
 				try {
-					let that = this;
 					let itemCode = label.itemCode;
 					let packingCode = label.packingNumber;
 					let lot = label.batch;
@@ -387,7 +391,7 @@
 					handleQty += Number(res.qty)
 				})
 				batch.handleQty = handleQty;
-				
+
 			},
 
 			addRecord(batch, label, balance, packageInfo) {