表单下拉框选择优化/按钮类型规范化

ruoyi-ui/src/api/dragform/form.js

@@ -77,6 +77,27 @@ export function dragTablePreview(query) {
   })
 }
 
+// 获取弹窗结构数据
+export function getProcessPopupTableInfo(data) {
+  return request({
+    url: '/dragform/commonbtn/getProcessPopupTableInfo',
+    method: 'get',
+    params: data,
+    baseURL: process.env.VUE_APP_BASE_API3
+  })
+}
+// 获取弹窗渲染数据
+export function getProcessPopupTableList(data) {
+  return request({
+    url: '/dragform/commonbtn/getProcessPopupTableList',
+    method: 'get',
+    params: data,
+    baseURL: process.env.VUE_APP_BASE_API3
+  })
+}
+
+
+
 
 
 

ruoyi-ui/src/components/kFormDesign/OptionsEdit.vue

@@ -166,6 +166,8 @@
                   <template slot-scope="scope">
                     <el-select
                       v-model="scope.row.fieldName"
+                      filterable
+                      clearable
                       placeholder="请选择"
                     >
                       <el-option

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

@@ -78,6 +78,12 @@
               <span v-else-if="col.prop == 'benTaskNodeState'">{{
                 scope.row.benTaskNodeState == "0" ? "未执行" : "已执行"
               }}</span>
+              <span v-else-if="col.prop == 'bepTaskProcessState'">{{
+                getDictLabel(
+                  scope.row.bepTaskProcessState,
+                  dict.type.task_process_state
+                )
+              }}</span>
               <span v-else>{{ scope.row[col.prop] }}</span>
             </template>
           </el-table-column>
