From 77bc5936a32fcc0d78c8c4b477d65ede90871262 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 19 Jan 2024 14:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=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/winScanPackAndLocation.vue | 10 ++--
 pages/count/job/countDetail.vue              | 52 +++++++++++++++-----
 static/config.json                           |  2 +-
 3 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index ba0c8903..536b7969 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -225,10 +225,10 @@
 				} else {
 					if (result.label != null) {
 						this.scanResult = result;
-						uni.showLoading({
-							title: '查询中...',
-							mask: true
-						})
+						// uni.showLoading({
+						// 	title: '查询中...',
+						// 	mask: true
+						// })
 						getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
 							res => {
 								if (res.success) {
@@ -239,7 +239,7 @@
 										this.packGetFocus();
 									})
 								}
-								uni.hideLoading();
+								// uni.hideLoading();
 							});
 					}
 				}
diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue
index f79f91bc..cca9d4ed 100644
--- a/pages/count/job/countDetail.vue
+++ b/pages/count/job/countDetail.vue
@@ -395,27 +395,57 @@
 						}
 					})
 
+					if (mode == 'edit') {
+						//新增的盘点结果
+						// if (that.currentEditItem.id == '0') {
+						// 	let a = detail.subList.find(that.currentEditItem);
+						// 	let index = that.currentEditItem.index;
+						// 	// detail.subList
+						// 	detail.subList.splice(index, 1)
+
+						// } else {
+						//
+						// that.currentEditItem.handleQty = 0;
+						// that.currentEditItem.scaned = false;
+						// that.currentEditItem = {};
+						// }
+					}
+
+
 					if (itemEditInfo == undefined) {
 						//不在任务列表中，提示是否添加到列表
-						that.addExistItemCodeToList(detail, qty, inventoryStatus);
+						if (mode == 'edit') {
+							that.currentEditItem.handleQty = 0;
+							that.currentEditItem.inventoryStatus = inventoryStatus;
+
+							//新增的盘点结果
+							// if (that.currentEditItem.id == '0') {
+							// 	let a = detail.subList.find(that.currentEditItem);
+							// 	let index = that.currentEditItem.index;
+							// 	// detail.subList
+							// 	detail.subList.splice(index, 1)
+
+							// } else {
+							//
+							// that.currentEditItem.handleQty = 0;
+							// that.currentEditItem.scaned = false;
+							// that.currentEditItem = {};
+							// }
+						} else {
+							that.addExistItemCodeToList(detail, qty, inventoryStatus);
+						}
 					} else {
 						itemEditInfo.scaned = true;
 						itemEditInfo.handleQty = qty;
+						itemEditInfo.inventoryStatus = inventoryStatus;
 						itemEditInfo.balanceQty = that.balance.qty;
 						itemEditInfo.stdPackQty = that.package.stdPackQty;
 						itemEditInfo.stdPackUnit = that.package.stdPackUnit;
-						this.$refs.countQtyEdit.openEditPopupShowSeconds(itemEditInfo, detail
-							.subList);
+						// this.$refs.countQtyEdit.openEditPopupShowSeconds(itemEditInfo, detail
+						// 	.subList);
 						that.updateData()
 					}
 
-					//如果是编辑,移除之前的盘点结果
-					if (mode == 'edit') {
-						that.currentEditItem.handleQty = 0;
-						that.currentEditItem.scaned = false;
-						that.currentEditItem = {};
-					}
-
 					setTimeout(r => {
 						this.calcHandleQty();
 						this.scanPopupGetFocus();
@@ -538,7 +568,7 @@
 
 			createAddDetailInfo(qty, inventoryStatus) {
 				var detail = {
-					id: "0",
+					id: "0", //新增的明细
 					scaned: true,
 					countDetailNumber: "",
 					ownerCode: this.balance.ownerCode,
diff --git a/static/config.json b/static/config.json
index c47cdf8a..4fb72ee7 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.158:12080/admin-api",
+			"value": "http://192.168.0.178:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.176:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",