Merge branch 'web-v2' into web-v2-pro

src/views/safetyCheck/worktable/toDoListBox.vue

@@ -35,15 +35,15 @@
           <p>{{item.title}}</p>
         </div>
         <div class="for-button-box">
-          <p>{{item.manageStatus==0?'待检查':(item.manageStatus==1?'检查中':(item.manageStatus==2?'待复核':''))}}</p>
+          <p>{{queryParams.manageStatus==0?'待检查':(queryParams.manageStatus==1?'检查中':(queryParams.manageStatus==2?'待复核':''))}}</p>
           <p>{{item.checkType==1?'校院巡查':(item.checkType==2?'实验室自查':'')}}</p>
           <p>{{item.collegeName}}</p>
         </div>
         <div class="for-time-box">
           <p>计划周期：{{item.cycleStartTime}} 至 {{item.cycleEndTime}}</p>
-          <p v-if="queryParams.manageStatus == 0" :class="item.checkIsStatus?'':'noButton'" @click="goPage(item)">{{item.checkIsStatus?'开始检查':'计划未开始'}}</p>
+          <p v-if="queryParams.manageStatus == 0" :class="item.checkIsStatus == 1?'':'noButton'" @click="goPage(item)">{{item.checkIsStatus == 1?'开始检查':'计划未开始'}}</p>
           <p v-if="queryParams.manageStatus == 1" @click="goPage(item)">编辑</p>
-          <p v-if="queryParams.manageStatus == 2" @click="addDialogOpen(true,item)">复核</p>
+          <p v-if="queryParams.manageStatus == 2 && item.applyGentle" @click="addDialogOpen(true,item)">复核</p>
         </div>
         <img class="position-img" v-if="item.checkRange == 1" src="@/assets/ZDimages/safetyCheck/icon_xyxc_qx.png">
         <img class="position-img" v-if="item.checkRange == 2" src="@/assets/ZDimages/safetyCheck/icon_xyxc_xy.png">
@@ -153,7 +153,7 @@
         if(this.infoDialogType != type){
           if(type){
             let obj = {
-              id:data.hazardId
+              id:data.id
             }
             this.$set(this,'propsInfoDialogData',obj);
             this.$set(this,'infoDialogType',type);
@@ -172,13 +172,15 @@
       getList(){
         clearInterval(this.tableTimer);
         if(this.queryParams.manageStatus == 2){
-          tobeReviewed(this.queryParams.searchValue).then(response => {
-            this.$set(this,'tableList',response.rows);
+          let obj = JSON.parse(JSON.stringify(this.queryParams))
+          obj.rectifyStatus = 3;
+          tobeReviewed(obj).then(response => {
+            this.$set(this,'tableList',response.data.records);
             this.tableActionFun();
           });
         }else{
           todoList(this.queryParams).then(response => {
-            this.$set(this,'tableList',response.rows);
+            this.$set(this,'tableList',response.data.records);
             this.tableActionFun();
           });
         }