Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/views/demo/onlineform/formCall/CallModal.vue

@@ -201,6 +201,20 @@
               scrollValue.value = { x: (subTableColumns.value.length - 1) * 140, y: 300 };
               subTableData.value = tableData;
             }
+            if (opt.columns) {
+              opt.columns.forEach((itemColumn) => {
+                itemColumn.children.forEach((itemColumnChild) => {
+                  console.log('itemColumnChild', itemColumnChild);
+                  itemColumnChild.itemProps.hidden = true;
+                  if (index == 0) {
+                    itemColumnChild.itemProps.hidden = false;
+                  }
+                  arr.push(itemColumnChild);
+                  val.children.push(itemColumnChild);
+                });
+              });
+            }
+
             opt.itemProps.hidden = true;
             if (index == 0) {
               opt.itemProps.hidden = false;
@@ -211,6 +225,7 @@
         });
         tabsColumns.value = item.componentProps.options;
         console.log('tabsColumns', tabsColumns.value);
+        console.log('formColumns', formColumns.value);
       } else {
         if (item.rules !== undefined) {
           let myString = item.rules[0].pattern;
@@ -313,14 +328,14 @@
     console.log('eee', e);
     console.log('tabsColumns', tabsColumns);
     const columns: FormSchema[] = [];
-    // tabsColumns.value.forEach((item) => {
-    //   item.children.forEach((val) => {
-    //     val.itemProps.hidden = true;
-    //   });
-    // });
-    // tabsColumns.value[e].children.forEach((item) => {
-    //   item.itemProps.hidden = false;
-    // });
+    tabsColumns.value.forEach((item) => {
+      item.children.forEach((val) => {
+        val.itemProps.hidden = true;
+      });
+    });
+    tabsColumns.value[e].children.forEach((item) => {
+      item.itemProps.hidden = false;
+    });
     tabsColumns.value.forEach((item) => {
       item.children.forEach((val) => {
         columns.push(val);
@@ -328,10 +343,16 @@
     });
     console.log('columns', columns);
     console.log('formColumns', formColumns);
+    const obj = getFieldsValue();
+    console.log('values', getFieldsValue());
+    // resetFields();
     setTimeout(() => {
       updateSchema(columns);
-      console.log('values', getFieldsValue());
+      resetFields();
     }, 100);
+    setTimeout(() => {
+      setFieldsValue(obj);
+    }, 500);
   }
   function generateUniqueDigits(length: number): number[] {
     const digits = new Set<number>();
@@ -374,15 +395,15 @@
       console.log('values', values);
       let query = values;
       let saveSubTableList = [];
-      // subTableList.value.forEach((item) => {
-      //   let emptyObj = {};
-      //   for (const key in item) {
-      //     if (key === 'key') continue;
-      //     emptyObj[key] = item[key];
-      //   }
-      //   saveSubTableList.push(emptyObj);
-      // });
-      // query[subTableId.value] = JSON.stringify(saveSubTableList);
+      subTableList.value.forEach((item) => {
+        let emptyObj = {};
+        for (const key in item) {
+          if (key === 'key') continue;
+          emptyObj[key] = item[key];
+        }
+        saveSubTableList.push(emptyObj);
+      });
+      query[subTableId.value] = JSON.stringify(saveSubTableList);
       let params: any = {
         schemeId: primaryQuery.value.id,
         isUpdate: isUpdate.value,

src/views/demo/onlineform/formCall/index.vue

@@ -621,6 +621,7 @@
           layerFields: {},
         };
       }
+      console.log('columnObj', columnObj)
       paramsId.value = res.formScheme.id;
       btnList.value = columnObj.table.btns;
       if (columnObj.table.columns) {

src/views/demo/onlineform/formModule/modalDesign.vue

@@ -213,9 +213,19 @@
       const arr: any = [];
       formScheme.value.formInfo.tabList.forEach((item, index) => {
         item.schemas.forEach((val) => {
-          arr.push(val);
+          if (val.type == 'subTable' && val.columns) {
+            console.log('val', val)
+            val.columns.forEach((col) => {
+              col.children.forEach((chil) => {
+                arr.push(chil);
+              });
+            });
+          } else {
+            arr.push(val);
+          }
         });
       });
+      console.log('item.columns', arr)
       formScheme.value.formInfo.schemas = arr;
     }
     if (formScheme.value.formInfo.tabList && formScheme.value.formInfo.tabList.length == 1) {

src/views/demo/onlineform/formModule/modalForm-Modal.vue

@@ -154,6 +154,7 @@
     let query: any = { keyValue: record.schemeId };
     const preview: any = await functionGetPreviewForm(query);
     let scheme = JSON.parse(preview.scheme);
+    console.log('scheme1111', scheme);
     if (scheme.formInfo.tabList && scheme.formInfo.tabList.length > 1) {
       const arr: any = [];
       scheme.formInfo.tabList.forEach((item, index) => {

src/views/demo/onlineform/formdesign/FormModal.vue

@@ -126,6 +126,7 @@
     let tableData = await getTableColumnData(schems);
     let tabArr: any = [];
     let tabLabelArr: any = [];
+    console.log('beforedesignTab', designTab);
     designTab.schemas.forEach((item) => {
       if (item.component !== 'Tabs') {
         if (item.componentProps.defaultValue) {
@@ -167,7 +168,7 @@
             }
             // 设计子表给里面的控件增加csType字段
             if (list.type == 'subTable') {
-              list.columns = changeCloums(item.columns, tableData);
+              list.columns = changeCloums(list.columns, tableData);
             }
             tabArr.push(list.componentProps.fieldName);
             if (!list.componentProps.fieldName) {