处理一次运行的接口/GY01/GY02/KC01运行弹窗组件布局/优化按钮新增逻辑

zkqy-ui/src/api/bpmprocess/runDialogApi/index.js

@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+
+
+
+// 运行弹窗提交表单公共接口
+export function submitNodeForm(data) {
+  return request({
+    url: '/system/runbpm/process/submitNodeForm',
+    method: 'post',
+    data: data,
+    baseURL: process.env.VUE_APP_BASE_API4
+  })
+}

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

@@ -432,20 +432,9 @@ export default {
       this.loading = true;
       let tempSelection = JSON.parse(JSON.stringify(this.selection));
       listProcess(this.queryParams).then((response) => {
-        response.rows = response.rows.filter(
-          (item) =>
-            !tempSelection.find((val) => val.processId == item.processId)
-        );
-        this.processList = [...tempSelection, ...response.rows];
+        this.processList = response.rows;
         this.total = response.total;
         this.loading = false;
-        if (tempSelection.length) {
-          this.$nextTick(() => {
-            tempSelection.forEach((item) => {
-              this.$refs.tableRef.toggleRowSelection(item);
-            });
-          });
-        }
       });
     },
     // 取消按钮

zkqy-ui/src/views/bussiness/dialogCompments/GY/GY1.vue → zkqy-ui/src/views/bussiness/dialogCompments/GongYi/GY01.vue

