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

src/views/safetyCheck/worktable/toDoListBox.vue

@@ -25,7 +25,8 @@
       <div  class="for-list-box"
             v-for="(item,index) in tableList" :key="index">
         <div class="for-name-box">
-          <p class="name-p">{{item.subjectName}}-{{item.roomNumber}}</p>
+          <p class="name-p" v-if="queryParams.manageStatus != 2">{{item.subjectName}}-{{item.roomNumber}}</p>
+          <p class="name-p" v-if="queryParams.manageStatus == 2">{{item.subRoom}}</p>
           <p class="type-p" v-if="item.isOverdue == 1">已逾期</p>
           <p class="null-p"></p>
           <img v-if="item.isAttachment == 1" @click="lookDocumentListButton(1,item)"