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[]) => { > - + @@ -1979,17 +1984,11 @@ const diGuiJilian = (val: any, options: any[]) => { >
{{ tableData.groupName }}-{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{ tableKey }}{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }} 二维码
- - + - -
{{ tableData.groupName }}-{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{ tableKey }}{{ tablesData[tableKey].appName }}-{{ tablesData[tableKey].formName }}-{{ tablesData[tableKey].dataTitle }}
二维码