sasp-flow-render 1.1.13 → 1.1.15

package/package.json

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

package/src/assets/js/api/apiFlow.js

@@ -155,6 +155,7 @@ let objResult = {
         reStartFlow:"/plFlowInstController/reStartFlow", //重启办结状态下的流程
         batchUpdateFlowStatus:"/plFlowInstController/batchUpdateFlowStatus", //新版流程批量处理的批量修改流程状态
         batchExecuteNextStep:"/plFlowInstController/batchExecuteNextStep", //新版流程批量处理的批量执行下一步
+        recoverNode:"/plFlowInstController/recoverNode", //恢复指定节点
     },
 
     plFlowSetting:{

package/src/components/flowInst/flowInstTab.vue

@@ -1915,18 +1915,33 @@
             nextStep() {
                 // let type = this.flowBatchPendingDialog ? "batch" : "";
                 let afterClickResult;
+                let result;
                 let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode || this.draftNodeId] ||{};
                 afterClickResult=this.exeFlowEvent("nextStep","afterClick", this.currentInst.currentNode || this.draftNodeId);
-                //
+
+                if(typeof afterClickResult == "boolean" && afterClickResult === false){
+                    return;
+                }
+
                 if(currentNodeObj.openEvent === '1'){
                     afterClickResult = this.exeNewFlowEvent("nextClick",currentNodeObj.nodeLinkId);
                 }
 
+                if(typeof afterClickResult == "boolean" && afterClickResult === false){
+                    return;
+                }
+
                 // let afterValidateResult;
                 // let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode || this.draftNodeId] ||{};
-                this.exeFlowEvent("nextStep","afterValidate", this.currentInst.currentNode || this.draftNodeId);
+                result = this.exeFlowEvent("nextStep","afterValidate", this.currentInst.currentNode || this.draftNodeId);
+                if(typeof result == "boolean" && result === false){
+                    return;
+                }
                 if(currentNodeObj.openEvent === '1'){
-                    this.exeNewFlowEvent("nextCheck",currentNodeObj.nodeLinkId);
+                    result = this.exeNewFlowEvent("nextCheck",currentNodeObj.nodeLinkId);
+                    if(typeof result == "boolean" && result === false){
+                        return;
+                    }
                 }
 
                 this.isDisabled['nextStep'] = false;

package/src/components/flowNewBatchDeal.vue

@@ -344,7 +344,7 @@ export default {
                         if (operateMap && operateMap.isPassCondition === 0 && !operateObj.nextNodeName) {
                             Object.assign(operateMap, {nextNodeName: "会签中...等待其他人处理完毕"});
                         }else {
-                            if (operateMap && operateMap.hasOwnProperty('isPassCondition')) {
+                            if (operateMap && operateMap.hasOwnProperty('isPassCondition') && operateMap['isPassCondition'] === "1") {
                                 delete operateMap.isPassCondition;
                             }
                         }
@@ -446,11 +446,18 @@ export default {
         },
 
         newBatchDealSelectable(row, index) {
-            // console.log('是否禁用勾选', row, index);
             let flag = true;
             flag = (row.nextDealUsers.userArr || []).length > 0;
-            return !row.isLoading;
-            // return (!row.isLoading && flag) || row.isEndNode;
+            // 当isPassCondition为0时，此时下一步没有处理人也没有处理节点，所以即使没有处理人也可以直接下一步
+            // 当isPassCondition为1时，此时会签通过，下一步需要处理人，与正常节点条件一致
+            if(row.nextDealUsers.isPassCondition === "0"){
+                flag = true;
+            }
+            // 结束节点也不需要处理人
+            if(row.isEndNode){
+                flag = true;
+            }
+            return !row.isLoading && flag; // 当此行加载完之后，同时满足初会签和结束节点下一步处理人不为空时，可执行下一步
         },
 
         taskNodeChange(val) {

package/src/components/flowRoamRecords.vue

@@ -265,13 +265,26 @@
                 ],
 
                 appendSignNodeArr: [],
-                flowNodeAppendSignDatas: []
+                flowNodeAppendSignDatas: [],
+                linkProcId: '',
+                isPrevious: false
             };
         },
         created() {
+            this.initData();
             this.init();
         },
         methods: {
+            initData() {
+                this.saspFlowAxios.post(this.api.plFlowInst.getById,{"id":this.instId}).then(res => {
+                    let flowInst = res.data;
+                    this.linkProcId = flowInst["linkProcId"] || '';
+                    if(flowInst["previousInstId"]) {
+                        this.isPrevious = true;
+                    }
+                })
+            },
+
             init() {
                 this.flowInstNodeArr = [];
                 this.loading = true;
@@ -396,7 +409,10 @@
                                 item.actorUserName = "系统处理";
                             }
                             if(item.canceled){
-                                item.nodeInstStatusName = "多人处理他人通过后自动完成";
+                                item.nodeInstStatusName = "系统自动完成";
+                                if(item.activityId.indexOf("Activity_draft") > -1){ // 恢复流程
+                                    item.nodeInstStatusName = "流程恢复自动完成";
+                                }
                             }
                         }else{
                             item.nodeInstStatus = "0";
@@ -459,6 +475,9 @@
                         }
                         if(item.activityType == "startEvent"){
                             item.actorUserName = "";
+                            if(this.isPrevious && this.linkProcId !== '' && item.rootProcessInstanceId === this.linkProcId) {
+                                item.activityName = "恢复";
+                            }
                         }else if(variables["resolve_" + item.taskId]){ // 代理
                             item.actorUserName += "(由用户‘"+ userIdsMap[variables["resolve_" + item.taskId]] + "’代理完成)";
                         }else if(variables["getBack_" + item.taskId]){ // 取回
@@ -560,6 +579,9 @@
             },
 
             sortInst(a,b){
+                if(this.isPrevious) {
+                    return  a.endTime - b.endTime;
+                }
                 if(a.endTime && b.endTime){
                     if(a.activityType == "startEvent"){
                         return -1;
@@ -617,6 +639,9 @@
              */
             nodeInstIcon(nodeInst) {
                 if (nodeInst.activityType == "startEvent") {
+                    if(this.isPrevious && this.linkProcId !== '' && nodeInst.rootProcessInstanceId === this.linkProcId) {
+                        return "el-icon-refresh";
+                    }
                     return "el-icon-caret-right";
                 } else if (nodeInst.activityType == "userTask") {
                     return "el-icon-user-solid";