Tb2.vue 修改

zrch-risk-client-39/src/views/baosong/report/components/Tb2.vue

@@ -517,6 +517,19 @@ function collectAllFields(content, fields = []) {
         collectAllFields(item.extraFields[key], fields);
       }
     }
+    
+    if (item.formType === 'AttachTable' && item.gridOptions && item.gridOptions.datas) {
+      for (const data of item.gridOptions.datas) {
+        for (const key in data) {
+          if (data[key] && typeof data[key] === 'object' && data[key].field) {
+            fields.push({ field: data[key].field, formType: data[key].formType });
+            if (data[key].otherField) {
+              fields.push({ field: data[key].otherField, formType: 'input' });
+            }
+          }
+        }
+      }
+    }
   }
   
   return fields;

zrch-risk-client-39/src/views/baosong/report/tableComponents/MultiColumnTable.vue

@@ -528,20 +528,41 @@ const getFormData = () => {
 }
 
 const setFormData = (dataVale) => {
+   console.log('MultiColumnTable setFormData called, dataVale:', dataVale);
    tableData.value = dataVale.map(row => {
      const newRow = { ...row }
      props.fields.forEach(field => {
        if(field.formType === 'table') {
-         field.gridOptions.data = JSON.parse(row[field.field])
+         const fieldWithGrid = field as any;
+         fieldWithGrid.gridOptions.data = JSON.parse(row[field.field])
        } else if(field.formType === 'AttachTable') {
          const key = `${field.field}_${dataVale.indexOf(row)}`;
          const child = attchTableRefs.value[key];
+         console.log('MultiColumnTable AttachTable - key:', key, 'child:', child, 'row:', row);
          if (child && child.setFormData) {
-           child.setFormData(dataVale)
+           const tableData = {};
+           const fieldWithGrid = field as any;
+           console.log('MultiColumnTable AttachTable - fieldWithGrid:', fieldWithGrid);
+           if (fieldWithGrid.gridOptions && fieldWithGrid.gridOptions.datas) {
+             console.log('MultiColumnTable AttachTable - gridOptions.datas:', fieldWithGrid.gridOptions.datas);
+             fieldWithGrid.gridOptions.datas.forEach((dataRow: any, rowIndex: number) => {
+               console.log(`MultiColumnTable AttachTable - dataRow[${rowIndex}]:`, dataRow);
+               Object.values(dataRow).forEach((cellValue: any, cellIndex: number) => {
+                 console.log(`MultiColumnTable AttachTable - cellValue[${cellIndex}]:`, cellValue);
+                 if (cellValue && typeof cellValue === 'object' && cellValue.field) {
+                   console.log(`MultiColumnTable AttachTable - found field: ${cellValue.field}, value in row:`, row[cellValue.field]);
+                   tableData[cellValue.field] = row[cellValue.field];
+                 }
+               });
+             });
+           }
+           console.log('MultiColumnTable AttachTable - final tableData:', tableData);
+           child.setFormData(tableData);
          }
        } else if (field.formType === 'combinaform') {
-         if (field.childs && Array.isArray(field.childs)) {
-           field.childs.forEach(child => {
+         const fieldWithChilds = field as any;
+         if (fieldWithChilds.childs && Array.isArray(fieldWithChilds.childs)) {
+           fieldWithChilds.childs.forEach((child: any) => {
              if (child.formType === 'checkbox' && !Array.isArray(newRow[child.field])) {
                newRow[child.field] = []
              }
@@ -569,7 +590,7 @@ const gridEvents: VxeGridListeners = {
   toolbarButtonClick(params) {
 
     if (params.code === "add") {
-      const fieldName = params.button.field
+      const fieldName = (params.button as any).field
       const fieldConfig = props.fields.find(field => field.field === fieldName)
       if (fieldConfig && fieldConfig.gridOptions) {
         const newRow: Record<string, any> = {}