From 4b81af70ad9729e59296073e4b847db02355fb1a Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Fri, 17 Jan 2025 10:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B4=E6=94=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8E=E5=BB=B6=E6=9C=9F=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extensionRequestApproval/index.vue                 |  8 ++++++++
 .../hazardRectificationApproval/index.vue              | 10 +++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
index 97fffe8..11c81eb 100644
--- a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
+++ b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
@@ -66,6 +66,11 @@
         <template v-slot="scope" v-if="column.prop == 'intoStatus'">
           <span>{{ updateStatus(scope.row.intoStatus) }}</span>
         </template>
+        <template v-slot="scope" v-else-if="column.prop == 'isDelayCheck' && userType == '02'">
+          <span v-if="scope.row.isDelayCheck == 0">未申请</span>
+          <span v-else-if="scope.row.isDelayCheck == 1">申请中</span>
+          <span v-else-if="scope.row.isDelayCheck == 2">已申请</span>
+        </template>
       </el-table-column>
       <!-- 操作 -->
       <el-table-column label="操作" align="center" width="150">
@@ -162,6 +167,9 @@ export default {
     }
   },
   created() {
+    if (this.userType == '02') {
+      this.tableColumns.splice(9, 0, { label: '延期状态', prop: 'isDelayCheck' })
+    }
     this.getList()
     this.getTroubleType()
     this.getTroubleLevel()
diff --git a/src/views/hiddenDangerManagement/hazardRectificationManagement/hazardRectificationApproval/index.vue b/src/views/hiddenDangerManagement/hazardRectificationManagement/hazardRectificationApproval/index.vue
index e704e34..015fef2 100644
--- a/src/views/hiddenDangerManagement/hazardRectificationManagement/hazardRectificationApproval/index.vue
+++ b/src/views/hiddenDangerManagement/hazardRectificationManagement/hazardRectificationApproval/index.vue
@@ -43,9 +43,7 @@
       <el-form-item style="display: flex; justify-content: flex-end" v-if="userType == '00'">
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" @click="handleReset">重置</el-button>
-        <el-button type="text" style="margin-left: 30px; color: #409eff" @click="drawer = true">
-          高级筛选
-        </el-button>
+        <el-button type="text" style="margin-left: 30px; color: #409eff" @click="drawer = true">高级筛选</el-button>
       </el-form-item>
       <el-form-item v-else>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
@@ -251,6 +249,11 @@
         <template v-slot="scope" v-if="column.prop == 'intoStatus'">
           <span>{{ updateStatus(scope.row.intoStatus) }}</span>
         </template>
+        <template v-slot="scope" v-else-if="column.prop == 'isCheck' && userType == '02'">
+          <span v-if="scope.row.isCheck == 0">未整改</span>
+          <span v-else-if="scope.row.isCheck == 1">整改中</span>
+          <span v-else-if="scope.row.isCheck == 2">已整改</span>
+        </template>
       </el-table-column>
       <!-- 操作 -->
       <el-table-column label="操作" align="center" width="150">
@@ -407,6 +410,7 @@ export default {
     if (this.userType == '02') {
       // 删除表头 隐患工程 整改责任承包商
       this.tableColumns = this.tableColumns.filter(item => item.prop !== 'proName' && item.prop !== 'subName')
+      this.tableColumns.splice(9, 0, { label: '整改状态', prop: 'isCheck' })
     }
     this.getList()
     this.getTroubleType()