From bfa78cbaa77aae6428d323d3b0946ca0cc8c99c4 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 22 Nov 2024 08:59:45 +0800
Subject: [PATCH] =?UTF-8?q?YT-1110=20=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=84=A6=E7=82=B9=E8=B0=83=E7=94=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/inventoryMove/coms/comMoveRecord.vue      | 4 ++--
 src/pages/inventoryMove/coms/okToHoldRecordPack.vue | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 3ec20363..7ff8297d 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -36,8 +36,8 @@
 		<!-- 合格转隔离单独的弹窗-->
 		<okToHoldRecordPack ref="okToHoldRecordPackRef" :showOnePop='showOnePop'
 			@showFromLocationPopup='showFromLocationPopup' @itemCodeClick='openScanPopup'
-			@confirm='okToHoldRecordPackConfirm' @getInputMsgResult="getInputMsgResult"
-			@itemCodeScanMsg='itemCodeScanMsg'></okToHoldRecordPack>
+			@onConfirm='okToHoldRecordPackConfirm' @getInputMsgResult="getInputMsgResult"
+			></okToHoldRecordPack>
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
diff --git a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
index 09dba246..6fa4ba3a 100644
--- a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
+++ b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
@@ -50,7 +50,7 @@
 			<view class="uni-flex uni-row hide_border">
 				<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after"
 					@click="showOne = false">取消</button>
-				<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+				<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="clickConfirm">确认</button>
 			</view>
 		</u-popup>
 
@@ -83,7 +83,7 @@
 			winScanLocation,
 			uom
 		},
-		emits: ["showFromLocationPopup", 'itemCodeClick', 'confirm', 'getInputMsgResult', 'clearFromLocationCode',
+		emits: ["showFromLocationPopup", 'itemCodeClick', 'onConfirm', 'getInputMsgResult', 'clearFromLocationCode',
 			'clickBtnClearItemCode'
 		],
 		data() {
@@ -120,7 +120,7 @@
 				}
 				this.$emit("itemCodeClick");
 			},
-			confirm() {
+			clickConfirm() {
 				// this.$refs.scanLocationCode.openScanPopup()
 
 				let obj = {
@@ -129,7 +129,7 @@
 					batch: this.batch,
 					handleQty: this.handleQty,
 				}
-				this.$emit("confirm", obj);
+				this.$emit("onConfirm", obj);
 				// if(!obj.fromLocationCode){
 				// 	this.$refs.comMessage.showErrorMessage('请选择来源库位');
 				// 	return;