运行和触发异常接口修改/异常脚本添加异常节点名

zkqy-ui/.env.development

@@ -0,0 +1,20 @@
+# 页面标题
+VUE_APP_TITLE = 后台管理系统
+
+# 开发环境配置
+ENV = 'development'
+
+# 管理系统/开发环境
+VUE_APP_BASE_API = '/dev-api'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+#数据引擎模块IP
+VUE_APP_BASE_API2 = 'http://192.168.110.59:8099/'
+
+#表单引擎模块IP
+VUE_APP_BASE_API3 = 'http://192.168.110.59:8088/'
+
+#流程引擎模块IP
+VUE_APP_BASE_API4 = 'http://192.168.110.59:8055/'

zkqy-ui/.gitignore

@@ -22,4 +22,4 @@ selenium-debug.log
 package-lock.json
 yarn.lock
 # vue.config.js
-.env.development
+# .env.development

zkqy-ui/src/api/bpmprocess/process.js

@@ -141,10 +141,12 @@ export function addScript(data) {
 //触发异常节点 
 export function triggerExceptionNode(data) {
   return request({
-    url: '/system/execute/node/triggerExceptionNode',
+    // url: '/system/execute/node/triggerExceptionNode',
+    url: '/system/runbpm/process/triggerExceptionNode',//触发异常节点  1214版
     method: 'post',
     data: data,
     baseURL: process.env.VUE_APP_BASE_API4,
   })
 }
 
+

zkqy-ui/src/api/bpmprocess/run/executeProcess.js

@@ -72,3 +72,12 @@ export function getProcessNodeFormTemplate(query) {
     baseURL: process.env.VUE_APP_BASE_API4,
   })
 }
+// 运行节点   新 请求节点的表单数据
+export function getProcessNodeFormInfoData(query) {
+  return request({
+    url: '/system/runbpm/process/processNodeFormInfoData',
+    method: 'get',
+    params: query,
+    baseURL: process.env.VUE_APP_BASE_API4,
+  })
+}

zkqy-ui/src/views/bussiness/dialogCompments/GY1.vue

@@ -8,15 +8,33 @@
       :inline="false"
       size="normal"
     >
-      <el-form-item prop="name" label="姓名:">
-        <el-input v-model="form.name"></el-input>
+      <el-form-item prop="name" label="选择货品:">
+        <el-select
+          v-model="form.goodsID"
+          placeholder="请选择货品"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="item in []"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item prop="number" label="运行数量:">
-        <el-input v-model="form.number"></el-input>
+      <el-form-item prop="yield" label="生产重量:">
+        <!-- <el-input v-model="form.yield" type="number"></el-input> -->
+        <el-input-number
+          v-model="form.yield"
+          :min="0"
+          label="请输入生产重量"
+        ></el-input-number>
       </el-form-item>
-      <el-form-item prop="remark" label="备注信息:">
+      <!-- <el-form-item prop="remark" label="备注信息:">
         <el-input v-model="form.remark"></el-input>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
   </div>
 </template>
