From c12307b2b2b4323cba2076ffce16e9642ade5702 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 11 Nov 2024 14:22:16 +0800
Subject: [PATCH] =?UTF-8?q?YT-858PDA=E9=9A=94=E7=A6=BB=E8=BD=AC=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E6=9D=A5=E6=BA=90=E5=BA=93=E4=BD=8D=E7=82=B9=E6=94=BE?=
 =?UTF-8?q?=E5=A4=A7=E9=95=9C=E6=B2=A1=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/inventoryMove/coms/comMoveRecord.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index a3948b52..b2d9ba35 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page-wraper">
 		<view class="">
-			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+			<com-blank-view @goScan='showPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
 			<view class='split_line'></view>
@@ -32,7 +32,7 @@
 					</view>
 				</view>
 			</view>
-			<win-scan-button @goScan='showFromLocationPopup'></win-scan-button>
+			<win-scan-button @goScan='showPopup'></win-scan-button>
 		</view>
 		<!-- 合格转隔离单独的弹窗-->
 		<okToHoldRecordPack ref="okToHoldRecordPackRef" :showOnePop='showOnePop'  @showFromLocationPopup='showFromLocationPopup'  @itemCodeClick='openScanPopup' @confirm='okToHoldRecordPackConfirm'   @getInputMsgResult="getInputMsgResult" @itemCodeScanMsg='itemCodeScanMsg' @clickBtnClearFromLocation='clearFromLocation' @clickBtnClearItemCode='clearItemCode'></okToHoldRecordPack>
@@ -156,7 +156,7 @@
 					this.businessType = res.businessType;
 					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
 					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
-					this.showFromLocationPopup()
+					this.showPopup()
 				} else {
 					this.showErrorMessage(res.message)
 				}
@@ -241,6 +241,9 @@
 				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
 			},
 			showFromLocationPopup() {
+				this.$refs.scanFromLocationCode.openScanPopup();
+			},
+			showPopup() {
 				setTimeout(()=>{
 					if(this.showOnePop){
 						this.$refs.okToHoldRecordPackRef.fromLocationCode = ''
@@ -256,6 +259,7 @@
 			},
 			getFromLocation(location) {
 				this.fromLocationCode = location.code;
+				this.$refs.okToHoldRecordPackRef.fromLocationCode = location.code
 				this.fromLocationInfo = location;
 				if(!this.showOnePop){
 					this.openScanPopup();
@@ -272,9 +276,10 @@
 				this.managementType = managementTypeParams
 				if(this.showOnePop){
 					this.$refs.okToHoldRecordPackRef.itemCode= result.balance.itemCode
-					this.$refs.okToHoldRecordPackRef.batch =  result.balance.batch
+					this.$refs.okToHoldRecordPackRef.batch =  result.label.batch
 					this.getResult = result//存储接受的结果
 					this.$refs.scanPopup.closeScanPopup()
+					console.log(11,result)
 					
 				}else{
 					if(managementTypeParams == "BY_BATCH" ||managementTypeParams == "BY_QUANTITY" ){