From 02969af8a55494c2cba0febf7041804b1bdbd226 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 12 May 2025 17:06:05 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extensionRequestApproval/index.vue        | 14 +++++--
 .../hazardRectificationApproval/index.vue     | 22 +++++++---
 .../violation/violationApprovalList.vue       | 41 +++++++++++--------
 3 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
index f747f95..1a97245 100644
--- a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
+++ b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
@@ -5,7 +5,8 @@
         <el-input
           v-model="queryParams.keyWord"
           placeholder="请输入关键字"
-          clearable v-no-whitespace
+          clearable
+          v-no-whitespace
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -13,7 +14,8 @@
         <el-input
           v-model="queryParams.hazardQuestionCode"
           placeholder="请输入隐患问题编号"
-          clearable v-no-whitespace
+          clearable
+          v-no-whitespace
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -81,7 +83,7 @@
             size="mini"
             style="color: #f56c6c"
             @click="handleRectify(scope.row, 1)"
-            v-if="scope.row.status == '1'"
+            v-if="scope.row.intoStatus == '1'"
           >
             审批
           </el-button>
@@ -115,7 +117,11 @@
 <script>
 import { dictTableOption } from '@/api/tool/select'
 import { encryptCBC } from '@/utils/aescbc'
-import { getReviewOfDeferredApprovalList, getTypeOfViolationSelect, withdrawalOfExtension } from '@/api/hiddenDangerManagement'
+import {
+  getReviewOfDeferredApprovalList,
+  getTypeOfViolationSelect,
+  withdrawalOfExtension,
+} from '@/api/hiddenDangerManagement'
 import { retractApproval } from '@/api/terminalEquipment/deviceInformation'
 
 export default {
diff --git a/src/views/hiddenDangerManagement/hazardRectificationManagement/hazardRectificationApproval/index.vue b/src/views/hiddenDangerManagement/hazardRectificationManagement/hazardRectificationApproval/index.vue
index 3a1c1c3..4d465e2 100644
--- a/src/views/hiddenDangerManagement/hazardRectificationManagement/hazardRectificationApproval/index.vue
+++ b/src/views/hiddenDangerManagement/hazardRectificationManagement/hazardRectificationApproval/index.vue
@@ -13,7 +13,8 @@
         <el-input
           v-model="queryParams.pitfallCode"
           placeholder="请输入隐患问题编号"
-          clearable v-no-whitespace
+          clearable
+          v-no-whitespace
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -71,7 +72,8 @@
                 <el-input
                   v-model="queryParams.proName"
                   placeholder="请输入隐患工程"
-                  clearable v-no-whitespace
+                  clearable
+                  v-no-whitespace
                   @keyup.enter.native="handleQuery"
                   class="ipt-width"
                 />
@@ -147,7 +149,8 @@
                 <el-input
                   v-model="queryParams.subName"
                   placeholder="请输入整改责任承包商"
-                  clearable v-no-whitespace
+                  clearable
+                  v-no-whitespace
                   class="ipt-width"
                 />
               </el-form-item>
@@ -168,14 +171,21 @@
                 <el-input
                   v-model="queryParams.pitfallCode"
                   placeholder="请输入隐患问题编号"
-                  clearable v-no-whitespace
+                  clearable
+                  v-no-whitespace
                   class="ipt-width"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12" :offset="0">
               <el-form-item label="创建人" prop="createUserName">
-                <el-input v-model="queryParams.createUserName" placeholder="请输入创建人" clearable class="ipt-width" v-no-whitespace />
+                <el-input
+                  v-model="queryParams.createUserName"
+                  placeholder="请输入创建人"
+                  clearable
+                  class="ipt-width"
+                  v-no-whitespace
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -260,7 +270,7 @@
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="handleRectify(scope.row, 5)">查看</el-button>
           <el-button
-            v-if="userType == '00' && scope.row.status == '1'"
+            v-if="userType == '00' && scope.row.intoStatus == '1'"
             type="text"
             size="mini"
             style="color: #f56c6c"
diff --git a/src/views/violationManagenment/violation/violationApprovalList.vue b/src/views/violationManagenment/violation/violationApprovalList.vue
index a7d5631..05bcb60 100644
--- a/src/views/violationManagenment/violation/violationApprovalList.vue
+++ b/src/views/violationManagenment/violation/violationApprovalList.vue
@@ -2,27 +2,29 @@
   <!-- 违章处罚 -->
   <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="请输入关键字"
-          clearable v-no-whitespace
+          clearable
+          v-no-whitespace
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="处罚单号" prop="punishCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.punishCode"-->
-<!--          placeholder="请输入处罚单号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="处罚单号" prop="punishCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.punishCode"-->
+      <!--          placeholder="请输入处罚单号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="违章编号" prop="violationCode">
         <el-input
           v-model="queryParams.violationCode"
           placeholder="请输入违章编号"
-          clearable v-no-whitespace
+          clearable
+          v-no-whitespace
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -30,7 +32,8 @@
         <el-input
           v-model="queryParams.signerName"
           placeholder="请输入签发人姓名"
-          clearable v-no-whitespace
+          clearable
+          v-no-whitespace
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -79,7 +82,13 @@
       <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.status == '1'">
+          <el-button
+            type="text"
+            size="mini"
+            style="color: #f56c6c"
+            @click="handleRectify(scope.row, 1)"
+            v-if="scope.row.intoStatus == '1'"
+          >
             审批
           </el-button>
           <el-button type="text" size="mini" style="color: #e6a23c" @click="handleRectify(scope.row, 2)">
@@ -110,7 +119,7 @@ import {
   exportViolationInfo,
   exportViolationPunishInfo,
   getViolationPunishApprovalList,
-  getViolationPunishList
+  getViolationPunishList,
 } from '@/api/violation/violation'
 import { parseTime } from '@/utils/bonus'
 export default {
@@ -160,7 +169,7 @@ export default {
   },
   methods: {
     updateStatus(status) {
-      return this.approvalStatusOpts.find((item) => item.value === status)?.label
+      return this.approvalStatusOpts.find(item => item.value === status)?.label
     },
     // 查询
     handleQuery() {
@@ -184,7 +193,7 @@ export default {
         // this.total = res.total
         this.queryParams.userType = this.$store.state.user.userType
         this.queryParams.personId = this.$store.state.user.userData.userId
-        getViolationPunishApprovalList(this.queryParams).then((res) => {
+        getViolationPunishApprovalList(this.queryParams).then(res => {
           this.loading = false
           this.tableList = res.rows
           this.total = res.total