dedsudiyu 5 月之前
父節點
當前提交
d45513e14e

+ 6 - 1
src/views/safetyCheck/safetyHazard/inspectHazard/index.vue

@@ -122,7 +122,12 @@
               <span>{{scope.row.subName}}{{scope.row.roomNum?'('+scope.row.roomNum+')':''}}</span>
               <span>{{scope.row.subName}}{{scope.row.roomNum?'('+scope.row.roomNum+')':''}}</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column label="整改期限" prop="rectifyDeadline" width="130" show-overflow-tooltip/>
+          <el-table-column label="整改期限" prop="rectifyDeadline" width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{scope.row.rectifyDeadline}}</span>
+              <span style="color:red;margin-left:10px;">{{scope.row.isDeadline?'已逾期':''}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="整改状态" prop="rectifyStatus" width="100" show-overflow-tooltip>
           <el-table-column label="整改状态" prop="rectifyStatus" width="100" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <span>{{scope.row.rectifyStatus == 1?'已完成':(scope.row.rectifyStatus == 2?'待整改':(scope.row.rectifyStatus == 3?'待复核':(scope.row.rectifyStatus == 4?'暂无法整改':'')))}}</span>
               <span>{{scope.row.rectifyStatus == 1?'已完成':(scope.row.rectifyStatus == 2?'待整改':(scope.row.rectifyStatus == 3?'待复核':(scope.row.rectifyStatus == 4?'暂无法整改':'')))}}</span>

+ 6 - 1
src/views/safetyCheck/safetyHazard/rectificationReport/listPage.vue

@@ -110,7 +110,12 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <el-table-column label="实验室" prop="subName" width="200" show-overflow-tooltip/>
             <el-table-column label="实验室" prop="subName" width="200" show-overflow-tooltip/>
-            <el-table-column label="整改期限" prop="rectifyDeadline" width="130" show-overflow-tooltip/>
+            <el-table-column label="整改期限" prop="rectifyDeadline" width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.rectifyDeadline}}</span>
+                <span style="color:red;margin-left:10px;">{{scope.row.isDeadline?'已逾期':''}}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="整改状态" prop="rectifyStatus" width="100" show-overflow-tooltip>
             <el-table-column label="整改状态" prop="rectifyStatus" width="100" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span>{{scope.row.rectifyStatus == 1?'已完成':(scope.row.rectifyStatus == 2?'待整改':(scope.row.rectifyStatus == 3?'待复核':(scope.row.rectifyStatus == 4?'暂无法整改':'')))}}</span>
                 <span>{{scope.row.rectifyStatus == 1?'已完成':(scope.row.rectifyStatus == 2?'待整改':(scope.row.rectifyStatus == 3?'待复核':(scope.row.rectifyStatus == 4?'暂无法整改':'')))}}</span>

+ 6 - 1
src/views/safetyCheck/safetyHazard/selfInspectionHazard/index.vue

@@ -122,7 +122,12 @@
               <span>{{scope.row.subName}}{{scope.row.roomNum?'('+scope.row.roomNum+')':''}}</span>
               <span>{{scope.row.subName}}{{scope.row.roomNum?'('+scope.row.roomNum+')':''}}</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column label="整改期限" prop="rectifyDeadline" width="130" show-overflow-tooltip/>
+          <el-table-column label="整改期限" prop="rectifyDeadline" width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{scope.row.rectifyDeadline}}</span>
+              <span style="color:red;margin-left:10px;">{{scope.row.isDeadline?'已逾期':''}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="整改状态" prop="rectifyStatus" width="100" show-overflow-tooltip>
           <el-table-column label="整改状态" prop="rectifyStatus" width="100" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <span>{{scope.row.rectifyStatus == 1?'已完成':(scope.row.rectifyStatus == 2?'待整改':(scope.row.rectifyStatus == 3?'待复核':(scope.row.rectifyStatus == 4?'暂无法整改':'')))}}</span>
               <span>{{scope.row.rectifyStatus == 1?'已完成':(scope.row.rectifyStatus == 2?'待整改':(scope.row.rectifyStatus == 3?'待复核':(scope.row.rectifyStatus == 4?'暂无法整改':'')))}}</span>