From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/operation/danger/record.vue | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index f1161d1..fd838ff 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -19,6 +19,12 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="妫�鏌ョ被鍨�" prop="cateId">
+ <el-select v-model="searchForm.checkTypeId" placeholder="璇烽�夋嫨妫�鏌ョ被鍨�" clearable @change="search">
+ <el-option v-for="item in checkTypeList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="闅愭偅绫诲瀷" prop="cateId">
<el-select v-model="searchForm.cateId" placeholder="璇烽�夋嫨闅愭偅绫诲瀷" clearable @change="search">
<el-option v-for="item in cateList" :key="item.id" :label="item.name" :value="item.id">
@@ -33,10 +39,14 @@
</el-select>
</el-form-item>
<el-form-item label="鎻愭姤鏃堕棿" prop="startTime">
- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
+ <!-- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" 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="缁撴潫鏃ユ湡">
- </el-date-picker>
+ </el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.queryStartTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.queryEndTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -56,23 +66,28 @@
<li><el-button type="primary" v-permissions="['business:hiddendanger:exportExcel']"
@click="handleEx">瀵煎嚭</el-button></li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table v-loading="isWorking.search" :data="tableData.list" :height="tableHeightNew" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="checkTypeName" show-overflow-tooltip label="妫�鏌ョ被鍨�" min-width="150px"></el-table-column>
+ <el-table-column prop="submitTime" label="鎻愭姤鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="dutyCompanyName" show-overflow-tooltip label="璐ｄ换閮ㄩ棬" min-width="150px"></el-table-column>
<el-table-column prop="areaName" label="闅愭偅鍖哄煙" show-overflow-tooltip min-width="150px"></el-table-column>
<el-table-column prop="categoryName" label="闅愭偅绫诲瀷" min-width="150px"></el-table-column>
- <el-table-column prop="memberName" label="鎻愭姤浜�" min-width="80px"></el-table-column>
- <el-table-column prop="companyName" show-overflow-tooltip label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
- <el-table-column prop="createDate" label="鎻愭姤鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column label="澶勭悊缁撴灉" min-width="100px">
+ <el-table-column prop="content" label="闂鎻忚堪" min-width="150px"></el-table-column>
+ <el-table-column prop="dealTime" label="鏁存敼鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column label="鏁存敼缁撴灉" min-width="100px">
<template slot-scope="{row}">
<span class="status-blue" v-if="row.status === 0">寰呭鐞�</span>
<span class="status-green" v-if="row.status === 1">宸插鐞�</span>
<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 label="鎿嶄綔" min-width="180" fixed="right">
+ <el-table-column prop="memberName" label="鎻愭姤浜哄鍚�" min-width="100px"></el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ min-width="180"
+ fixed="right"
+ >
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit"
@click="$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�', row)">鏌ョ湅璇︽儏</el-button>
@@ -112,10 +127,12 @@
queryStartTime: '',
queryEndTime: '',
areaId: null,
+ checkTypeId: null,
cateId: null,
status: null,
radio: 0
},
+ checkTypeList: [],
cateList: [],
areaList: [],
time: []
@@ -161,15 +178,19 @@
if (e === '0') {
this.searchForm.queryStartTime = timeForMat(0)[0]
this.searchForm.queryEndTime = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.queryStartTime = timeForMat(6)[0]
this.searchForm.queryEndTime = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.queryStartTime = timeForMat(29)[0]
this.searchForm.queryEndTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.queryStartTime && this.searchForm.queryEndTime && new Date(this.searchForm.queryStartTime).getTime() > new Date(this.searchForm.queryEndTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.queryStartTime = ''
+ return
}
this.search()
},
@@ -185,6 +206,9 @@
if (item && item.type != null && item.type === 1) {
this.cateList.push(item)
}
+ if (item && item.type != null && item.type === 2) {
+ this.checkTypeList.push(item)
+ }
})
}
})
--
Gitblit v1.9.3