From f7824ed42a103b8280808795f2bbe49950db8508 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 23 Jan 2025 10:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     |  2 +-
 .../DesignForm/tableListPage/index.vue        | 27 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index ab8cdad..1c243b4 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -2473,7 +2473,7 @@ function getAssociatedFormsCurrentFieldTree1() {
         (item: { type: string | null }) => item.type != "table"
       );
       resDataNoTableNoAsf = resDataNoTable.filter(
-        (item: { type: string | null }) => item.type != "associatedForms"&&item.type != "table"
+        (item: { type: string | null }) => item.type != "associatedForms"&&item.type != "table"&&item.type != "checkbox"
       );
 
       associatedFormsCurrentFormFieldTreeNoTable.value = [
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 0f10121..28eda11 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -926,7 +926,8 @@ const asfGetPageData = (asfFormId: any, asfToSelectMastersKey: any) => {
           let asfToSelectIds = [];
           for (let i = 0; i < data.data.list.length; i++) {
             let asfMasterAndAsfId: any = {};
-            asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field];
+            //asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field];
+            asfMasterAndAsfId.asfId = data.data.list[i].id
             asfMasterAndAsfId.asfMasterId = data.data.list[i].id;
 
             asfToSelectIds.push(asfMasterAndAsfId);
@@ -974,11 +975,15 @@ const asfGetPageData = (asfFormId: any, asfToSelectMastersKey: any) => {
     })
     .finally(() => {
       /* state.loading = false; */
-
-      //显示关联表单本条详情
-      tablePageClass.value = 4;
-      drawerWith.value = container.value?.clientWidth;
-      asflookPageInfoIsShow.value = true;
+      setTimeout(()=>{
+      //nextTick(() => {
+        //显示关联表单本条详情
+        tablePageClass.value = 4;
+        drawerWith.value = container.value?.clientWidth;
+        asflookPageInfoIsShow.value = true;
+      //});
+      },500)
+      
     });
 };
 
@@ -1959,7 +1964,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         >
           <table>
             <tr>
-              <th style="font-weight: bold; font-size:medium;" colspan="2">{{ tableData.groupName }}-{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{ tableKey }}</th>
+              <th style="font-weight: bold; font-size:medium;" colspan="2">{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}</th>
               <th rowspan="6"><img :src="tableData.bufferedImage" alt="二维码" width="auto" height="100%"></th>
             </tr>
             <tr v-for="(item, fIndex) in tableData.fieldsMap" :key="fIndex">
@@ -1979,17 +1984,11 @@ const diGuiJilian = (val: any, options: any[]) => {
         >
           <table >
             <tr>
-              <th style="font-weight: bold; font-size:medium;" colspan="1">{{ tableData.groupName }}-{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{ tableKey }}</th>
-              <!-- <th ><img :src="tableData.bufferedImage" alt="二维码" width="auto" height="100%"></th> -->
+              <th style="font-weight: bold; font-size:medium;" colspan="1">{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{ tablesData[tableKey].dataTitle }}</th>
             </tr>
             <tr>
-              <!-- <th style="font-weight: bold; font-size:medium;" colspan="2">{{ tableData.groupName }}-{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{ tableKey }}</th> -->
               <th ><img :src="tableData.bufferedImage" alt="二维码" width="auto" height="100%"></th>
             </tr>
-            <!-- <tr v-for="(item, fIndex) in tableData.fieldsMap" :key="fIndex">
-              <th>{{ item.key }}</th>
-              <td>{{ item.value }}</td>
-            </tr> -->
           </table>
         </div>
       </div>