From 7726a1c809b8c8fb637df3fa364e4659108cbcf3 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 24 Nov 2023 17:01:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/customerReturn/job/returnDetail.vue     | 43 +++++++++----------
 pages/deliver/job/deliverDetail.vue           |  7 +--
 .../job/productDismantleDetail.vue            |  7 +--
 .../job/productPutawayDetail.vue              | 36 ++++++++--------
 .../job/productReceiptDetail.vue              |  5 ++-
 .../job/productionReceiptDetail.vue           |  7 +--
 pages/productionReturn/job/returnDetail.vue   |  5 ++-
 .../request/returnToStoreRequest.vue          |  2 +-
 pages/purchaseReceipt/job/receiptDetail.vue   |  1 -
 pages/putaway/job/putawayDetail.vue           |  7 +--
 pages/repleinsh/job/repleinshDetail.vue       |  7 ++-
 pages/transfer/job/issueDetail.vue            |  7 +--
 pages/transfer/job/receiptDetail.vue          |  6 +--
 pages/unPlanned/job/receiptJobDetail.vue      |  7 ++-
 14 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue
index 378403d5..b232a251 100644
--- a/pages/customerReturn/job/returnDetail.vue
+++ b/pages/customerReturn/job/returnDetail.vue
@@ -14,14 +14,15 @@
 			</scroll-view>
 		</view>
 
-		<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-			@getLocation='getToLocationCode' :isShowEdit="jobContent.allowModifyLocation == 1"
-			:locationTypeList="tolocationTypeList"></requiredLocation>
+
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -348,7 +349,7 @@
 				}
 			},
 
-			 submitJob() {
+			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -403,19 +404,19 @@
 				this.jobContent.creator = creator;
 				return this.jobContent;
 			},
-			
+
 			checkLocation() {
 				var isPass = true;
 				if (this.toLocationCode == "" || this.toLocationCode == null) {
 					this.showMessageHint('请扫描收货库位', callback => {
 						this.$refs.comScanLocation.showLocation();
 					})
-			
+
 					return isPass = false;
 				}
 				return isPass;
 			},
-			
+
 			showMessageHint(hint, callback) {
 				this.$refs.comMessage.showErrorMessage(hint, res => {
 					if (res) {
@@ -469,27 +470,23 @@
 				this.scanPopupGetFocus();
 			},
 
-			getToLocationCode(location, code) {
-				if (this.fromLocationCode == code) {
-					this.$refs.comMessage.showMessage('来源库位[' + this.fromLocationCode + '] 不能与目标库位[' + code + '] 一致 ',
-						res => {
-							this.$refs.comScanLocation.showLocation();
-						});
-				} else {
-					this.toLocationInfo = location;
-					this.toLocationCode = code;
-				}
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
 			},
 
 			showCommitSuccessMessage(hint) {
-				setTimeout(() => {
-					this.$refs.comMessage.showSuccessMessage(hint, res => {
-
-					})
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					uni.navigateTo({
-						url: './returnJobreturnJob'
+						url: './returnJob'
 					})
-				}, 3000)
+				})
 			},
 		}
 	}
diff --git a/pages/deliver/job/deliverDetail.vue b/pages/deliver/job/deliverDetail.vue
index 663a0733..1d7bc4e9 100644
--- a/pages/deliver/job/deliverDetail.vue
+++ b/pages/deliver/job/deliverDetail.vue
@@ -13,13 +13,14 @@
 			</scroll-view>
 		</view>
 
-		<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-			@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-			:locationTypeList="tolocationTypeList"></requiredLocation>
+		
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
diff --git a/pages/productDismantle/job/productDismantleDetail.vue b/pages/productDismantle/job/productDismantleDetail.vue
index 89a3465f..9855c2b1 100644
--- a/pages/productDismantle/job/productDismantleDetail.vue
+++ b/pages/productDismantle/job/productDismantleDetail.vue
@@ -14,14 +14,15 @@
 			</scroll-view>
 		</view>
 
-		<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-			@getLocation='getToLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-			:locationTypeList="tolocationTypeList"></requiredLocation>
+		
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='getToLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
diff --git a/pages/productPutaway/job/productPutawayDetail.vue b/pages/productPutaway/job/productPutawayDetail.vue
index 8eab09e4..8631c7e7 100644
--- a/pages/productPutaway/job/productPutawayDetail.vue
+++ b/pages/productPutaway/job/productPutawayDetail.vue
@@ -15,14 +15,13 @@
 			</scroll-view>
 		</view>
 
-		<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-			@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 1"
-			:locationTypeList="tolocationTypeList"></requiredLocation>
-
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 1"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -39,7 +38,6 @@
 </template>
 
 <script>
-	
 	import {
 		getManagementPrecisions,
 	} from '@/common/balance.js';
@@ -324,11 +322,11 @@
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
-					//校验库位、
+				//校验库位、
 				if (!this.checkLocation()) {
 					return
 				}
-				
+
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					this.submitJob();
@@ -349,19 +347,19 @@
 					}
 				}
 			},
-			
+
 			checkLocation() {
 				var isPass = true;
-				if (this.toLocationCode == ""||this.toLocationCode ==null) {
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
 					this.showMessageHint('请扫描收货库位', callback => {
 						this.$refs.comScanLocation.showLocation();
 					})
-			
+
 					return isPass = false;
 				}
 				return isPass;
 			},
