sasp-flow-render 1.1.14 → 1.1.16

package/package.json

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

package/src/components/flowInst/flowInstTab.vue

@@ -446,7 +446,7 @@
                    :visible.sync="flowChartObj.dialogVisible"
                    width="90%" height="90%"
                    top="5vh">
-            <flow-chart :flow-id="flowChartObj.flowId + ''" :inst-id="flowChartObj.instId + ''"
+            <flow-chart :flow-id="(flowChartObj.flowId || flowId) + ''" :inst-id="flowChartObj.instId + ''"
                         :link-proc-id="flowChartObj.linkProcId + ''"
                         :is-release="flowChartObj.isRelease"
                         v-if="flowChartObj.dialogVisible"></flow-chart>

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

@@ -409,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";