@@ -200,7 +206,7 @@ export default {
   name: "processMange",
   props: [],
   components: { GY1, DialogTemplate },
-  dicts: ["bpm_type"],
+  dicts: ["bpm_type", "task_process_state"],
   data() {
     return {
       row: {}, //当前操作行数据
@@ -330,17 +336,30 @@ export default {
       console.log(row);
       this.resetDialogForm();
       let preFix = row.benTaskNodeName.split("-")[0];
-      if (row.benTaskNodeFormKey) {
-        if (row.benTaskNodeFormType == "dragForm") {
+      let {
+        benTaskNodeFormKey,
+        benTaskNodeFormType,
+        bepTaskPlanKey,
+        bepTaskKey,
+        bepTaskNodeKey,
+      } = row;
+      if (benTaskNodeFormKey) {
+        if (benTaskNodeFormType == "dragForm") {
           //拖拽表单
           this.formType = "dragForm";
-          await this.getDragFormInfo(row.benTaskNodeFormKey);
-        } else if (row.benTaskNodeFormType == "composeForm") {
+          await this.getDragFormInfo(benTaskNodeFormKey);
+        } else if (benTaskNodeFormType == "composeForm") {
           //工艺组合表单
           this.formType = "composeForm";
-          this.groupKey = row.benTaskNodeFormKey;
+          this.groupKey = benTaskNodeFormKey;
+          let queryPayload = {
+            "${task_plan_key": bepTaskPlanKey,
+            "${task_key": bepTaskKey,
+            "${task_node_key": bepTaskNodeKey,
+            groupKey: benTaskNodeFormKey,
+          };
           this.$nextTick(() => {
-            this.$refs.dialogRef.getLists(this.groupKey);
+            this.$refs.dialogRef.getLists(queryPayload);
           });
         }
       } else if (preFix) {
@@ -349,11 +368,11 @@ export default {
         this.myForm = preFix;
       }
       this.row = row; //记录当前行数据
-      if (!this.formType) return;
+      if (!this.formType) return; //没有表单,直接掉运行逻辑
       this.open = true; // 打开弹窗
       // 根据当前节点绑定的表单信息查询对应的表单进行展示
     },
-    // 运行节点按钮
+    // 运行节点按钮 确认运行回调
     async executeNode() {
       let { benTaskNodeKey, bepTaskProcessXmlContent, implementationName } =
         this.row;
@@ -385,7 +404,11 @@ export default {
         subformData.append(key, payLoad[key] == null ? "" : payLoad[key]);
       }
       runProcessNodeExecution(subformData).then((res) => {
-        console.log(res);
+        if (res.code == 200) {
+          this.$message.success("运行成功!");
+          this.getList();
+          this.open = false;
+        }
       });
       console.log(payLoad);
     },
@@ -412,7 +435,6 @@ export default {
     },
     // 关闭运行节点弹窗
     closeExecuteNode(row) {
-      console.log(row);
       this.open = false;
     },
     // 获取下一个节点的nodekey

ruoyi-ui/src/views/dialogTemplate/components/index.vue

@@ -111,6 +111,10 @@ import {
 } from "@/api/tablelist/commonTable";
 import { camelCase } from "@/utils";
 import Menu from "@/views/tablelist/commonTable/BtnMenu.vue";
+import {
+  getProcessPopupTableInfo,
+  getProcessPopupTableList,
+} from "@/api/dragform/form"; //新的弹窗数据请求
 
 export default {
   components: { Menu },
@@ -194,9 +198,12 @@ export default {
       });
     },
     // 获取弹窗信息
-    async getLists(groupKey) {
-      let res = await dragGroupTableInfo({ queryMap: { groupKey: groupKey } });
+    async getLists(payload) {
+      // let res = await dragGroupTableInfo({ queryMap: { groupKey: groupKey } });
+      let resTableInfo = await getProcessPopupTableInfo({ queryMap: payload });
+      let resTableData = await getProcessPopupTableList({ queryMap: payload });
       // 获取表格tablekey 和 sort
+      console.log(resTableData);
       this.tableLists = JSON.parse(res.msg);
 
       this.tableLists.forEach(async (item) => {

ruoyi-ui/src/views/system/bpmnPro/components/Panel/components/ElementExecuteForm.vue

@@ -67,7 +67,10 @@ export default {
   },
   methods: {
     async initFormData() {
-      this.formKey = [getNodeFormType(getActive()), getFormKey(getActive())];
+      this.formKey = [
+        getNodeFormType(getActive()),
+        Number(getFormKey(getActive())),
+      ];
     },
     updateFormKey(value) {
       setNodeFormType(getActive(), value[0]);

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

@@ -646,25 +646,33 @@ export default {
         //   label: "脚本",
         // },
         {
-          value: "6",
+          // value: "6",
+          value: "DIRECTORY",
           label: "目录",
         },
         {
-          value: "7",
+          // value: "7",
+          value: "OUTLINK",
           label: "外链",
         },
         {
-          value: "3",
+          // value: "3",
+          value: "INNERLINK",
           label: "内链",
         },
         {
-          value: "8",
+          // value: "8",
+          value: "UPDATE",
           label: "修改",
         },
         {
-          value: "9",
+          value: "DELETE",
           label: "删除",
         },
+        {
+          value: "INSERT",
+          label: "新增",
+        },
       ],
       formOptions: [],
       tableOptions: [],

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

@@ -279,7 +279,7 @@
       </span>
     </el-dialog>
 
-    <!-- 绑定按钮dialog -->
+    <!-- 自定义弹窗 -->
     <el-dialog
       title="提示"
       :visible.sync="btnDialogVisible"
@@ -713,7 +713,7 @@ export default {
       try {
         let payLoad = {
           basicMap: {
-            btnType: 8,
+            btnType: UPDATE,
             btnKey: this.currentBtnData.btnKey,
             visible: "false",
             sqlKey: this.templateInfo.template.sqlKey,
@@ -1103,10 +1103,10 @@ export default {
             Object.keys(values).map((k) => {
               data.commMap[k] = values[k];
             });
-            data.basicMap.btnType = 8;
+            data.basicMap.btnType = "UPDATE";
             data.basicMap.visible = true;
           } else {
-            data.basicMap.btnType = 10;
+            data.basicMap.btnType = "INSERT";
             data.basicMap.visible = true;
           }
           try {
@@ -1309,7 +1309,7 @@ export default {
         url += "?" + tempArr.join("&");
       }
       // let link = btnData.btnParams;
-      if (type == "3") {
+      if (type == "INNERLINK") {
         this.$router.push(url);
       } else {
         window.open("http://" + url, "_blank");
@@ -1321,19 +1321,17 @@ export default {
       let { btnType, btnParams } = btnData;
       this.currentBtnData = btnData;
       this.currentRow = JSON.parse(JSON.stringify(row));
-      switch (
-        btnType //3:内链  6:目录  7:外链  8:修改  9:删除
-      ) {
-        case "3":
+      switch (btnType) {
+        case "INNERLINK":
           this.routerHandler(btnData, btnType);
           break;
-        case "7":
+        case "OUTLINK":
           this.routerHandler(btnData, btnType);
           break;
-        case "8":
+        case "UPDATE":
           this.handleUpdate(row, btnData);
           break;
-        case "9":
+        case "DELETE":
           this.handleDelete(row, btnData);
           break;
         default: