From 7139d0ef48529532ece67396ceb92bc55c97eec7 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Sat, 24 Aug 2024 09:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productReceipt/job/ccProductReceiptDetail.vue    |  7 ++-----
 .../productReceipt/job/fgProductReceiptDetail.vue    | 12 +++---------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/pages/productReceipt/job/ccProductReceiptDetail.vue b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
index 36cb5c65..a2769df1 100644
--- a/src/pages/productReceipt/job/ccProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
@@ -228,9 +228,6 @@
 							that.subList = res.data.subList;
 							that.jobStatus = res.data.status
 							that.jobToLocationCode = that.subList[0].toLocationCode
-							if (that.jobContent.allowModifyLocation == 'FALSE') {
-								that.toLocationCode = that.subList[0].toLocationCode
-							}
 							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
 							that.detailSource = getDataSource(that.subList)
 							if (that.scanMessage) {
@@ -269,7 +266,7 @@
 						} else {
 							itemDetail.scaned = true;
 							itemDetail.handleQty = Number(result.label.qty);
-							itemDetail.toLocationCode = this.toLocationCode;
+							itemDetail.toLocationCode = this.toLocationCode?this.toLocationCode:this.jobToLocationCode;
 							itemDetail.labelQty = Number(result.label.qty);
 							calcHandleQty(this.detailSource);
 							this.continueScan()
@@ -347,7 +344,7 @@
 						return
 					}
 				}else{
-					this.toLocationCode = this.jobToLocationCode
+					this.toLocationCode = this.toLocationCode?this.toLocationCode:this.jobToLocationCode
 				}
 
 
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index c702a838..aa9ad0e9 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -52,7 +52,7 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
+					<locationCompare  ref ="comScanLocation" title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
 						:recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
 						@getLocation='scanLocationCode' :locationTypeList="toLocationTypeList"></locationCompare>
 				</view>
@@ -230,15 +230,9 @@
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
 							that.jobStatus = res.data.status
+							that.jobContent.allowModifyLocation = 'TRUE'
 							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.productionLineCode = that.subList[0].productionLineCode;
-							var valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate")
-							if(valiDate){
-								that.jobContent.allowModifyLocation = 'TRUE'
-								
-							}else{
-								that.jobContent.allowModifyLocation = 'FALSE'
-							}
 							// if (that.jobContent.allowModifyLocation == 'FALSE') {
 							// 	that.toLocationCode = that.subList[0].toLocationCode
 							// }
@@ -455,7 +449,7 @@
 						return
 					}
 				}else{
-					this.toLocationCode = this.jobToLocationCode
+					this.toLocationCode = this.toLocationCode?this.toLocationCode:this.jobToLocationCode
 				}
 				this.detailSource.forEach(item => {
 					item.subList.forEach(subitem => {