@@ -32,6 +50,7 @@ export default {
         name: "",
         number: "",
         remark: "",
+        yield: "",
       },
       rules: {
         name: [{ required: true, message: "请输入姓名", trigger: "blur" }],

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

@@ -201,6 +201,7 @@ import {
   processList,
   runProcessNodeExecution,
   getProcessNodeFormTemplate,
+  getProcessNodeFormInfoData,
 } from "@/api/bpmprocess/run/executeProcess";
 import { triggerExceptionNode } from "@/api/bpmprocess/process";
 
@@ -355,39 +356,45 @@ export default {
       let payLoad = {
         taskNodeKey: bepTaskNodeNextKey,
         taskProcessKey: benTaskProcessKey,
-        taskScriptKey: benmTaskAutomaticScriptTriggerType,
+        taskAutomaticScriptTriggerType: benmTaskAutomaticScriptTriggerType,
+        taskPlanKey: bepTaskPlanKey,
       };
 
-      let formData = await getProcessNodeFormTemplate(payLoad);
-      console.log(formData);
-      if (benTaskNodeFormKey) {
-        if (benTaskNodeFormType == "dragForm") {
-          let templateInfo = formData.data[0]?.template;
-          //拖拽表单
-          this.formType = "dragForm";
-          this.jsonData = JSON.parse(templateInfo.dfVueTemplate);
-          this.tableName = templateInfo.dfTableName;
-          if (Object.keys(JSON.parse(templateInfo.dfFormSql)).length) {
-            this.dynamicData = JSON.parse(templateInfo.dfFormSql);
-          }
-          // await this.getDragFormInfo(benTaskNodeFormKey);
-        } else if (benTaskNodeFormType == "composeForm") {
-          //工艺组合表单
-          this.formType = "composeForm";
-          this.groupKey = benTaskNodeFormKey;
-          let queryPayload = {
-            row,
-            groupKey: benTaskNodeFormKey,
-          };
-          this.$nextTick(() => {
-            this.$refs.dialogRef.getLists(queryPayload);
-          });
-        }
-      } else if (preFix) {
-        //定制表单
-        this.formType = "designForm";
-        this.myForm = preFix;
-      }
+      // let formData = await getProcessNodeFormTemplate(payLoad);
+      // console.log(formData);
+      // if (benTaskNodeFormKey) {
+      //   if (benTaskNodeFormType == "dragForm") {
+      //     let templateInfo = formData.data[0]?.template;
+      //     //拖拽表单
+      //     this.formType = "dragForm";
+      //     this.jsonData = JSON.parse(templateInfo.dfVueTemplate);
+      //     this.tableName = templateInfo.dfTableName;
+      //     if (Object.keys(JSON.parse(templateInfo.dfFormSql)).length) {
+      //       this.dynamicData = JSON.parse(templateInfo.dfFormSql);
+      //     }
+      //     // await this.getDragFormInfo(benTaskNodeFormKey);
+      //   } else if (benTaskNodeFormType == "composeForm") {
+      //     //工艺组合表单
+      //     this.formType = "composeForm";
+      //     this.groupKey = benTaskNodeFormKey;
+      //     let queryPayload = {
+      //       row,
+      //       groupKey: benTaskNodeFormKey,
+      //     };
+      //     this.$nextTick(() => {
+      //       this.$refs.dialogRef.getLists(queryPayload);
+      //     });
+      //   }
+      // } else if (preFix) {
+      //   //定制表单
+      //   this.formType = "designForm";
+      //   this.myForm = preFix;
+      // }
+      //定制表单
+      this.formType = "designForm";
+      this.myForm = preFix;
+      let res = await getProcessNodeFormInfoData(payLoad);
+      console.log(res);
       this.row = row; //记录当前行数据
       // if (!this.formType) return; //没有表单,直接掉运行逻辑
       this.open = true; // 打开弹窗

zkqy-ui/src/views/system/bpmnPro/components/Panel/components/ElementUnusualTasks.vue

@@ -121,6 +121,25 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="表单:" size="normal" prop="composeName">
+          <el-col :span="8">
+            <el-input
+              v-model="newUnusualTask.compName"
+              placeholder="组件名"
+              size="normal"
+              clearable
+            ></el-input>
+          </el-col>
+          <el-col class="line" :span="2">---</el-col>
+          <el-col :span="8">
+            <el-input
+              v-model="newUnusualTask.scriptName"
+              placeholder="脚本名"
+              size="normal"
+              clearable
+            ></el-input>
+          </el-col>
+        </el-form-item>
         <!-- <el-form-item prop="formType" label="表单类型" size="normal">
           <el-select
             v-model="newUnusualTask.formType"
@@ -236,10 +255,10 @@ export default {
         //   trigger: ["change"],
         //   message: "表单不能为空",
         // },
-        // composeName: {
-        //   validator: this.composeNameValidate,
-        //   trigger: "blur",
-        // },
+        composeName: {
+          validator: this.composeNameValidate,
+          trigger: "blur",
+        },
         // scriptTriggerType: {
         //   required: true,
         //   trigger: ["blur", "change"],
@@ -293,7 +312,7 @@ export default {
     composeNameValidate(rule, value, callback) {
       if (!this.newUnusualTask) return;
       let { formType, compName, scriptName } = this.newUnusualTask;
-      if (formType == "composeForm" && (!compName || !scriptName)) {
+      if (!compName || !scriptName) {
         callback(new Error("请完善自定义表单名字"));
       } else {
         callback();