From 30831cb11495693bd9ea98e99f1c1450c048a423 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 19 Jan 2024 14:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E6=8F=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/scan/winComScan.vue | 11 +++++------
 pages/count/job/countDetail.vue  | 29 ++++++++++++++---------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/mycomponents/scan/winComScan.vue b/mycomponents/scan/winComScan.vue
index 1007a446..aa4121a0 100644
--- a/mycomponents/scan/winComScan.vue
+++ b/mycomponents/scan/winComScan.vue
@@ -135,10 +135,10 @@
 			},
 			handelScanMsg() {
 				//点击了回车
-				uni.showLoading({
-					title: '解析中...',
-					mask: true
-				})
+				// uni.showLoading({
+				// 	title: '解析中...',
+				// 	mask: true
+				// })
 				let that = this;
 				let index = that.scanMsg.indexOf('\n');
 				if (index > 0) {
@@ -154,9 +154,8 @@
 						if (that.isShowHistory) {
 							that.scanList.unshift(content);
 						}
-
 						getLabelInfo(content, this.headerType, callback => {
-							uni.hideLoading();
+							// uni.hideLoading();
 							let scanResult = callback;
 							if (scanResult.success) {
 								that.clear();
diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue
index befc76da..f79f91bc 100644
--- a/pages/count/job/countDetail.vue
+++ b/pages/count/job/countDetail.vue
@@ -462,7 +462,7 @@
 
 						if (itemEditInfo == undefined) {
 							//不在任务列表中，提示是否添加到列表
-							this.addExistItemCodeToList(detail, result);
+							this.addExistItemCodeToList(detail);
 
 						} else {
 							//在列表中，更新已扫描状态，
@@ -509,13 +509,12 @@
 
 			},
 
-			addExistItemCodeToList(detail) {
+			addExistItemCodeToList(detail, qty, inventoryStatus) {
 				this.$refs.comMessage.showQuestionMessage("盘点明细不在列表中,是否添加到列表?",
 					res => {
 						if (res) {
-							detail.qty = calc.add(detail.qty, detail.qty)
-							//this.balance, this.package,
-							let newDetail = this.createAddDetailInfo(); //
+							detail.qty = calc.add(qty, qty)
+							let newDetail = this.createAddDetailInfo(qty, inventoryStatus); //
 							detail.subList.push(newDetail);
 							this.updateData()
 
@@ -537,31 +536,31 @@
 				return item;
 			},
 
-			createAddDetailInfo() {
+			createAddDetailInfo(qty, inventoryStatus) {
 				var detail = {
 					id: "0",
 					scaned: true,
 					countDetailNumber: "",
 					ownerCode: this.balance.ownerCode,
-					packingNumber: pack.number,
+					packingNumber: this.package.number,
 					containerNumber: this.balance.containerNumber,
-					batch: pack.batch,
-					inventoryStatus:this. balance.inventoryStatus,
+					batch: this.package.batch,
+					inventoryStatus: inventoryStatus,
 					itemCode: this.package.itemCode,
 					itemName: this.package.itemName,
 					itemDesc1: this.package.itemDesc1,
 					itemDesc2: this.package.itemDesc2,
+					stdPackQty: this.package.stdPackQty,
+					stdPackUnit: this.package.stdPackUnit,
 					projectCode: "",
 					qty: 0,
-					handleQty: this.balance.qty,
-					uom: balance.uom,
+					handleQty: qty,
+					uom: this.package.uom,
 					number: this.jobContent.number,
 					remark: "",
-					countQty: this.balance.qty,
-					balanceQty:this. balance.qty,
+					countQty: qty,
+					balanceQty: this.balance.qty,
 					fromLocationCode: this.balance.locationCode,
-					stdPackQty: this.package.stdPackQty,
-					stdPackUnit: this.package.stdPackUnit,
 					creator: this.$store.state.user.id
 				}
 				return detail;