From 6acb6c923a9a38652a91e9439371fcd2828e9830 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 5 Sep 2024 09:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=94=E7=A6=BB=E8=BD=AC?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E4=BF=AE=E6=94=B9=E7=9B=AE=E6=A0=87=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coms/comInventoryDetailCard.vue           | 26 ++++++++++++++-----
 .../inventoryMove/job/inventoryMoveDetail.vue | 12 +++++++--
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
index fce0dcf3..bf900352 100644
--- a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -19,7 +19,7 @@
 		</uni-collapse>
 		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" :allowEditQty="allowEditQty" @confirm="confirm"
 			:allowEditStatus="true"></balance-qty-edit>
-		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'></win-scan-location>
+		<win-scan-location ref="scanLocationCode" :locationAreaTypeList="locationAreaTypeList" title="目标库位" @getLocation='getLocation'></win-scan-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 		<comMessage ref="message"></comMessage>
 	</view>
@@ -71,13 +71,27 @@
 				type: Boolean,
 				default: false
 			},
+			locationAreaTypeList: {
+				type: Array,
+				default: []
+			}
 		},
 		watch: {
-			// dataContent: {
-			// 	handler(newName, oldName) {},
-			// 	immediate: true,
-			// 	deep: true
-			// }
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						this.$nextTick(res => {
+							setTimeout(() => {
+								if (this.$refs.collapse1) {
+									this.$refs.collapse1.resize();
+								}
+							}, 200)
+						})
+					}
+				},
+				immediate: true,
+				deep: true
+			}
 		},
 		mounted() {
 			if (this.detailOptions.length == 0) {
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 207ed519..7d7fc400 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -13,7 +13,9 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<comInventoryDetailCard  :dataContent="item" :settingParam="jobContent" @remove="updateData"
-							@updateData='updateData' @openDetail="openDetail">
+							@updateData='updateData' 
+							:locationAreaTypeList="toLocationAreaTypeList"
+							@openDetail="openDetail">
 						</comInventoryDetailCard>
 					</view>
 				</view>
@@ -55,6 +57,10 @@
 		getScanCount,
 		calcHandleQty
 	} from '@/common/detail.js';
+	import {
+		getDirectoryItemArray,
+	} from '@/common/directory.js';
+	
 	import {
 		goHome,
 		navigateBack,
@@ -95,7 +101,8 @@
 				toLocationCode: '',
 				toInventoryStatus: '',
 				jobStatus: "",
-				title: ''
+				title: '',
+				toLocationAreaTypeList:[]
 			};
 		},
 		props: {
@@ -220,6 +227,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes);
 							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList)