Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

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

@@ -158,14 +158,12 @@
           @pagination="getList"
         />
       </div>
-       
+
       <div class="show-window">
         <!-- 运行节点弹窗 -->
 
-        <el-dialog :title="nodeTitle" :visible.sync="open" width="50%">
-          <!-- <GY02></GY02> -->
-          <!-- <CG02></CG02> -->
-          <!-- <el-form label-width="100px" :model="commonData">
+        <el-dialog :title="nodeTitle" :visible.sync="open">
+          <!--  <el-form label-width="100px" :model="commonData">
             <h1>这里会引入当前节点需要处理的表单</h1>
           </el-form> -->
           <!-- <k-form-build
@@ -175,8 +173,8 @@
             :dynamicData="dynamicData"
             :defaultValue="defaultValue"
             :value="jsonData"
-          />
-          <DialogTemplate
+          /> -->
+          <!-- <DialogTemplate
             v-else-if="formType == 'composeForm'"
             ref="dialogRef"
             :groupKey="groupKey"
@@ -186,14 +184,15 @@
             :subTableName="subTableName"
             @addList="() => {}"
           ></DialogTemplate> -->
+          ></DialogTemplate> -->
           <component
             :is="myForm"
             :formData="formData"
             :row="row"
             ref="myFormRef"
           ></component>
-          <!-- <CG1 ref="myFormRef"></CG1> -->
-          <!-- <KC1 ref="myFormRef"></KC1> -->
+          <!-- <CG1 ref="myFormRef"></CG1>
+          <KC1 ref="myFormRef"></KC1> -->
           <!-- <GY06 ref="myFormRef"></GY06> -->
           <span slot="footer" class="dialog-footer">
             <el-button @click="closeExecuteNode">取消</el-button>
@@ -222,15 +221,17 @@ import DialogTemplate from "@/views/dialogTemplate/components/index.vue";
 
 // 弹窗表单组件
 import GY01 from "./dialogCompments/GongYi/GY01.vue";
+import GY03 from "./dialogCompments/GongYi/GY03.vue";
 import CG1 from "./dialogCompments/test-component/CaiGou/CG1.vue";
 import CG02 from "./dialogCompments/test-component/CaiGou/CG02.vue";
 import KC1 from "./dialogCompments/test-component/KuCun/KC1.vue";
+import KC02 from "./dialogCompments/test-component/KuCun/KC02.vue";
 import GY06 from "./dialogCompments/GongYi/GY06.vue";
 
 export default {
   name: "processMange",
   props: [],
-  components: { GY01, DialogTemplate, CG1,CG02, KC1, GY06,GY02},
+  components: { GY01, DialogTemplate, CG1,CG02, KC1, GY06, GY03, KC02, GY02 },
   dicts: ["bpm_type", "task_process_state"],
   data() {
     return {
@@ -362,6 +363,8 @@ export default {
     // 打开运行节点弹窗
     async opneExecuteNode(row) {
       this.resetDialogForm();
+      console.log(row);
+      this.nodeTitle = row.benTaskNodeName;
       let preFix = row.benTaskNodeName.split("-")[0];
       let {
         benTaskNodeFormKey,
@@ -415,7 +418,6 @@ export default {
       this.formType = "designForm";
       this.myForm = preFix;
       let res = await getProcessNodeFormInfoData(payLoad);
-      console.log(res);
       if (res.code == 200) {
         this.formData = res.data;
       } else {
@@ -425,6 +427,9 @@ export default {
       this.row = row; //记录当前行数据
       // if (!this.formType) return; //没有表单,直接掉运行逻辑
       this.open = true; // 打开弹窗
+      this.$nextTick(() => {
+        this.$refs.myFormRef?.resetForm();
+      });
       // 根据当前节点绑定的表单信息查询对应的表单进行展示
     },
     // 运行节点按钮 确认运行回调
@@ -453,7 +458,7 @@ export default {
         implementationName: this.row.benmTaskAutomaticScriptTriggerType, //当前节点绑定的脚本名
         // taskProcessXmlContent: this.row.bepTaskProcessXmlContent, //当前流程xml
         tableName: this.tableName,
-        formDataMap: JSON.stringify(formData), //自定义表单组件收集的表单数据
+        // formDataMap: JSON.stringify(formData), //自定义表单组件收集的表单数据
       };
       let fileXML = new File(
         [this.row.bepTaskProcessXmlContent],
@@ -521,6 +526,7 @@ export default {
     },
     // 触发异常回调
     exceptionTrigger(row, scriptData) {
+      let _this = this;
       this.$modal
         .confirm("是否确认触发<" + scriptData.scriptName + ">异常？")
         .then(function (val) {
@@ -532,18 +538,19 @@ export default {
             sysBpmNodeScriptVO: scriptData,
           };
           triggerExceptionNode(payLoad).then((res) => {
+            console.log(res);
             if (res.code == 200) {
-              this.$message.success("触发成功");
-              this.open = false;
-              this.getList();
+              _this.$message.success("触发成功");
+              _this.open = false;
+              _this.getList();
             } else {
-              this.$message.error("触发失败请稍后再试");
+              _this.$message.error("触发失败请稍后再试");
             }
           });
         })
         .catch(() => {
-          this.open = false;
-          this.$message.info("取消成功");
+          _this.open = false;
+          _this.$message.info("取消成功");
         });
     },
     // 获取字典对应label
@@ -564,7 +571,7 @@ export default {
   .col {
     background-color: #fff;
     border-right: 1px solid #ebedf2;
-     /* margin-right: 3px; */
+    /* margin-right: 3px; */
     .statistic-wrap {
       /* // height: 70px; */
       box-sizing: border-box;

zkqy-ui/src/views/system/bpmnPro/components/bo-utils/getNodeMsg.js

@@ -119,11 +119,11 @@ function getNodeException(node, nodeObj) {
         if (item.nodeName == `${prefix}:unusualTask`) {
           let formName = '', formType = item.attributes.formType?.nodeValue || '';
 
-          if (formType == 'designForm') {
-            formName = item.getAttribute('compName') + '-' + item.getAttribute('scriptName');
-          } else {
-            formName = item.getAttribute('scriptName');
-          }
+          // if (formType == 'designForm') {
+          formName = item.getAttribute('compName') + '-' + item.getAttribute('scriptName');
+          // } else {
+          //   formName = item.getAttribute('scriptName');
+          // }
           res.push({
             scriptKey: item.attributes.scriptKey?.nodeValue,
             // scriptTriggerType: item.attributes?.scriptTriggerType?.nodeValue || 0,