From 9d6f0981ecc6917e0bada2da2624ca39ec4eea99 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 7 May 2024 13:32:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E8=BD=AC=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryMove/coms/comMoveRecord.vue      | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 79283255..27afcb68 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -24,7 +24,7 @@
 					<view class="">
 						<!-- :isShowEdit="isShowEditLocation" -->
 						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocation'
-							:locationAreaTypeList="toLocationAreaTypeList" :isShowEdit='true' ></requiredLocation>
+							:locationAreaTypeList="toLocationAreaTypeList" :isShowEdit='true'></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -124,7 +124,7 @@
 				dataContent: {},
 				fromLocationAreaTypeList: [],
 				toLocationAreaTypeList: [],
-				isShowEditLocation:false
+				isShowEditLocation: false
 			}
 		},
 
@@ -144,7 +144,7 @@
 		},
 
 		onLoad() {
-			
+
 		},
 
 		methods: {
@@ -153,12 +153,12 @@
 					this.title = "库存转移记录";
 					this.toInventoryStatus = ""
 					this.toLocationCode = ""
-					this.isShowEditLocation =true;
+					this.isShowEditLocation = true;
 				} else if (this.businessTypeCode == "HoldToOk") {
 					this.title = "隔离转合格记录";
 					this.toInventoryStatus = "OK"
 					this.toLocationCode = ""
-					this.isShowEditLocation =true;
+					this.isShowEditLocation = true;
 				} else if (this.businessTypeCode == "HoldToScrap") {
 					this.title = "隔离转报废记录";
 					this.toInventoryStatus = "SCRAP"
@@ -184,7 +184,7 @@
 					title: this.title
 				})
 			},
-			getLocationInfo(){
+			getLocationInfo() {
 				if (this.toLocationCode != "") {
 					getBasicLocationByCode(this.toLocationCode).then(res => {
 						if (res.data.total > 0) {
@@ -199,14 +199,14 @@
 						} else {
 							this.showErrorMessage('库位[' + this.toLocationCode + ']不存在')
 						}
-				
+
 					}).catch(error => {
 						uni.hideLoading();
 						this.showErrorMessage(error)
 					})
 				}
 			},
-			
+
 			openScanPopup() {
 				if (this.fromLocationCode == "") {
 					this.showFromLocationPopup();
@@ -239,8 +239,12 @@
 				if (item == undefined) {
 					var itemp = createItemInfo(balance, pack);
 					let newDetail = createDetailInfo(balance, pack);
-					// newDetail.inventoryStatus = balance.inventoryStatus;
-					newDetail.toInventoryStatus = this.toInventoryStatus;
+					// 
+					if (this.businessTypeCode == "Move") {
+						newDetail.toInventoryStatus = balance.inventoryStatus;
+					} else {
+						newDetail.toInventoryStatus = this.toInventoryStatus;
+					}
 					newDetail.toLocationCode = this.toLocationCode;
 					newDetail.fromLocationCode = result.fromLocationCode
 					itemp.subList.push(newDetail);
@@ -367,8 +371,7 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							if (detail.toLocationCode == '')
-							{
+							if (detail.toLocationCode == '') {
 								detail.toLocationCode = this.toLocationCode;
 							}
 							var filterResult = itemList.filter(res => {
@@ -422,7 +425,7 @@
 
 							submitItem.package = null;
 							submitItem.Records = null;
-							
+
 							submitItem.qty = detail.handleQty;
 
 							subList.push(submitItem)
@@ -441,4 +444,4 @@
 </script>
 
 <style>
-</style>
+</style>
\ No newline at end of file