From 2a4701138fbbc9ddb928f03d1ba6ece596b05c60 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 11 Jan 2024 15:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E6=94=B6?=
 =?UTF-8?q?=E6=96=99=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/detail/comDetailCard.vue              | 14 +++++++++++++-
 pages/productReceipt/coms/comProductDetailCard.vue | 14 +++++++++++++-
 .../productionReturn/coms/comReturnDetailCard.vue  |  4 ++--
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/mycomponents/detail/comDetailCard.vue b/mycomponents/detail/comDetailCard.vue
index d48c70c5..ffbcc382 100644
--- a/mycomponents/detail/comDetailCard.vue
+++ b/mycomponents/detail/comDetailCard.vue
@@ -73,7 +73,19 @@
 			},
 		},
 		watch: {
-
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
 		},
 
 		data() {
diff --git a/pages/productReceipt/coms/comProductDetailCard.vue b/pages/productReceipt/coms/comProductDetailCard.vue
index ee8c62c6..8bbfadba 100644
--- a/pages/productReceipt/coms/comProductDetailCard.vue
+++ b/pages/productReceipt/coms/comProductDetailCard.vue
@@ -69,7 +69,19 @@
 			
 		},
 		watch: {
-
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
 		},
 
 		data() {
diff --git a/pages/productionReturn/coms/comReturnDetailCard.vue b/pages/productionReturn/coms/comReturnDetailCard.vue
index 205747fc..0ccad990 100644
--- a/pages/productionReturn/coms/comReturnDetailCard.vue
+++ b/pages/productionReturn/coms/comReturnDetailCard.vue
@@ -62,8 +62,8 @@
 				default: {}
 			},
 			locationTypeList: {
-				type: Object,
-				default: {}
+				type: Array,
+				default: []
 			},