Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop

src/views/riskProject/add/inherentRisks.vue

@@ -154,7 +154,6 @@ export default {
       postFun(
         `/risk/plan/submit/${this.planId}/${this.buildingId}`
       ).then(res => {
-        console.log(res.msg,'lllll')
         Dialog.alert({
           title: '任务执行结束',
           message: res.msg,
@@ -240,12 +239,12 @@ export default {
     },
     async changeFloor() {
       let room = await this.roomList(this.value1);
-      let risk = await this.riskList(this.planId, this.active, this.value1);
+      let risk = await this.riskList(this.planId,this.buildingId, this.value1,this.value2);
     },
     async changeRoom() {
       let risk = await this.riskList(
         this.planId,
-        this.active,
+        this.buildingId,
         this.value1,
         this.value2
       );

src/views/riskProject/add/taskList.vue

@@ -169,28 +169,25 @@
                 justify="space-between"
                 style="margin-top:10px;"
               >
-                <van-col span="22" @click="toRiskDetail(item)">
+                <van-col span="20" @click="toRiskDetail(item)">
                   <van-col span="5">
                     <van-image
                       width="46"
                       height="46"
                       src="https://img01.yzcdn.cn/vant/cat.jpeg"
                     />
-                    <van-image width="46" height="46" :src="item.avatar" />
+                    <!-- <van-image width="46" height="46" :src="item.avatar" /> -->
                   </van-col>
-                  <van-col span="17">
+                  <van-col span="15">
                     <van-row gutter="">
                       <van-col span="9">风险名称：</van-col>
                       <van-col span="15">{{ item.name }}</van-col>
                     </van-row>
                   </van-col>
                 </van-col>
-                <van-col span="2">
-                  <van-row
-                    :style="{
-                      color: '#03b615'
-                    }"
-                  >
+                <van-col span="4">
+                  <van-row type="flex">
+                    详情
                     <van-icon name="arrow" size="26px" @click="goColorDetail" />
                   </van-row>
                 </van-col>
@@ -514,6 +511,7 @@ export default {
       searchValue: "",
       messageText: "",
       checkValue: [],
+      isAll: false,
       plan: 0,
       showIndex: false,
       isShowAppvoreList: false,
@@ -560,6 +558,7 @@ export default {
     },
     //执行任务
     performTasks() {
+      console.log( this.messageList,'LLLL')
       sessionStorage.setItem(
         "buildingId",
         this.messageList.riskBuildingListDtos[0].buildingId
@@ -603,10 +602,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 +666,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;