From ef8d37726fb706eba1b6d82e3cd4cbccba7eb6c6 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 8 Jul 2024 14:23:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=BA=93=E4=BD=8D=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.vue                     |  2 +-
 .../purchaseReceipt/job/receiptDetail.vue     | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index d3ba15bc..128d1822 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -387,7 +387,7 @@
 					console.log("包装规格获取失败", res)
 				})
 				
-				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA";
+				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate";
 
 				getSwitchByCode(switchCode).then(res=>{
 					uni.setStorageSync("switch", res.data)
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index eb213c52..8da07968 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -44,7 +44,7 @@
 				<view v-if="operation=='receipt'" class="uni-flex u-col-center space-between padding_10">
 					<view>
 						<locationCompare ref="locationCompare" title="收货库位" :recommendLocationCode="jobToLocationCode"
-							:locationCode="toLocationCode" @getLocation='scanLocationCode'
+							 @getLocation='scanLocationCode'
 							:locationAreaTypeList="toLocationAreaTypeList">
 						</locationCompare>
 					</view>
@@ -143,8 +143,9 @@
 				operation: '',
 				scanedPackingNumber: '',
 				status: '',
-				switchCode: '',
-				reasonText: ""
+				switchCode:"",
+				isCheckLocation: 'purchaseReceiptLocationCodeValidate',//校验收货库位
+				reasonText: "",
 			};
 		},
 
@@ -154,7 +155,7 @@
 			this.scanedPackingNumber = option.scaned || '';
 			this.operation = option.operation;
 			this.status = option.status;
-			this.switchCode = "purchasereceiptPrintPDA"
+			this.switchCode = "purchasereceiptPrintPDA"//pda打印
 
 
 		},
@@ -240,6 +241,12 @@
 							that.jobStatus = res.data.status
 							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.detailSource = getTreeDataSource(that.subList)
+							that.isCheckLocation = getSwitchInfoByCode(that.isCheckLocation)
+							if (that.isCheckLocation) {
+								that.toLocationCode = ""
+							} else {
+								that.toLocationCode = that.jobToLocationCode;
+							}
 							that.isAllReceived = false;
 							nextTick(() => {
 								that.detailSource.forEach(r => {
@@ -494,10 +501,8 @@
 				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
 					if (res.success) {
 						this.managementList = res.list;
-						var params = this.setParams()
+						var params = this.setParams();
 						purchaseReceiptJobSubmit(params).then(res => {
-
-
 							if (res.data) {
 								let isCheckPrint = getSwitchInfoByCode(this.switchCode)
 								if (!isCheckPrint) {
@@ -559,10 +564,8 @@
 										})
 									}, 2000)
 
-
 								}
 
-
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}