-			
+
 			showMessageHint(hint, callback) {
 				this.$refs.comMessage.showErrorMessage(hint, res => {
 					if (res) {
@@ -370,7 +368,7 @@
 				});
 			},
 
-			 submitJob() {
+			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -379,8 +377,8 @@
 				this.detailSource.forEach(item => {
 					itemCodes.push(item.itemCode)
 				})
-				
-				getManagementPrecisions(itemCodes,this.toLocationCode, res => {
+
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
 					if (res.success) {
 						this.managementList = res.list;
 						var params = this.setParams();
@@ -396,7 +394,7 @@
 						// 	uni.hideLoading()
 						// 	this.showErrorMessage(error)
 						// })
-						
+
 					} else {
 						uni.hideLoading();
 						this.showErrorMessage(res.message);
@@ -407,20 +405,20 @@
 			setParams() {
 				var subList = []
 				var creator = this.$store.state.user.id
-				
+
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
 							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
 								detail.packingNumber, detail.batch);
-								detail.toPackingNumber =info.packingNumber;
-								detail.toBatch =info.batch;
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
 							subList.push(detail)
 						}
 					})
 				})
 				this.jobContent.subList = subList
-				this.jobContent.creator =creator;
+				this.jobContent.creator = creator;
 				return this.jobContent;
 			},
 
diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue
index 64f9245f..a52f9f91 100644
--- a/pages/productReceipt/job/productReceiptDetail.vue
+++ b/pages/productReceipt/job/productReceiptDetail.vue
@@ -14,13 +14,14 @@
 			</scroll-view>
 		</view>
 
-		<requiredLocation title="收货库位" :locationCode="toLocationCode" :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
-			@getLocation='scanLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation>
+		
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation title="收货库位" :locationCode="toLocationCode" :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
+						@getLocation='scanLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
diff --git a/pages/productionReceipt/job/productionReceiptDetail.vue b/pages/productionReceipt/job/productionReceiptDetail.vue
index 1fe59750..e758ab73 100644
--- a/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -14,14 +14,15 @@
 			</scroll-view>
 		</view>
 
-		<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-			@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 1"
-			:locationTypeList="tolocationTypeList"></requiredLocation>
+		
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 1"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue
index 37a4c3b7..a06991ab 100644
--- a/pages/productionReturn/job/returnDetail.vue
+++ b/pages/productionReturn/job/returnDetail.vue
@@ -14,13 +14,14 @@
 			</scroll-view>
 		</view>
 
-		<requiredLocation title="目标库位" :locationCode="toLocationCode" :isShowEdit="jobContent.allowModifyLocation==1"
-			@getLocation='scanLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation>
+		
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation title="目标库位" :locationCode="toLocationCode" :isShowEdit="jobContent.allowModifyLocation==1"
+						@getLocation='scanLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
diff --git a/pages/productionReturn/request/returnToStoreRequest.vue b/pages/productionReturn/request/returnToStoreRequest.vue
index 3a58846f..002f607c 100644
--- a/pages/productionReturn/request/returnToStoreRequest.vue
+++ b/pages/productionReturn/request/returnToStoreRequest.vue
@@ -14,7 +14,7 @@
 				</view>
 			</uni-swipe-action>
 			<uni-load-more :status="loadingType" />
-			<requestButton @goScan='openScanDetailPopup'></requestButton>
+			
 			<request-info-popup ref='requestInfoPopup'></request-info-popup>
 		</view>
 	</view>
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index 258e7498..8c4952aa 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -21,7 +21,6 @@
 					<required-location ref="requiredLocation" title="默认收货库位" :locationCode="toLocationCode"
 						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
 						:locationTypeList="locationTypeList"></required-location>
-					
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index b9574c48..7e779048 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -14,14 +14,15 @@
 			</scroll-view>
 		</view>
 
-		<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-			@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-			:locationTypeList="tolocationTypeList"></requiredLocation>
+
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue
index fb5a9020..4a846949 100644
--- a/pages/repleinsh/job/repleinshDetail.vue
+++ b/pages/repleinsh/job/repleinshDetail.vue
@@ -14,14 +14,13 @@
 			</scroll-view>
 		</view>
 
-		<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-			@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-			:locationTypeList="tolocationTypeList"></requiredLocation>
-
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
diff --git a/pages/transfer/job/issueDetail.vue b/pages/transfer/job/issueDetail.vue
index 54615fbd..16fd874d 100644
--- a/pages/transfer/job/issueDetail.vue
+++ b/pages/transfer/job/issueDetail.vue
@@ -12,14 +12,15 @@
 				</view>
 			</scroll-view>
 		</view>
-		<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-			@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-			:locationTypeList="tolocationTypeList"></requiredLocation>
+		
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
diff --git a/pages/transfer/job/receiptDetail.vue b/pages/transfer/job/receiptDetail.vue
index 1ec220d2..fafa18c8 100644
--- a/pages/transfer/job/receiptDetail.vue
+++ b/pages/transfer/job/receiptDetail.vue
@@ -12,14 +12,14 @@
 				</view>
 			</scroll-view>
 		</view>
-		<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-			@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-			:locationTypeList="tolocationTypeList"></requiredLocation>
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						:locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue
index ae35485b..bcd459d4 100644
--- a/pages/unPlanned/job/receiptJobDetail.vue
+++ b/pages/unPlanned/job/receiptJobDetail.vue
@@ -12,15 +12,14 @@
 				</view>
 			</scroll-view>
 		</view>
-		<required-location ref="requiredLocation" title="目标库位" :locationCode="toLocationCode"
-			:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
-			:locationTypeList="toLocationTypeList"></required-location>
-
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
+					<required-location ref="requiredLocation" title="目标库位" :locationCode="toLocationCode"
+						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
+						:locationTypeList="toLocationTypeList"></required-location>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>