From ef1eb7fe0be9f51d2e0efed07ad93e2557759d6a Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Wed, 3 Apr 2024 09:31:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=AE=A1=E7=90=86=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=9B=BD=E6=A0=87=E7=BC=96=E5=8F=B7=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=EF=BC=8C=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork/hotwork_list/components/list.vue  |  2 +-
 .../hotwork_list/components/list_cfd.vue      | 24 +++++++++++++++++++
 .../videoinfomanager/components/list.vue      |  4 +++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue
index 42a043b..fdb2df3 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue
@@ -74,7 +74,7 @@
       <el-table-column label="操作" align="center" width="230" >
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID)">查看</el-button>
-          <el-button v-if="loginUserId == '1'" type="danger" icon="el-icon-delete" size="mini" @click="goDelete(row.HOTWORKAPPLICATION_ID)">删除</el-button>
+          <el-button v-if="(loginUserId == '1' || loginUserId == row.APPLY_USER_ID) && row.STATE != 11" type="danger" icon="el-icon-delete" size="mini" @click="goDelete(row.HOTWORKAPPLICATION_ID)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
index 84cc83a..1612a84 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
@@ -92,6 +92,7 @@
       <el-table-column label="操作" align="center" width="230">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORK_ID)">查看</el-button>
+          <el-button v-if="(loginUserId == '1' || loginUserId == row.APPLY_USER_ID) && row.STATE != 11" type="danger" icon="el-icon-delete" size="mini" @click="goDelete(row.HOTWORK_ID)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -102,6 +103,7 @@
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
+    <div style="height: 50px"/>
   </div>
 </template>
 <script>
@@ -319,6 +321,28 @@ export default {
     goDetail(id) {
       this.$parent.activeName = 'DetailCfd'
       this.$parent.HOTWORK_ID = id
+    },
+    goDelete(id) {
+      this.$confirm('确认删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/dangerousWork/hotwork/delete',
+          {
+            HOTWORK_ID: id
+          }
+        ).then((data) => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
     }
   }
 }
diff --git a/src/views/keyprojects/videoinfomanager/components/list.vue b/src/views/keyprojects/videoinfomanager/components/list.vue
index 8027329..a6b3f27 100644
--- a/src/views/keyprojects/videoinfomanager/components/list.vue
+++ b/src/views/keyprojects/videoinfomanager/components/list.vue
@@ -511,6 +511,7 @@ export default {
       this.addForm.info.PERSON = row.PERSON
       this.addForm.info.REMAKE = row.REMAKE
       this.addForm.info.CORPINFO_ID = row.CORPINFO_ID
+      this.addForm.info.NATIONAL_STANDARD_ID = row.NATIONAL_STANDARD_ID
       this.addForm.dialogType = 'edit'
       this.addForm.dialogVisible = true
     },
@@ -594,7 +595,8 @@ export default {
         REMAKE: '', // 在线情况
         PHONE: '', // 手机号码
         PERSON: '', // 负责人
-        CORPINFO_ID: '' // 企业ID
+        CORPINFO_ID: '', // 企业ID
+        NATIONAL_STANDARD_ID: '' // 设备国标编号
       }
     },
     // 搜索