@@ -41,7 +41,7 @@
 
 <script>
 export default {
-  name: "GY1",
+  name: "GY01",
   props: [],
   components: {},
   data() {

zkqy-ui/src/views/bussiness/dialogCompments/GongYi/GY06.vue

@@ -0,0 +1,183 @@
+<template>
+  <div class="form-wrap">
+    <div class="cardwrap">
+      <div class="title-area">
+        <span><i class="el-icon-s-order mr5"></i>请选择工艺文件</span>
+        <div class="search ml10">
+          <el-input
+            v-model="search"
+            placeholder="请输入内容"
+            suffix-icon="el-icon-search"
+          ></el-input>
+        </div>
+      </div>
+      <div class="table-area">
+        <el-table :data="[]" border stripe>
+          <el-table-column type="index" width="50" />
+          <el-table-column
+            v-for="col in columns"
+            :prop="col.prop"
+            :key="col.prop"
+            :label="col.label"
+          >
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="cardwrap">
+      <div class="title-area">
+        <span><i class="el-icon-document mr5"></i>材料信息</span>
+      </div>
+      <div class="table-area">
+        <el-table :data="[]" border stripe>
+          <el-table-column type="index" width="50" />
+          <el-table-column
+            v-for="col in material"
+            :prop="col.prop"
+            :key="col.prop"
+            :label="col.label"
+          >
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="cardwrap">
+      <div class="title-area">
+        <span><i class="el-icon-help mr5"></i>工序</span>
+      </div>
+      <div class="node-list">
+        <div class="node" v-for="i of 13" :key="i">
+          <span class="num">>{{ i }}</span>
+          <span class="title">领料</span>
+          <span class="time">1分钟</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "GY01",
+  props: [],
+  components: {},
+  data() {
+    return {
+      search: "",
+      columns: [
+        {
+          label: "编号",
+          prop: "id",
+        },
+        {
+          label: "编者",
+          prop: "editor",
+        },
+        {
+          label: "时间",
+          prop: "time",
+        },
+      ],
+      material: [
+        {
+          label: "名称",
+          prop: "name",
+        },
+        {
+          label: "尺寸",
+          prop: "size",
+        },
+        {
+          label: "规格",
+          prop: "model",
+        },
+        {
+          label: "数量",
+          prop: "num",
+        },
+        {
+          label: "备注",
+          prop: "note",
+        },
+      ],
+    };
+  },
+  computed: {},
+  methods: {
+    async getFormData() {
+      let formData = {
+        flag: false,
+        msg: "",
+      };
+      try {
+        let valid = await this.$refs.form.validate();
+        if (valid) {
+          formData.flag = true;
+          formData.data = this.form;
+          return formData;
+        } else {
+          formData.msg = "表单校验异常,请规范填写表单数据";
+          return formData;
+        }
+      } catch (error) {
+        // console.log(error);
+        formData.msg = "表单校验异常,请规范填写表单数据";
+        return formData;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.form-wrap {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+
+  .cardwrap {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-bottom: 20px;
+    .title-area {
+      display: flex;
+      align-items: center;
+      padding-bottom: 5px;
+      font-size: 16px;
+      border-bottom: 2px solid rgba(0, 0, 0, 0.404);
+      box-sizing: border-box;
+    }
+    .table-area {
+      padding-top: 10px;
+    }
+    .node-list {
+      display: flex;
+      flex-wrap: wrap;
+      .node {
+        width: 33.3333%;
+        height: 50px;
+        display: flex;
+        align-items: center;
+        border-bottom: 1px dotted gray;
+        .num {
+          color: #40c3a8;
+          font-size: 16px;
+          margin-right: 5px;
+        }
+        .title {
+          // color: #ececee34;
+          font-size: 14px;
+          flex: 1;
+          // ma
+        }
+        .time {
+          font-size: 12px;
+          color: rgba(48, 44, 44, 0.247);
+          margin-right: 10px;
+        }
+      }
+    }
+  }
+}
+</style>

zkqy-ui/src/views/bussiness/dialogCompments/test-component/CaiGou/CG1.vue

@@ -0,0 +1,165 @@
+<template>
+  <!-- 采购表单 -->
+  <div class="app-container">
+    <!-- 添加或修改采购单对话框 -->
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="原材料" prop="ycl">
+        <!-- <el-input v-model="form.ycl" placeholder="请输入原材料" /> -->
+        <el-select
+          v-model="form.ycl"
+          placeholder="请选择原材料"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="item in goodsList"
+            :key="item.goodsno"
+            :label="item.goodsname"
+            :value="item.goodsno"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="供应商" prop="gys">
+        <el-input v-model="form.gys" placeholder="请输入供应商" />
+      </el-form-item>
+      <el-form-item label="重量" prop="zl">
+        <el-input v-model="form.zl" placeholder="请输入重量" />
+      </el-form-item>
+      <el-form-item label="单价" prop="dj">
+        <el-input v-model="form.dj" placeholder="请输入单价" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+// import {
+//   listCaigou,
+//   getCaigou,
+//   delCaigou,
+//   addCaigou,
+//   updateCaigou,
+// } from "@/api/system/caigou";
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+export default {
+  name: "CG1",
+  props: ["row", "formData"],
+  data() {
+    return {
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      isEdit: false, //是否是编辑状态
+    };
+  },
+  created() {},
+  mounted() {
+    this.reset();
+  },
+  watch: {
+    formData: {
+      handler(nval) {
+        if (nval.id) this.isEdit = true;
+        this.form = nval.resultMap;
+      },
+    },
+  },
+  computed: {
+    goodsList() {
+      return this.formData.resultMap?.goodsList || [];
+    },
+  },
+  methods: {
+    // 表单重置
+    reset() {
+      this.form = {
+        ycl: null,
+        gys: null,
+        zl: null,
+        dj: null,
+      };
+      // this.resetForm("form");
+    },
+    /** 提交按钮 */
+    submitForm() {
+      console.log(this.row);
+      this.$refs["form"].validate((valid) => {
+        let { ycl, gys, zl, dj } = this.form;
+
+        let payLoad = {};
+        if (this.isEdit) {
+          payLoad.updateCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "caigou",
+              },
+              addListMap: [
+                {
+                  ycl,
+                  gys,
+                  zl,
+                  dj,
+                  taskKey: this.row.benTaskProcessKey,
+                  taskNodeKey: this.row.benTaskNodeKey,
+                },
+              ],
+            },
+          ];
+        } else {
+          payLoad.insertCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "caigou",
+              },
+              addListMap: [
+                {
+                  ycl,
+                  gys,
+                  zl,
+                  dj,
+                  taskKey: this.row.benTaskProcessKey,
+                  taskNodeKey: this.row.benTaskNodeKey,
+                },
+              ],
+            },
+          ];
+        }
+        submitNodeForm(payLoad).then((response) => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+        });
+      });
+    },
+    // 获取表单数据
+    async getFormData() {
+      let formData = {
+        flag: false,
+        msg: "",
+      };
+      try {
+        let valid = await this.$refs.form.validate();
+        if (valid) {
+          formData.flag = true;
+          formData.data = this.form;
+          return formData;
+        } else {
+          formData.msg = "表单校验异常,请规范填写表单数据";
+          return formData;
+        }
+      } catch (error) {
+        // console.log(error);
+        formData.msg = "表单校验异常,请规范填写表单数据";
+        return formData;
+      }
+    },
+  },
+};
+</script>

