From c7f7528259c2cc35ed1b5dd2ee8be378a618a175 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 5 Dec 2023 09:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/issue/coms/comScanIssuePack.vue |  4 +--
 pages/issue/job/issueDetail.vue       |  3 +-
 pages/issue/record/issueRecord.vue    | 46 ++++++++++++++++++++++++---
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue
index 2564ad7e..fcbb192e 100644
--- a/pages/issue/coms/comScanIssuePack.vue
+++ b/pages/issue/coms/comScanIssuePack.vue
@@ -158,8 +158,8 @@
 				this.dataContent = content;
 				this.jobContent = jobcontent;
 				this.initData();
-				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
-					"-" + this.jobContent.subList[0].workStationCode
+				// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
+				// 	"-" + this.jobContent.subList[0].workStationCode
 				this.$refs.popup.open('bottom');
 			},
 
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index 49fb01e1..5bdd2585 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -55,10 +55,9 @@
 		getManagementPrecisions
 	} from '@/common/balance.js';
 
-
 	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue
index 7a007173..66d4730e 100644
--- a/pages/issue/record/issueRecord.vue
+++ b/pages/issue/record/issueRecord.vue
@@ -28,8 +28,11 @@
 			</div>
 		</view>
 	</view>
-	<comMessage ref="comMessage"></comMessage>
+	<com-message ref="comMessage"></com-message>
 	<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm'></com-issue-request-popup>
+	<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
+	<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+	</com-scan-issue-pack>
 </template>
 
 <script>
@@ -57,6 +60,8 @@
 	import comIssueRequestCreator from '@/pages/issue/coms/comIssueRequestCreator.vue'
 	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
 	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
 
 	export default {
 		name: 'issueRequestSubmit',
@@ -67,7 +72,9 @@
 			comMessage,
 			comIssueRequestCreator,
 			comIssueRequestInfo,
-			comIssueDetailCard
+			comIssueDetailCard,
+			winScanButton,
+			comScanIssuePack
 		},
 		data() {
 			return {
@@ -117,7 +124,7 @@
 					} else {
 						if (res.data.length > 0) {
 							this.workShopCode = item.workshopCode;
-							res.data.forEach(r => { 	 
+							res.data.forEach(r => {
 								r.toLocationCode = item.rawLocationCode;
 								r.productionLineCode = item.productionLineCode;
 								r.workStationCode = item.workStationCode;
@@ -197,7 +204,6 @@
 			},
 
 
-
 			caclcQty() {
 				var totalQty = 0;
 				this.detailSource.subList.forEach(res => {
@@ -206,6 +212,38 @@
 				this.detailSource.totalQty = totalQty;
 			},
 
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
+							record.batch);
+						let handleQty = 0;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty += Number(res.qty)
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty += handleQty;
+						}
+					})
+				}
+				// item.handleQty=itemHandleQty;
+			},
 
 			setParams() {
 				return this.detailSource