From 10c28ce3d0b384584c77ce9111a66a0641250752 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 二月 2025 18:30:32 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/operation/danger/record.vue |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index da410d6..c4a4062 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -3,10 +3,13 @@
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
       <el-form-item label="鎻愭姤浜�" prop="memberName">
-        <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+        <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�" @keypress.enter.native="search"></el-input>
       </el-form-item>
       <el-form-item label="鎻愭姤浜虹粍缁�" prop="companyName">
         <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" clearable @keypress.enter.native="search"></el-input>
+      </el-form-item>
+      <el-form-item label="璐d换閮ㄩ棬" prop="dutyCompanyName">
+        <el-input v-model="searchForm.dutyCompanyName" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�" clearable @keypress.enter.native="search"></el-input>
       </el-form-item>
       <el-form-item label="闅愭偅鍖哄煙" prop="areaId">
         <el-select v-model="searchForm.areaId" placeholder="璇烽�夋嫨闅愭偅鍖哄煙" clearable  @change="search">
@@ -43,6 +46,7 @@
             type="datetimerange"
             format="yyyy-MM-dd HH:mm:ss"
             value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']"
             range-separator="鑷�"
             start-placeholder="寮�濮嬫棩鏈�"
             end-placeholder="缁撴潫鏃ユ湡">
@@ -71,8 +75,10 @@
           @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column prop="dutyCompanyName" label="璐d换閮ㄩ棬" min-width="150px"></el-table-column>
         <el-table-column prop="areaName" label="闅愭偅鍖哄煙" min-width="150px"></el-table-column>
         <el-table-column prop="categoryName" label="闅愭偅绫诲瀷" min-width="150px"></el-table-column>
+        <el-table-column prop="content" label="闂鎻忚堪" min-width="150px"></el-table-column>
         <el-table-column prop="memberName" label="鎻愭姤浜�" min-width="80px"></el-table-column>
         <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
         <el-table-column prop="createDate" label="鎻愭姤鏃堕棿" min-width="150px"></el-table-column>
@@ -83,14 +89,18 @@
             <span class="status-red"   v-if="row.status === 2">宸查��鍥�</span>
           </template>
         </el-table-column>
-        <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
+        <el-table-column prop="dealTime" label="澶勭悊鏃堕棿" min-width="150px"></el-table-column>
+<!--
+        <el-table-column prop="editDate" label="鏈�杩戞搷浣滄椂闂�" min-width="150px"></el-table-column>
+-->
         <el-table-column
             label="鎿嶄綔"
-            min-width="100"
+            min-width="180"
             fixed="right"
         >
           <template slot-scope="{row}">
             <el-button type="text" icon="el-icon-edit" @click="$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�',row)" >鏌ョ湅璇︽儏</el-button>
+            <el-button  type="text"  icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:hiddendanger:delete']">鍒犻櫎</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -155,15 +165,12 @@
         .then(() => {
           this.exLoading = true
           exportExcel({
-            page: this.pagination.page,
-            capacity: 1000000,
-            model: this.filters
+            model: this.searchForm
           })
             .then(response => {
               this.download(response)
             })
             .catch(e => {
-              this.$tip.apiFailed(e)
             })
             .finally(() => {
               this.exLoading = false

--
Gitblit v1.9.3