From d1e4741673ce1e05445a6ee8f94ad06b3a2cc9de Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 3 Dec 2024 09:29:08 +0800
Subject: [PATCH] =?UTF-8?q?YT-1457=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=89=AB=E6=8F=8F=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8EPDA=E6=8F=90=E4=BA=A4=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winScanPackAndLocation.vue | 4 ++--
 src/pages/unPlanned/job/issueJobDetail.vue       | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index dfcad073..a360b898 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -40,7 +40,7 @@
 				<view class="">
 					<view class="">
 						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult" :isShowHistory="isShowHistory"
-							:clearResult="true" :headerType="headerType"></win-com-scan>
+							:clearResult="true" :headerType="headerType" :locationCode='fromLocationCode'></win-com-scan>
 					</view>
 				</view>
 			</view>
@@ -282,7 +282,7 @@
 								// this.packGetFocus();
 								// 如果只回显
 								if(this.isJustReplay){
-									this.$emit("getResult",scanResult);
+									this.$emit("getResult",scanResult, this.managementPrecision);
 									uni.hideLoading()
 								}else{
 									this.checkPackage(scanResult);
diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue
index 7ce5a9ec..bba58a3a 100644
--- a/src/pages/unPlanned/job/issueJobDetail.vue
+++ b/src/pages/unPlanned/job/issueJobDetail.vue
@@ -243,8 +243,12 @@
 				this.$refs.detailInfoPopup.openPopup(item)
 			},
 
-			getScanResult(result) {
-				if(import.meta.env.VITE_MANAGE_MODEL == 'BY_BATCH'){
+			getScanResult(result,managementPrecision) {
+				console.log(33,result,managementPrecision)
+				if(managementPrecision == 'BY_QUANTITY'){
+					result.label.batch = ''
+					this.setDataBatch(result)
+				}else if(managementPrecision == 'BY_BATCH' ){
 					this.setDataBatch(result)
 				}else{
 					this.setData(result)