From fc3df5a162f568d89429dd6c6410d0fbc87f6183 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Wed, 3 Apr 2024 09:28:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=EF=BC=8C=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E7=8E=AF=E4=BF=9D=E6=A3=80=E6=9F=A5=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=9A=90=E6=82=A3=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checklist/components/edit.vue             |  2 +-
 src/views/hotwork/hotwork/components/list.vue |  6 ++--
 .../hotwork_cfd/hotwork/components/list.vue   | 28 ++++++++++++++-----
 .../archive/components/info.vue               | 17 +++++++++--
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/views/firefighting/checklist/components/edit.vue b/src/views/firefighting/checklist/components/edit.vue
index 337fef5..49bda77 100644
--- a/src/views/firefighting/checklist/components/edit.vue
+++ b/src/views/firefighting/checklist/components/edit.vue
@@ -20,7 +20,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="5">
+          <el-col :span="10">
             <el-form-item label="负责部门：" prop="DEPARTMENT_ID">
               <SelectTree
                 v-if="treeData.length !== 0 && FIRE_CHECK_ID != ''"
diff --git a/src/views/hotwork/hotwork/components/list.vue b/src/views/hotwork/hotwork/components/list.vue
index 71632aa..1fe71dd 100644
--- a/src/views/hotwork/hotwork/components/list.vue
+++ b/src/views/hotwork/hotwork/components/list.vue
@@ -2,12 +2,12 @@
   <div class="app-container">
     <el-form ref="searchForm" :model="searchForm" label-width="80px">
       <el-row>
-        <el-col span="6">
+        <el-col :span="6">
           <el-form-item label="作业编号" prop="keySource">
             <el-input v-model="searchForm.keyJobNumber" placeholder="请输入作业编号" class="filter-item" />
           </el-form-item>
         </el-col>
-        <el-col span="6">
+        <el-col :span="6">
           <el-form-item label="特级动火审批状态" prop="keyHiddenDescr" label-width="130px">
             <el-select v-model="searchForm.keyState" placeholder="请选择">
               <el-option v-for="item in statusSuperList" :key="item.id" :label="item.name" :value="item.id" />
@@ -95,7 +95,7 @@
           <!--          <el-button :disabled="row.STATE !='-2'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'repulse')">打回</el-button>-->
           <el-button icon="el-icon-view" size="mini" @click="goInfo(row.HOTWORKAPPLICATION_ID,'see')">查看</el-button>
           <!--<el-button v-if="row.STATE=='-6' && row.CREATOR == loginUserID" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>-->
-          <el-button v-if="row.CREATOR == loginUserID || loginUserID == '1' || loginRoleNumber == 'R20201225624685'" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>
+          <el-button v-if="(row.CREATOR == loginUserID || loginUserID == '1' || loginRoleNumber == 'R20201225624685') && row.STATE != 11" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/hotwork_cfd/hotwork/components/list.vue b/src/views/hotwork_cfd/hotwork/components/list.vue
index 6f6d184..26917ef 100644
--- a/src/views/hotwork_cfd/hotwork/components/list.vue
+++ b/src/views/hotwork_cfd/hotwork/components/list.vue
@@ -69,7 +69,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="350">
         <template slot-scope="{row}">
-          <el-button type="danger" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
+          <el-button v-if="(row.APPLY_USER_ID == loginUserID || loginUserID == '1' || loginRoleNumber == 'R20201225624685') && row.APPLY_STATUS != 8" type="danger" icon="el-icon-delete" @click="handleDelete(row)">删除</el-button>
           <el-button type="primary" icon="el-icon-plus" @click="goChart(row)">流程图</el-button>
           <el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORK_ID)">审批表详情</el-button>
         </template>
@@ -225,10 +225,13 @@ export default {
         { ID: '-98', NAME: '已作废(未进行气体检测)' }
       ],
       STATUS: '',
-      DEPTIDS: ''
+      DEPTIDS: '',
+      loginUserID: '',
+      loginRoleNumber: JSON.parse(sessionStorage.getItem('user')).RNUMBER
     }
   },
   created() {
+    this.getEditMyInfo()
     this.getList()
   },
   methods: {
@@ -263,6 +266,17 @@ export default {
         this.listLoading = false
       })
     },
+    // 获取登录人信息
+    getEditMyInfo() {
+      requestFN(
+        '/user/goEditMyInfo',
+        {}
+      ).then((data) => {
+        this.loginUserID = data.pd.USER_ID				// 主职角色ID
+      }).catch((e) => {
+
+      })
+    },
     // 判断按钮权限，用于是否显示按钮
     hasButton() {
       var keys = 'hotwork:add,hotwork:del,hotwork:edit,toExcel'
@@ -404,15 +418,15 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          })
           this.listLoading = true
           requestFN(
             '/hotwork/cfd/deleteInFlow', { HOTWORK_ID: row.HOTWORK_ID }
           ).then((data) => {
-            this.$message.error('删除成功')
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            })
+            // this.$message.error('删除成功')
             this.listLoading = false
             this.getList()
           }).catch((e) => {
diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue
index f8ff359..cdc7b26 100644
--- a/src/views/safetyenvironmental/archive/components/info.vue
+++ b/src/views/safetyenvironmental/archive/components/info.vue
@@ -78,7 +78,7 @@
                       <td width="300">
                         <el-button icon="el-icon-view" size="mini" @click="goView(item.HIDDEN_ID)">查看</el-button>
                         <el-button type="success" icon="el-icon-view" size="mini" @click="checkFlow(item)">流程图</el-button>
-                        <el-button v-if="pd.INSPECTION_STATUS == '0' || pd.INSPECTION_STATUS =='2'" type="danger" icon="el-icon-view" size="mini" @click="goDelete(item)">删除</el-button>
+                        <el-button v-if="( pd.INSPECTION_STATUS == '0' && isDeleteDisplay) || ( isDeleteDisplay && pd.INSPECTION_STATUS =='2' )" type="danger" icon="el-icon-view" size="mini" @click="goDelete(item)">删除</el-button>
                       </td>
                     </tr>
                   </tbody>
@@ -219,8 +219,11 @@ export default {
         INSPECTION_STATUS: '', // 状态(0.暂存 1.检查人待确认、2.被检查人待确认、3.归档 -1.检查人异议打回 -2被检查人申辩)
         CREATTIME: '',
         situationList: [''], // 检查情况
-        hiddenList: [] // 隐患信息集合
-      }
+        hiddenList: [], // 隐患信息集合,
+        INSPECTION_USER_ID: '' // 检查人ID数组
+      },
+      isDeleteDisplay: false,
+      loginUserId: JSON.parse(sessionStorage.getItem('user')).USER_ID
     }
   },
   created() {
@@ -251,6 +254,14 @@ export default {
               this.$set(item.hiddenVideos[0], 'IMGFILEPATH', this.findvideocover(item.hiddenVideos[0]))
             }
           })
+          // 判断登录人是否为检查人员,并判断是否能删除
+          if (this.pd.INSPECTION_USER_ID != null && this.pd.INSPECTION_USER_ID != '') {
+            this.pd.INSPECTION_USER_ID.split(',').forEach(item => {
+              if (item == this.loginUserId) {
+                this.isDeleteDisplay = true
+              }
+            })
+          }
           this.listLoading = false
           console.info(this.pd)
           resolve()