From 51f7882f62ee5cec9fbf410770996ef6e0cf14b6 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 1 Aug 2024 13:14:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/fg/fgChange.vue | 59 ++++++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/pages/fg/fgChange.vue b/src/pages/fg/fgChange.vue
index 5a2a1d0e..93b0b003 100644
--- a/src/pages/fg/fgChange.vue
+++ b/src/pages/fg/fgChange.vue
@@ -70,7 +70,8 @@
 			<win-scan-button @goScan='openScanFgPopup'></win-scan-button>
 		</view>
 
-		<win-com-scan-balance ref="scanPopup" @getBalance='getPackScanResult' :bussinessCode="bussinessCode" :verifyCategory='true'>
+		<win-com-scan-balance ref="scanPopup" @getBalance='getPackScanResult' :bussinessCode="bussinessCode"
+			:verifyCategory='true'>
 		</win-com-scan-balance>
 
 		<win-scan-fg-label ref="scanFgPopup" @getResult='getFgScanResult' title='灯码'></win-scan-fg-label>
@@ -140,6 +141,7 @@
 				businessType: {},
 				show: false,
 				toItemCode: "请选择变更后物料",
+				toItemInfo: {},
 				toItemList: [],
 				fgList: [],
 				currentPackage: null,
@@ -297,32 +299,68 @@
 				if (this.currentPackage.handleQty == null) {
 					this.$refs.comMessage.showQuestionMessage('是否要将全部灯码进行变更?', res => {
 						if (res) {
-							this.commitRecord();
+							this.commitChange();
 						}
 					})
 				} else {
 					this.$refs.comMessage.showQuestionMessage('是否要将已扫描的【' + this.currentPackage.handleQty + '】个灯码进行变更?',
 						res => {
 							if (res) {
-								this.commitRecord();
+								this.commitChange();
 							}
 						})
 				}
 			},
-			commitRecord() {
-				// this.showCommitSuccessMessage('提交成功')
+
+			commitChange() {
+				// uni.showLoading({
+				// 	title:'提交中...',
+				// 	mask:true
+				// })
+
+				let params = this.setParams();
+				console.log('params', JSON.stringify(params))
+
 			},
 
+
 			setParams() {
-				let scanedList = this.fgList.filter(r => r.scaned == true)
-				if (this.currentPackage.handleQty > 0) {
-					scanedList = this.fgList.filter(r => r.scaned == true)
+				var creator = this.$store.state.user.id
+				var subList = this.fgList.filter(r => r.scaned == true)
+				if (this.currentPackage.handleQty == undefined) {
+					subList = this.fgList;
 				}
 
-				var creator = this.$store.state.user.id
+				// var item = deepCopyData(this.currentPackage);
+				var item = {};
+				item.fromItemCode = this.currentPackage.itemCode;
+				item.fromItemName = this.currentPackage.itemName;
+				item.fromItemDesc1 = this.currentPackage.itemDesc1;
+				item.fromItemDesc2 = this.currentPackage.itemDesc2;
+
+				item.toItemCode = this.toItemCode;
+				item.toItemName = this.toItemInfo.itemName;
+				item.toItemDesc1 = this.toItemInfo.itemDesc1;
+				item.toItemDesc2 = this.toItemInfo.itemDesc2;
+
+				item.fromInventoryStatus = this.currentPackage.inventoryStatus;
+				item.fromQty = this.currentPackage.handleQty;
+				item.fromParentPackingNumber = this.currentPackage.parentNumber;
+				item.fromPackingNumber = this.currentPackage.packingNumber;
+				item.fromBatch = this.currentPackage.batch;
+				item.fromLocationCode = this.currentPackage.locationCode;
+				item.fromPackUnit = this.currentPackage.packUnit;
+				item.fromPackQty = this.currentPackage.packQty;
+
+				item.toPackQty = this.currentPackage.packUnit;
+				item.toPackUnit = this.currentPackage.packUnit;
+
+
+				item.subList = subList;
+				item.creator = creator;
+				return item;
 			},
 
-
 			showMessage(message) {
 				setTimeout(r => {
 					this.scanPopupLoseFocus();
@@ -396,6 +434,7 @@
 			},
 			confirmSelect(e) {
 				this.toItemCode = e[0].value;
+				this.toItemInfo = e[0];
 			},
 		}
 	}