sasp-flow-render 1.1.29-decoupling → 1.1.30-decoupling

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasp-flow-render",
-  "version": "1.1.29-decoupling",
+  "version": "1.1.30-decoupling",
   "description": "业务应用支撑平台-智慧流程渲染组件",
   "scripts": {
     "build": "vue-cli-service build"

package/src/components/flowInst/js/workflow.js

@@ -240,43 +240,48 @@ class WorkflowEngine {
                     disabled: false,
                     show: false,
                     method: () => {
-                    this.$this.saspFlowAxios.post(this.$this.api.plFlowInst.stopFlow, {
-                        instId: this.currentInst.flowInstId, type: "0",
-                        procInstId: this.currentInst.linkProcId,
-                        taskId: this.currentInst.taskId
-                    }).then(res => {
-                        if (res && res.data) {
-                            if (res.data.operateSuccess) {
-                                this.$this.$message({type: "success", message: "中止成功！"});
-                                if (this.getFlowBatchDialog && this.getFlowBatchDialog()) {
-                                    this.batchTabRemove(this.currentInst.dataId);
+                    this.$this.$confirm('确定要中止此流程吗?', '警告', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                    }).then(() => {
+                        this.$this.saspFlowAxios.post(this.$this.api.plFlowInst.stopFlow, {
+                            instId: this.currentInst.flowInstId, type: "0",
+                            procInstId: this.currentInst.linkProcId,
+                            taskId: this.currentInst.taskId
+                        }).then(res => {
+                            if (res && res.data) {
+                                if (res.data.operateSuccess) {
+                                    this.$this.$message({type: "success", message: "中止成功！"});
+                                    if (this.getFlowBatchDialog && this.getFlowBatchDialog()) {
+                                        this.batchTabRemove(this.currentInst.dataId);
+                                    } else {
+                                        this.tabCrudSearch && this.tabCrudSearch();
+                                        this.flowInstDataDialog = false;
+                                        this.$flowDialog.operateDialog('flowInstDataDialog',false);
+                                    }
+                                    this.initTabNum && this.initTabNum();
+
+                                    let remindParam = {
+                                        instId:this.currentInst.flowInstId,
+                                        flowId:this.flowDefine.id,
+                                        flowName:this.flowDefine.flowName,
+                                        // formId:this.formInfo.formId,
+                                        // listViewId:this.formInfo.listViewId,
+                                        dataId:this.formInfo.dataId,
+                                        instType:"stopped"
+                                    };
+                                    this.$this.saspFlowAxios.post(this.$this.api.plFlowInst.saveRemind,remindParam);
+
+                                    //执行事件规则
+                                    let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode] ||{};
+                                    if(currentNodeObj.openEvent == '1'){
+                                        this.exeNewFlowEvent("suspend",currentNodeObj.nodeLinkId||'');
+                                    }
                                 } else {
-                                    this.tabCrudSearch && this.tabCrudSearch();
-                                    this.flowInstDataDialog = false;
-                                    this.$flowDialog.operateDialog('flowInstDataDialog',false);
+                                    this.$this.$message({type: "error", message: res.data.operateMessage});
                                 }
-                                this.initTabNum && this.initTabNum();
-
-                                let remindParam = {
-                                    instId:this.currentInst.flowInstId,
-                                    flowId:this.flowDefine.id,
-                                    flowName:this.flowDefine.flowName,
-                                    // formId:this.formInfo.formId,
-                                    // listViewId:this.formInfo.listViewId,
-                                    dataId:this.formInfo.dataId,
-                                    instType:"stopped"
-                                };
-                                this.$this.saspFlowAxios.post(this.$this.api.plFlowInst.saveRemind,remindParam);
-
-                                //执行事件规则
-                                let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode] ||{};
-                                if(currentNodeObj.openEvent == '1'){
-                                    this.exeNewFlowEvent("suspend",currentNodeObj.nodeLinkId||'');
-                                }
-                            } else {
-                                this.$this.$message({type: "error", message: res.data.operateMessage});
                             }
-                        }
+                        });
                     });
                 }
             },
@@ -1966,7 +1971,7 @@ class WorkflowEngine {
         }else {
             arrNodeFormBtns = this.nodeFormBtnObj[this.flowVersionNodeObj[this.flowDefine.releaseVersion][this.startNodeKeyObj[this.flowDefine.releaseVersion]].id];
         }
-        let hideBtnTypes = new Set(["getBack","stopped"]);
+        let hideBtnTypes = new Set(["getBack"]);
         if (this.tabActive == "draft") {
             hideBtnTypes.add("flowRecord");
             hideBtnTypes.add("record");