Dev yf'

src/views/riskProject/add/taskList.vue

@@ -514,6 +514,7 @@ export default {
       searchValue: "",
       messageText: "",
       checkValue: [],
+      isAll: false,
       plan: 0,
       showIndex: false,
       isShowAppvoreList: false,
@@ -603,10 +604,10 @@ export default {
     },
     //审批否决
     unApproveTask() {
-      if (this.status == 2) {
-        this.lookdetail(this.planId);
-      } else if (this.status == 3) {
+      if (this.isAll) {
         this.approveTask(0);
+      } else {
+        this.lookdetail(this.planId);
       }
 
       //TODO 审批否决
@@ -667,20 +668,25 @@ export default {
           switch (this.messageList.statusKey) {
             case "CREATE_TASK":
             case "WAIT_START":
-            case "WAIT_RETURN":
               this.status = 0;
               break;
-            case "CREATE_TASK":
-            case "WAIT_LEADER_RETURN":
-            case "PROJECT_REPORT":
+            case "RUNNING":
+            case "WAIT_RETURN":
               this.status = 1;
               break;
+            case "WAIT_LEADER_APPROVE":
+            case "WAIT_LEADER_RETURN":
+              this.status = 2;
+              this.isAll = false;
+              break;
+
             case "WAIT_APPROVE":
-            case "FINISH":
               this.status = 2;
+              this.isAll = true;
               break;
             case "REVOKE":
             case "FINISH":
+            case "PROJECT_REPORT":
               this.status = 3;
               break;
             default:

src/views/riskProject/execution/index.vue

@@ -277,6 +277,7 @@ export default {
           buildingId: item.buildingId
         }
       });
+      sessionStorage.setItem("pathAuth", "riskExecution");
       sessionStorage.setItem("planId", item.id);
       sessionStorage.setItem("buildingId", item.buildingId);
       this.showIndex = false;