From 999c3565d181e907d330a15466a6cca59ddf17a4 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 20 Jun 2025 10:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extensionRequestApproval/acceptance.vue   |  5 +--
 .../extensionRequestApproval/index.vue        |  2 +-
 .../list/consPersonEnterApprovalList.vue      |  2 +-
 .../violation/violationApprovalList.vue       | 32 +++++++++++++------
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/acceptance.vue b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/acceptance.vue
index 95833de..ff53629 100644
--- a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/acceptance.vue
+++ b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/acceptance.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
-      <el-form-item label="关键字---" prop="keyWord">
+      <el-form-item label="关键字" prop="keyWord">
         <el-input
           v-model="queryParams.keyWord"
           placeholder="请输入关键字"
@@ -74,7 +74,7 @@
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="handleRectify(scope.row, 5)">查看</el-button>
           <el-button
-            v-if="scope.row.isDelayCheck == '1'"
+            v-if="scope.row.isDelayCheck == '1' && scope.row.userId == userId"
             type="text"
             size="mini"
             style="color: #f56c6c"
@@ -159,6 +159,7 @@ export default {
         { label: '已驳回', value: '4' },
         { label: '已撤回', value: '5' },
       ],
+      userId: this.$store.state.user.id,
     }
   },
   created() {
diff --git a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
index 6ca34ad..d1d684e 100644
--- a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
+++ b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
@@ -82,7 +82,7 @@
             type="text"
             size="mini"
             style="color: #f56c6c"
-            @click="handleRectify(scope.row, 3)"
+            @click="handleRectify(scope.row, 1)"
             v-if="scope.row.intoStatus == '1'"
           >
             审批
diff --git a/src/views/pro/approval/list/consPersonEnterApprovalList.vue b/src/views/pro/approval/list/consPersonEnterApprovalList.vue
index aa134ff..d965dfb 100644
--- a/src/views/pro/approval/list/consPersonEnterApprovalList.vue
+++ b/src/views/pro/approval/list/consPersonEnterApprovalList.vue
@@ -124,7 +124,7 @@
             v-hasPermi="['system:subPersonApply:list']"
             @click="handleApprove(scope.row)"
           >
-            审批---
+            审批
           </el-button>
           <el-button size="mini" type="text" @click="handleView(scope.row)" v-else>查看</el-button>
           <el-button size="mini" type="text" @click="handleAuditRecord(scope.row)">审核记录</el-button>
diff --git a/src/views/violationManagenment/violation/violationApprovalList.vue b/src/views/violationManagenment/violation/violationApprovalList.vue
index 5353f99..8027345 100644
--- a/src/views/violationManagenment/violation/violationApprovalList.vue
+++ b/src/views/violationManagenment/violation/violationApprovalList.vue
@@ -82,15 +82,27 @@
       <el-table-column label="操作" align="center" width="150">
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="handleRectify(scope.row, 3)">查看</el-button>
-          <el-button
-            type="text"
-            size="mini"
-            style="color: #f56c6c"
-            @click="handleRectify(scope.row, 1)"
-            v-if="scope.row.intoStatus == '1'"
-          >
-            审批
-          </el-button>
+
+          <template v-if="userType == '01'">
+            <template v-if="scope.row.intoStatus == '1' && scope.row.type != 1">
+              <el-button type="text" size="mini" style="color: #f56c6c" @click="handleRectify(scope.row, 1)">
+                审批
+              </el-button>
+            </template>
+          </template>
+
+          <template v-else>
+            <el-button
+              type="text"
+              size="mini"
+              style="color: #f56c6c"
+              @click="handleRectify(scope.row, 1)"
+              v-if="scope.row.intoStatus == '1'"
+            >
+              审批
+            </el-button>
+          </template>
+
           <el-button type="text" size="mini" style="color: #e6a23c" @click="handleRectify(scope.row, 2)">
             审批记录
           </el-button>
@@ -162,10 +174,12 @@ export default {
       ],
       // 表格数据
       tableList: [],
+      userType: '',
     }
   },
   created() {
     this.getList()
+    this.userType = this.$store.state.user.userType
   },
   methods: {
     updateStatus(status) {