From ff087240b3dee29ce4e14ad0836e76b9fdf312cf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/lianhelihua_sh
---
admin/src/views/business/managersShe.vue | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/business/managersShe.vue b/admin/src/views/business/managersShe.vue
index fedbdd7..d36d96a 100644
--- a/admin/src/views/business/managersShe.vue
+++ b/admin/src/views/business/managersShe.vue
@@ -1,24 +1,25 @@
<template>
<TableLayout :permissions="['business:managers:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <SearchFormCollapse slot="search-form">
+ <div slot="search-form">
<el-form ref="searchForm" :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-form-item label="浜哄憳鎼滅储 " prop="keyword">
+ <el-input v-model="searchForm.keyword" 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>
</section>
</el-form>
- </SearchFormCollapse>
+ </div>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:managers:create', 'business:managers:delete']">
- <li><el-button type="primary" @click="$refs.operaManagersWindow.open('鏂板缓璐ｄ换浜轰俊鎭〃')" icon="el-icon-plus" v-permissions="['business:managers:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:managers:delete']">鍒犻櫎</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaManagersWindow.open('鏂板缓SHE璐ｄ换浜�',{type:0})" icon="el-icon-plus" v-permissions="['business:managers:create']">鏂板缓</el-button></li>
+ <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:managers:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
@@ -26,9 +27,11 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="memberName" label="浜哄憳濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="memberEmail" label="浜哄憳閭" min-width="100px"> </el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="150px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:managers:update', 'business:managers:delete'])"
@@ -37,8 +40,10 @@
fixed="right"
>
<template slot-scope="{row}">
+<!--
<el-button type="text" @click="$refs.operaManagersWindow.open('缂栬緫璐ｄ换浜轰俊鎭〃', row)" icon="el-icon-edit" v-permissions="['business:managers:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:managers:delete']">鍒犻櫎</el-button>
+-->
+ <el-button type="text" style="color: red" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:managers:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -57,25 +62,24 @@
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
-import SearchFormCollapse from '@/components/common/SearchFormCollapse'
import Pagination from '@/components/common/Pagination'
import OperaManagersWindow from '@/components/business/OperaManagersWindow'
export default {
name: 'Managers',
extends: BaseTable,
- components: { SearchFormCollapse, TableLayout, Pagination, OperaManagersWindow },
+ components: { TableLayout, Pagination, OperaManagersWindow },
data () {
return {
// 鎼滅储
searchForm: {
- memberName: '',
+ keyword: '',
type: 0
}
}
},
created () {
this.config({
- module: '璐ｄ换浜轰俊鎭〃',
+ module: 'SHE璐ｄ换浜轰俊鎭�',
api: '/business/managers',
'field.id': 'id',
'field.main': 'id'
--
Gitblit v1.9.3