From 05a1c0f7784264abeebacf3de8458b4036dd0829 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 14 Nov 2024 16:54:46 +0800
Subject: [PATCH] =?UTF-8?q?YT-985=E6=96=B0=E5=A2=9E=EF=BC=8C=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=9D=A5=E6=BA=90=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=8F=89?=
 =?UTF-8?q?=E6=8E=89=E8=BF=98=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=BA=94=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=20YT-956=E6=89=AB=E6=8F=8F=E7=9B=B8=E5=90=8C=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=B8=8D=E5=90=8C=E6=89=B9=E6=AC=A1=EF=BC=8C=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=E8=BE=93?=
 =?UTF-8?q?=E5=85=A52=EF=BC=8C=E5=B8=A6=E5=87=BA=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 520cff17..5b636627 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -444,7 +444,7 @@
 					}
 					console.log(detail)
 					if (detail == undefined) {
-						let newDetail = createDetailInfo(balance, pack);
+					let newDetail = createDetailInfoForLabel(balance, pack, result.label);
 						// newDetail.inventoryStatus = balance.inventoryStatus;
 						if (this.businessTypeCode == "Move") {
 							newDetail.toInventoryStatus = balance.inventoryStatus;
@@ -452,9 +452,9 @@
 							newDetail.toInventoryStatus = this.toInventoryStatus;
 						}
 				
-						if (newDetail.packingNumber == '') {
-							newDetail.packingNumber = pack.number;
-						}
+						// if (newDetail.packingNumber == '') {
+						// 	newDetail.packingNumber = pack.number;
+						// }
 						newDetail.toLocationCode = this.toLocationCode;
 						newDetail.managementTypeParams = managementTypeParams;
 						newDetail.fromLocationCode = result.fromLocationCode
diff --git a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
index 6b70c023..cd1e0d55 100644
--- a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
+++ b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
@@ -10,7 +10,8 @@
 			<view class="item">
 				<view class="label">来源库位：</view>
 				<view class="value">
-					<u-input v-model="fromLocationCode"  clearable @blur="fromLocationScanMsg"></u-input>
+					<u-input v-model="fromLocationCode" @blur="fromLocationScanMsg" ></u-input>
+					<u-icon name="close-circle-fill" color="#acacac" size="36" @click="fromLocationCode=''" v-if="fromLocationCode"></u-icon>
 				</view>
 				<view class="searchIcon">
 					<image src="/static/search.svg" mode=""  @click="fromLocationClick"/>
@@ -19,7 +20,8 @@
 			<view class="item">
 				<view class="label">零件：</view>
 				<view class="value">
-					<u-input v-model="itemCode" clearable></u-input>
+					<u-input v-model="itemCode"></u-input>
+					<u-icon name="close-circle-fill" color="#acacac" size="36" @click="itemCode=''" v-if="itemCode"></u-icon>
 				</view>
 				<view class="searchIcon">
 					<image src="/static/search.svg" mode=""  @click="itemCodeClick"/>
@@ -28,7 +30,8 @@
 			<view class="item">
 				<view class="label">批次：</view>
 				<view class="value">
-					<u-input v-model='batch' clearable></u-input>
+					<u-input v-model='batch'></u-input>
+					<u-icon name="close-circle-fill" color="#acacac" size="36" @click="batch = ''" v-if="batch"></u-icon>
 				</view>
 				<view class="searchIcon"></view>
 			</view>
@@ -73,7 +76,8 @@
 				fromLocationCode:'',
 				itemCode:'',
 				batch:'',
-				showOne:false
+				showOne:false,
+				isFromLocationFocus:false
 			}
 		},
 		props: {
@@ -126,9 +130,9 @@
 			},
 			fromLocationScanMsg(){
 				if (this.fromLocationCode) {
-				console.log(111,this.fromLocationCode)
 				this.scanMsg = this.fromLocationCode
 				this.fromWitch = 'fromLocationScanMsg'
+				this.isFromLocationFocus = false
 				this.handelScanMsg()
 				}
 			},