zkqy-ui/src/views/bussiness/dialogCompments/test-component/KuCun/KC1.vue

@@ -0,0 +1,94 @@
+<template>
+  <!-- 采购表单 -->
+  <div class="app-container">
+    <!-- 添加或修改采购单对话框 -->
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="原材料" prop="ycl">
+        <el-input v-model="form.ycl" placeholder="请输入原材料" />
+      </el-form-item>
+      <el-form-item label="重量" prop="zl">
+        <el-input v-model="form.zl" placeholder="请输入重量" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <!-- <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div> -->
+  </div>
+</template>
+
+<script>
+// import {
+//   listCaigou,
+//   getCaigou,
+//   delCaigou,
+//   addCaigou,
+//   updateCaigou,
+// } from "@/api/system/caigou";
+
+export default {
+  name: "CG1",
+  data() {
+    return {
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {},
+  methods: {
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        ycl: null,
+        zl: null,
+        remark: null,
+        createById: null,
+        createBy: null,
+        createTime: null,
+        updateById: null,
+        updateBy: null,
+        updateTime: null,
+        delFlag: null,
+      };
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        // addCaigou(this.form).then((response) => {
+        //   this.$modal.msgSuccess("新增成功");
+        //   this.open = false;
+        //   this.getList();
+        // });
+      });
+    },
+    // 获取表单数据
+    async getFormData() {
+      let formData = {
+        flag: false,
+        msg: "",
+      };
+      try {
+        let valid = await this.$refs.form.validate();
+        if (valid) {
+          formData.flag = true;
+          formData.data = this.form;
+          return formData;
+        } else {
+          formData.msg = "表单校验异常,请规范填写表单数据";
+          return formData;
+        }
+      } catch (error) {
+        // console.log(error);
+        formData.msg = "表单校验异常,请规范填写表单数据";
+        return formData;
+      }
+    },
+  },
+};
+</script>

zkqy-ui/src/views/bussiness/processMange.vue

@@ -42,7 +42,7 @@
             </el-radio-group>
             <el-radio-group
               class="btn-list-two"
-              v-model="queryParams.bepTaskProcessState"
+              v-model="queryParams.taskProcessState"
               @change="getList"
             >
               <el-radio-button label="3">已完成</el-radio-button>
@@ -159,6 +159,7 @@
       </div>
       <div class="show-window">
         <!-- 运行节点弹窗 -->
+
         <el-dialog :title="nodeTitle" :visible.sync="open" width="50%">
           <!-- <el-form label-width="100px" :model="commonData">
             <h1>这里会引入当前节点需要处理的表单</h1>
@@ -181,8 +182,15 @@
             :subTableName="subTableName"
             @addList="() => {}"
           ></DialogTemplate>
-          <component :is="myForm" ref="myFormRef"></component>
+          <component
+            :is="myForm"
+            :formData="formData"
+            :row="row"
+            ref="myFormRef"
+          ></component>
           <!-- <CG1 ref="myFormRef"></CG1> -->
