From c88fe3ea9fd8bd1ea556b4769a1a0cd6c9b5661d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 11:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/operation/danger/record.vue | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index 5bb852b..5c45c1b 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -65,6 +65,7 @@
<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="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" show-overflow-tooltip label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
<el-table-column prop="createDate" label="鎻愭姤鏃堕棿" min-width="150px"></el-table-column>
@@ -77,6 +78,15 @@
</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="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="180"
+ fixed="right"
+ >
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit"
@click="$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�', row)">鏌ョ湅璇︽儏</el-button>
--
Gitblit v1.9.3