From c8b32b8bca79a116cfab70eb8c389907b664c9ca Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 23 四月 2025 10:43:14 +0800
Subject: [PATCH] 提交
---
admin/src/views/business/companyMember.vue | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/business/companyMember.vue b/admin/src/views/business/companyMember.vue
index 3b135f6..1280bff 100644
--- a/admin/src/views/business/companyMember.vue
+++ b/admin/src/views/business/companyMember.vue
@@ -16,8 +16,8 @@
<div
style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
浼佷笟缁勭粐</div>
- <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
- <Tree :list="companyTree" :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
+ <div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
+ <Tree :list="companyTree" :alllist="companyTree" :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
@callback="callback" />
</div>
</template>
@@ -30,8 +30,10 @@
@change="search">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
</li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55"></el-table-column>
+ <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+<!-- <el-table-column prop="index" label="搴忓彿" width="55" fixed="left">
+ <template slot-scope="scope">{{ scope.$index+1}}</template>
+ </el-table-column>-->
<el-table-column fixed="left" prop="name" label="濮撳悕" min-width="80px">
<template slot-scope="{row}">
<span>{{ row.name }}</span>
@@ -42,16 +44,29 @@
<template slot-scope="{row}">
<span v-if="row.sex == '1'">鐢�</span>
<span v-else-if="row.sex == '2' ">濂�</span>
- <span v-else>濂�</span>
+ <span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="email" label="閭" min-width="100px"></el-table-column>
- <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="150px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="150px">
+ <template slot-scope="{row}">
+ <div v-if="row.companyNameList && row.companyNameList.length">
+ <div v-for="item in row.companyNameList" :key="item.id" style="display: block;margin-right: 20px">{{item}}
+ </div>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
+ <el-table-column fixed="right" v-if="containPermissions(['business:member:update'])" label="鎿嶄綔" min-width="100">
+ <template slot-scope="{row}">
+ <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row)" v-permissions="['business:member:update']">缂栬緫</el-button>
+ </template>
+ </el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
+ <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
</template>
</TableLayout1>
</template>
@@ -61,12 +76,13 @@
import TableLayout1 from '@/layouts/TableLayout1'
import Pagination from '@/components/common/Pagination'
import Tree from '@/components/common/Tree'
+import OperaMemberWindow from '@/components/business/OperaMemberWindow'
import { treeList } from '@/api/business/company'
import { memberSync} from '@/api/business/member'
export default {
name: 'internalMember',
extends: BaseTable,
- components: { TableLayout1, Pagination, Tree },
+ components: { TableLayout1, Pagination, Tree,OperaMemberWindow },
data() {
return {
TreeList: [],
@@ -93,7 +109,6 @@
})
// this.search()
this.getfindCompanyTreePage()
- this.getPositionList()
},
methods: {
// 鑾峰彇缁勭粐鏍�
--
Gitblit v1.9.3