+          <!-- <KC1 ref="myFormRef"></KC1> -->
+          <!-- <GY06 ref="myFormRef"></GY06> -->
           <span slot="footer" class="dialog-footer">
             <el-button @click="closeExecuteNode">取消</el-button>
             <el-button type="primary" @click="executeNode">运行</el-button>
@@ -207,13 +215,15 @@ import { getForm } from "@/api/dragform/form";
 import DialogTemplate from "@/views/dialogTemplate/components/index.vue";
 
 // 弹窗表单组件
-import GY1 from "./dialogCompments/GY/GY1.vue";
-// import CG1 from "./dialogCompments/test-component/CG/CG1.vue";
+import GY01 from "./dialogCompments/GongYi/GY01.vue";
+import CG1 from "./dialogCompments/test-component/CaiGou/CG1.vue";
+import KC1 from "./dialogCompments/test-component/KuCun/KC1.vue";
+import GY06 from "./dialogCompments/GongYi/GY06.vue";
 
 export default {
   name: "processMange",
   props: [],
-  components: { GY1, DialogTemplate, CG1 },
+  components: { GY01, DialogTemplate, CG1, KC1, GY06 },
   dicts: ["bpm_type", "task_process_state"],
   data() {
     return {
@@ -232,7 +242,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        bepTaskProcessState: "",
+        taskProcessState: "",
       },
       total: 0,
       columns: [
@@ -285,6 +295,9 @@ export default {
       subCount: {},
       tableCount: {},
       subTableName: "",
+
+      // 弹窗表单渲染数据
+      formData: {},
     };
   },
   computed: {},
@@ -396,6 +409,12 @@ export default {
       this.myForm = preFix;
       let res = await getProcessNodeFormInfoData(payLoad);
       console.log(res);
+      if (res.code == 200) {
+        this.formData = res.data;
+      } else {
+        this.$message.error("网络异常,请稍后再试");
+      }
+
       this.row = row; //记录当前行数据
       // if (!this.formType) return; //没有表单,直接掉运行逻辑
       this.open = true; // 打开弹窗

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

@@ -116,7 +116,7 @@
                   >修改</el-button
                 ></el-dropdown-item
               >
-              <el-dropdown-item
+              <el-dropdown-item v-if="scope.row.btnType == 'DIRECTORY'"
                 ><el-button
                   size="mini"
                   type="text"
@@ -754,22 +754,32 @@ export default {
     // 自定义字段校验
     checkBtnFormKey(rule, value, callback) {
       let { btnType } = this.btnGroupFormData;
+      console.log(btnType);
       if (btnType == "INSERT" || btnType == "UPDATE") {
-        if (!value) callback(new Error("请绑定表单"));
+        if (!value) {
+          callback(new Error("请绑定表单"));
+        }
       }
+
       callback();
     },
     checkBtnProcessKey(rule, value, callback) {
       let { btnType } = this.btnGroupFormData;
+      console.log(btnType);
       if (btnType == "EXECUTE" || btnType == "INITIATED") {
-        if (!value) callback(new Error("请绑定流程"));
+        if (!value) {
+          callback(new Error("请绑定流程"));
+        }
       }
       callback();
     },
     checkBtnScriptKey(rule, value, callback) {
       let { btnType } = this.btnGroupFormData;
-      if (btnType == "EXECUTE" || btnType == "INITIATED") {
-        if (!value) callback(new Error("请绑定脚本"));
+      console.log(btnType);
+      if (btnType == "EXECUTE") {
+        if (!value) {
+          callback(new Error("请绑定脚本"));
+        }
       }
       callback();
     },
@@ -1000,6 +1010,8 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["btnGroupFormRef"].validate(async (valid) => {
+        console.log(this.btnGroupFormData);
+        console.log(valid);
         if (valid) {
           let validateRes = this.myValidate(this.btnGroupFormData);
           if (!validateRes.flag) {
@@ -1080,7 +1092,13 @@ export default {
         // 获取流程选项数据
         let processRes = await listProcess({ isEnablePaging: false });
         if (processRes.code == 200) {
-          this.processOptions = processRes.rows;
+          this.processOptions = [
+            ...processRes.rows,
+            {
+              processKey: "unknown",
+              processName: "未知流程",
+            },
+          ];
         } else {
           this.$message.error("网络异常请稍后再试");
         }

zkqy-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -243,6 +243,7 @@
       >
       </iframe> -->
       <k-form-build
+        v-if="jsonData"
         class="formBuild"
         ref="addFromRef"
         :dynamicData="dynamicData"
@@ -625,7 +626,10 @@ export default {
       this.defaultValue = {};
       getInfoBySqlKey(this.templateInfo.template.sqlKey).then(({ data }) => {
         if (!data || !data.dfVueTemplate) {
+          this.jsonData = false;
           this.$message.error("当前表格未绑定表单!");
+          this.title = "运行";
+          this.open = true;
           return;
         }
         if (data.dfFormSql) {
@@ -1041,103 +1045,105 @@ export default {
       return toUnderline(temp[0].toLowerCase() + temp.slice(1));
     },
     //提交编辑结果按钮回调
-    editConfirmHandler() {
-      this.$refs.addFromRef
-        .getData()
-        .then(async (values) => {
-          let data = {
-            basicMap: {
-              tableName: this.tableName,
-              // btnKey: btnData.btnKey,
-              btnKey: this.currentBtnData.btnKey,
-            },
-            addListMap: [values],
-            conditionMap: {},
-            commMap: {},
-            btnParametersMap: {},
-          };
-          if (this.currentBtnData.btnParams) {
-            let btnParams = JSON.parse(this.currentBtnData.btnParams);
-            btnParams.forEach((item) => {
-              data.btnParametersMap[
-                this.formatField(item.fieldName, camelCase(this.tableName))
-              ] = item.fieldValue
-                ? item.fieldValue
-                : this.currentRow[item.fieldName];
-            });
-          }
-          if (Object.keys(this.defaultValue).length) {
-            //修改
-            // 后台接收需要是表中字段真实的名称，无所谓驼峰。
-            // data.conditionMap[this.templateInfo.template?.primaryKey] =
-            //   this.defaultValue[
-            //     camelCase(this.templateInfo.template?.primaryKey)
-            //   ];
-            data.conditionMap[this.templateInfo.template?.primaryKey] =
-              this.defaultValue[this.templateInfo.template?.primaryKey];
-            Object.keys(values).map((k) => {
-              data.commMap[k] = values[k];
-            });
-            data.basicMap.btnType = this.currentBtnData.btnType;
-            data.basicMap.visible = true;
-          } else {
-            data.basicMap.btnType = "INSERT";
-            data.basicMap.visible = true;
-          }
-          try {
-            let res = await btnCommonApi(data);
-            if (res.code == 200) {
-              this.$message.success("操作成功");
+    async editConfirmHandler() {
+      if (this.$refs.addFromRef) {
+        this.$refs.addFromRef
+          .getData()
+          .then(async (values) => {
+            let data = {
+              basicMap: {
+                tableName: this.tableName,
+                // btnKey: btnData.btnKey,
+                btnKey: this.currentBtnData.btnKey,
+              },
+              addListMap: [values],
+              conditionMap: {},
+              commMap: {},
+              btnParametersMap: {},
+            };
+            if (this.currentBtnData.btnParams) {
+              let btnParams = JSON.parse(this.currentBtnData.btnParams);
+              btnParams.forEach((item) => {
+                data.btnParametersMap[
+                  this.formatField(item.fieldName, camelCase(this.tableName))
+                ] = item.fieldValue
+                  ? item.fieldValue
+                  : this.currentRow[item.fieldName];
+              });
+            }
+            if (Object.keys(this.defaultValue).length) {
+              data.conditionMap[this.templateInfo.template?.primaryKey] =
+                this.defaultValue[this.templateInfo.template?.primaryKey];
+              Object.keys(values).map((k) => {
+                data.commMap[k] = values[k];
+              });
+              data.basicMap.btnType = this.currentBtnData.btnType;
+              data.basicMap.visible = true;
             } else {
+              data.basicMap.btnType = "INSERT";
+              data.basicMap.visible = true;
+            }
+            try {
+              let res = await btnCommonApi(data);
+              if (res.code == 200) {
+                this.$message.success("操作成功");
+              } else {
+                this.$message.error("网络异常,请稍后再试");
+              }
+            } catch (error) {
+              console.log(error);
               this.$message.error("网络异常,请稍后再试");
             }
-          } catch (error) {
-            console.log(error);
+            this.getList();
+            this.defaultValue = {};
+            this.open = false;
+          })
+          .catch((res) => {
+            console.log(res);
+            this.$modal.msgError("表单校验失败,请规范填写数据");
+          });
+      } else {
+        // 没有绑定表单
+        let data = {
+          basicMap: {
+            tableName: this.tableName,
+            // btnKey: btnData.btnKey,
+            btnKey: this.currentBtnData.btnKey,
+            btnType: this.currentBtnData.btnType,
+            visible: true,
+          },
+          addListMap: [],
+          conditionMap: {},
+          commMap: {},
+          btnParametersMap: {},
+        };
+        if (this.currentBtnData.btnParams) {
+          let btnParams = JSON.parse(this.currentBtnData.btnParams);
+          btnParams.forEach((item) => {
+            data.btnParametersMap[
+              this.formatField(item.fieldName, camelCase(this.tableName))
+            ] = item.fieldValue
+              ? item.fieldValue
+              : this.currentRow[item.fieldName];
+          });
+        }
+        // data.basicMap.btnType = this.currentBtnData.btnType;
+        // data.basicMap.visible = true;
+        try {
+          let res = await btnCommonApi(data);
+          if (res.code == 200) {
+            this.$message.success("操作成功");
+          } else {
             this.$message.error("网络异常,请稍后再试");
           }
-          // if (Object.keys(this.defaultValue).length) {
-          //   let updateData = {
-          //     // 基本参数
-          //     basicMap: {
-          //       // 表名
-          //       tableName: this.tableName,
-          //     },
-          //     conditionMap: {},
-          //     commMap: {},
-          //   };
-
-          //   // 后台接收需要是表中字段真实的名称，无所谓驼峰。
-          //   updateData.conditionMap[this.templateInfo.template?.primaryKey] =
-          //     this.defaultValue[
-          //       camelCase(this.templateInfo.template?.primaryKey)
-          //     ];
-          //   Object.keys(values).map((k) => {
-          //     updateData.commMap[k] = values[k];
-          //   });
-          //   let res = await batchEdit(updateData);
-          //   if (res.code == 200) {
-          //     this.$modal.msgSuccess("修改成功");
-          //   } else {
-          //     this.$modal.msgError("修改失败");
-          //   }
-          //   this.getList();
-          // } else {
-          //   let res = await addTableData(data);
-          //   if (res.code == 200) {
-          //     this.$modal.msgSuccess("添加成功");
-          //   } else {
-          //     this.$modal.msgError("添加失败");
-          //   }
-          //   this.getList();
-          // }
-          this.getList();
-          this.defaultValue = {};
-          this.open = false;
-        })
-        .catch((res) => {
-          console.log(res);
-          this.$modal.msgError("表单校验失败,请规范填写数据");
-        });
+        } catch (error) {
+          console.log(error);
+          this.$message.error("网络异常,请稍后再试");
+        }
+        this.getList();
+        this.defaultValue = {};
+        this.open = false;
+      }
     },
     // 使用提交数据类型的按钮获取数据
     tempSubBtn(getData) {
@@ -1304,6 +1310,12 @@ export default {
         case "UPDATE":
           this.handleUpdate(row, btnData);
           break;
+        case "EXECUTE":
+          this.handleUpdate(row, btnData);
+          break;
+        case "INITIATED":
+          this.handleUpdate(row, btnData);
+          break;
         case "DELETE":
           this.handleDelete(row, btnData);
           break;