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

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

@@ -55,16 +55,22 @@
       }
       formColumns.push(item);
     });
-    data.btnList.forEach((element) => {
+
-      if (element.prop === 'Add' && element.isWFlow) {
-        flowCode.value = element.wFlowCode;
-      }
-    });
     if (!unref(isUpdate) && !unref(isDetail)) {
       getTitle.value = '新增';
+      data.btnList.forEach((element) => {
+        if (element.prop === 'Add' && element.isWFlow) {
+          flowCode.value = element.wFlowCode;
+        }
+      });
     }
     if (unref(isUpdate) && !unref(isDetail)) {
       getTitle.value = '编辑';
+      data.btnList.forEach((element) => {
+        if (element.prop === 'Edit' && element.isWFlow) {
+          flowCode.value = element.wFlowCode;
+        }
+      });
     }
     if (!unref(isUpdate) && unref(isDetail)) {
       getTitle.value = '详情';

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

@@ -197,6 +197,7 @@
           tab: config.schemas,
           record: rows[0],
           query: query.value,
+          btnList: btnList.value,
         });
         break;
       case 'Delete':
@@ -232,6 +233,7 @@
           tab: config.schemas,
           record: rows[0],
           query: query.value,
+          btnList: btnList.value,
         });
         break;
       case 'Import':
@@ -256,9 +258,10 @@
     };
     getFormsDesignData(params).then((res: Recordable) => {
       let columnObj = JSON.parse(res.entity.scheme);
+      console.log(columnObj);
       let formObj = JSON.parse(res.formScheme.scheme);
       paramsId.value = res.formScheme.id;
-      btnList.value = columnObj.btns;
+      btnList.value = columnObj.table.btns;
       if (columnObj.table.columns) {
         columnObj.table.columns.forEach((item) => {
           callColumns.push({