按钮组绑定的表单类型修改

zkqy-ui/src/views/bpmprocess/index.vue

@@ -35,13 +35,13 @@
           @change="handleQuery"
           v-model="queryParams.processType"
           label="0"
-          >工业类型</el-radio
+          >生产流程</el-radio
         >
         <el-radio
           @change="handleQuery"
           v-model="queryParams.processType"
           label="1"
-          >OA类型</el-radio
+          >审批流程</el-radio
         >
       </el-form-item>
       <!-- <el-form-item

zkqy-ui/src/views/system/excuteBtnMange/index.vue

@@ -868,11 +868,11 @@ export default {
         },
         {
           label: "单独表单",
-          value: "single",
+          value: "dragForm",
         },
         {
           label: "表单组",
-          value: "multiple",
+          value: "dragFormGroup",
         },
         {
           label: "其它",

zkqy-ui/src/views/system/formGroupMange/index.vue

@@ -345,7 +345,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="mainFormItem" label="依赖的主表单项">
+        <!-- <el-table-column prop="mainFormItem" label="依赖的主表单项">
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.relateMainItem"
@@ -368,7 +368,7 @@
               </el-option>
             </el-select>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="isShow" label="是否显示">
           <template slot-scope="scope">
             <el-switch
@@ -542,6 +542,7 @@ export default {
             fGName,
             groupDesc,
             mainFormName,
+
             mainFormItem,
             mainFormTable,
             groupKey,
@@ -551,7 +552,7 @@ export default {
           tempFormKeys.push(mainFormName);
           let formKeys = JSON.stringify(tempFormKeys);
           let relationJson = JSON.stringify({
-            mainForm: this.groupForm,
+            mainForm: { ...this.groupForm, formKey: mainFormName },
             subFormList: this.subFormList,
           });
           let payLoad = {