From 1df4f61591a03e48ccd8b8c01b8043b1da9224a9 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 19 Aug 2024 09:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5=E5=8F=91?=
 =?UTF-8?q?=E6=96=99=E5=92=8C=E7=9B=B4=E6=8E=A5=E8=A1=A5=E6=96=99=E6=89=AB?=
 =?UTF-8?q?=E7=88=B6=E5=AD=90=E5=8C=85=E8=A3=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/query/balanceQuery.vue       | 78 +------------------
 src/pages/issue/record/directIssue.vue        |  5 +-
 .../record/directRepleinshRecord.vue          |  2 +-
 3 files changed, 4 insertions(+), 81 deletions(-)

diff --git a/src/mycomponents/query/balanceQuery.vue b/src/mycomponents/query/balanceQuery.vue
index 298e4538..6737c53b 100644
--- a/src/mycomponents/query/balanceQuery.vue
+++ b/src/mycomponents/query/balanceQuery.vue
@@ -105,80 +105,6 @@
 				current: 1,
 				total: 18,
 				tableData: []
-				// tableData: [{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 1
-				// 	},
-				// 	{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 2
-				// 	},
-				// 	{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 3
-				// 	},
-				// 	{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 4
-				// 	},
-				// 	{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 3
-				// 	},
-				// 	{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 4
-				// 	},
-				// 	{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 3
-				// 	},
-				// 	{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 4
-				// 	},
-				// 	{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 3
-				// 	},
-				// 	{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 4
-				// 	},
-				// 	{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 3
-				// 	},
-				// 	{
-				// 		batch: "20240814",
-				// 		locationCode: "901",
-				// 		inventoryStatus: "OK",
-				// 		qty: 4
-				// 	}
-
-				// ]
 			}
 		},
 		props: {
@@ -187,8 +113,8 @@
 			// 	default: {}
 			// },
 			businessTypeCode: {
-				type: Boolean,
-				default: String
+				type: String,
+				default: ""
 			}
 		},
 		watch: {
diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index fe0fb212..f1ba1da2 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -255,7 +255,7 @@
 							})
 							if (checkData) {
 								//提示已经扫描
-								this.showErrorMessage("箱码[" + pack.number + "]批次[" + balance.batch +
+								this.showErrorMessage("扫描箱码[" + pack.number + "]批次[" + balance.batch +
 									"]的父包装已经扫描")
 								console.log("父包装已经扫描")
 							} else {
@@ -269,7 +269,6 @@
 								}
 								item.subList.push(newDetail);
 							}
-
 						} else {
 							//扫描的是父包装
 							var checkData = item.subList.find(r => {
@@ -307,10 +306,8 @@
 								}
 								item.subList.push(newDetail);
 							}
-
 						}
 
-
 						this.scanPopupGetFocus()
 					} else {
 						if (detail.scaned == true) {
diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue
index ad894bc2..00eec775 100644
--- a/src/pages/repleinsh/record/directRepleinshRecord.vue
+++ b/src/pages/repleinsh/record/directRepleinshRecord.vue
@@ -303,7 +303,7 @@
 							})
 							if (checkData) {
 								//是否移除
-								this.$refs.comMessage.showQuestionMessage("箱码[" + checkData.parentNumber+"]" + "批次[" + balance
+								this.$refs.comMessage.showQuestionMessage("扫描箱码[" + checkData.parentNumber+"]" + "批次[" + balance
 									.batch + "]是父包装，是否移除子包装", res => {
 										if (res) {
 											item.subList = [];