From 39140b9b113128b1d8369fe14882c563e09e7a04 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 18 Apr 2024 11:19:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=98=8E=E7=BB=86UI=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9---tab=E6=B7=BB=E5=8A=A0=E2=80=9C=E4=B8=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E2=80=9D=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Descriptions/src/Descriptions.vue |  4 ++--
 src/components/Detail/src/Detail.vue             | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index 56540d68b..60212a6ca 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -15,8 +15,8 @@ const mobile = computed(() => appStore.getMobile)
 const attrs = useAttrs()
 
 const slots = useSlots()
-const height = ref('200px')
-const isShow = ref(false)
+const height = ref('auto')
+const isShow = ref(true)
 
 
 const props = defineProps({
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 44149fdbf..27d53e1c1 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -12,7 +12,8 @@
           {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
         </div>
       </template>
-      <ContentWrap v-if="!isBasic">
+      <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change" />
+      <ContentWrap v-if="!isBasic" v-show="tabsList[current].label=='主数据'">
         <Descriptions
           :data="detailData"
           labelClassName="label-class-name"
@@ -24,11 +25,9 @@
           width="200px"
         />
       </ContentWrap>
-
-      <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change" />
       <div class="flex">
         <!-- 详情 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label!=annexAliasLabel&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'&&!annexTableData.some(item=>item.label==tabsList[current].label)">          <!-- 列表头部 -->
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label!=annexAliasLabel&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'&&tabsList[current].label!='主数据'&&!annexTableData.some(item=>item.label==tabsList[current].label)">          <!-- 列表头部 -->
           <TableHead
             v-if="!isBasic"
             :HeadButttondata="HeadButttondata"
@@ -401,6 +400,10 @@ if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.leng
       prop: 'Detail'
   })
 }
+tabsList.value.unshift({
+    label: '主数据',
+    prop: 'Descriptions'
+})
 
 //  Tabs 
 const tabRef = ref()
@@ -473,7 +476,6 @@ const getAnnexFileList =  async (row:id) => {
         });
         await getSubList()
         item.subDetailTableData.tableList = subTableObject.tableList
-        annexItem.subDetailTableData.tableList
         console.log('subTableObject',annexTableData.value)
       }
     }