Browse Source

二维码数据标题

lwx_16
liwenxuan 10 months ago
parent
commit
f7824ed42a
  1. 2
      src/components/DesignForm/formControlPropertiNew.vue
  2. 27
      src/components/DesignForm/tableListPage/index.vue

2
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 = [

27
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>

Loading…
Cancel
Save