From 908ce43ff21c2068ef5148b0a417423c8ed9eae5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 16:37:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/operation/danger/areaSet.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/operation/danger/areaSet.vue b/admin/src/views/operation/danger/areaSet.vue
index 6505acb..1d4c384 100644
--- a/admin/src/views/operation/danger/areaSet.vue
+++ b/admin/src/views/operation/danger/areaSet.vue
@@ -5,6 +5,9 @@
<el-form-item label="闅愭偅鍖哄煙" prop="name">
<el-input v-model="searchForm.name" clearable placeholder="璇疯緭鍏ラ殣鎮ｅ尯鍩�" @keypress.enter.native="search"></el-input>
</el-form-item>
+ <el-form-item label="璐ｄ换閮ㄩ棬" prop="companyName">
+ <el-input v-model="searchForm.companyName" clearable placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -17,20 +20,22 @@
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:hiddendangerparam:delete']">鎵归噺鍒犻櫎</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="闅愭偅鍖哄煙" min-width="200px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="memberNames" label="瀹夊叏鍛�" min-width="200px"></el-table-column>
- <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="200px"></el-table-column>
+ <el-table-column prop="name" show-overflow-tooltip label="闅愭偅鍖哄煙" min-width="120px"></el-table-column>
+ <el-table-column prop="companyName" show-overflow-tooltip label="璐ｄ换閮ㄩ棬" min-width="120px"></el-table-column>
+ <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="70px"></el-table-column>
+ <el-table-column prop="memberNames" show-overflow-tooltip label="瀹夊叏鍛�" min-width="80px"></el-table-column>
+ <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" width="160px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:hiddendangerparam:update', 'business:hiddendangerparam:delete' ])"
label="鎿嶄綔"
- min-width="250"
+ min-width="140"
fixed="right"
>
<template slot-scope="{row}">
--
Gitblit v1.9.3