From 2fb9b6209fd268f3a34ea7f8dc7e368195fce3f2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 11 五月 2024 18:54:52 +0800
Subject: [PATCH] 最新版本
---
admin/src/views/business/internalMember.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 15 deletions(-)
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index e776e64..19184f5 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -39,15 +39,18 @@
<template v-slot:menu>
<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: 'status', children: 'childList', id: 'id',erpId:'erpId'}" @callback="callback" />
+ <Tree :list="companyTree" :defaultProps="{name: 'name', status: 'fsStatus', children: 'childList', id: 'id'}" @callback="callback" />
</div>
</template>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:delete','business:member:sync']">
+ <ul class="toolbar" v-permissions="['business:member:delete','business:member:create']">
<!-- <li><el-button type="primary">闂ㄧ鎺堟潈</el-button></li>-->
+<!--
<li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button></li>
+-->
+ <li><el-button type="primary" @click="$refs.OperaMemberWindow.open('鏂板缓鍛樺伐',null,department)" icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
+ <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -58,6 +61,7 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="idcardDecode" label="韬唤璇佸彿" min-width="100px"></el-table-column>
<el-table-column label="鎬у埆" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.sex == 1">鐢�</span>
@@ -95,10 +99,10 @@
<el-table-column fixed="right" label="浜鸿劯淇℃伅" min-width="100px">
<template slot-scope="{row}">
<el-image
- v-if="row.faceImg"
+ v-if="row.faceImgFull"
style="width: 60px; height: 60px"
- :src="row.faceImg"
- :preview-src-list="[row.faceImg]">
+ :src="row.faceImgFull"
+ :preview-src-list="[row.faceImgFull]">
</el-image>
</template>
</el-table-column>
@@ -108,13 +112,15 @@
</template>
</el-table-column>
<el-table-column
- v-if="containPermissions(['business:member:update', 'business:member:delete'])"
+ v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
label="鎿嶄綔"
min-width="120"
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
+ <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅',row,department)" v-permissions="['business:empower:update']">缂栬緫</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
+ <el-button type="text" icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
</template>
</el-table-column>
</el-table>
@@ -126,6 +132,7 @@
</pagination>
<!-- 鏌ョ湅浜哄憳寮�鍗¤褰� -->
<cardOpeningRecord ref="cardOpeningRecord" @success="handlePageChange" />
+ <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
</template>
</TableLayout1>
</template>
@@ -136,12 +143,13 @@
import Pagination from '@/components/common/Pagination'
import cardOpeningRecord from '@/components/business/cardOpeningRecord'
import Tree from '@/components/common/Tree'
+import OperaMemberWindow from '@/components/business/OperaMemberWindow'
import { fetchList } from '@/api/business/company'
import { memberSync, roleAuth } from '@/api/business/member'
export default {
name: 'internalMember',
extends: BaseTable,
- components: { TableLayout1, Pagination, Tree, cardOpeningRecord },
+ components: { TableLayout1, Pagination, Tree, cardOpeningRecord,OperaMemberWindow },
data () {
return {
TreeList: [],
@@ -158,7 +166,8 @@
hasFace: ''
},
loading:false,
- companyTree: []
+ companyTree: [],
+ department:[]
}
},
created () {
@@ -191,15 +200,35 @@
getfindCompanyTreePage () {
fetchList(1)
.then(res => {
- res[0].fsStatus = 1
- this.companyTree = res
- // this.searchForm.erpOrgId = res[0].erpId
- this.search()
+ if (res && res.length > 0) {
+ res[0].fsStatus = 1
+ this.companyTree = res
+ // this.searchForm.erpOrgId = res[0].erpId
+ this.search()
+ this.department = this.getDepartmentTree(res)
+ }
})
+ },
+ getDepartmentTree(tree) {
+ if(tree ==null){
+ return []
+ }
+ return tree.map(item => {
+ let newItem = {...item}
+ if(newItem){
+ newItem.children=newItem.childList
+ }
+ if (item.children && item.children.length == 0) {
+ this.$delete( newItem, 'children' )
+ } else {
+ newItem.children = this.getDepartmentTree(newItem.children)
+ }
+ return newItem
+ });
},
// 鍚屾淇℃伅
async synchronous () {
- this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
+ this.$dialog.actionConfirm('璇ユ搷浣滈檷瑙﹀彂鍏ㄥ憳淇℃伅鏇存柊鍜岄噸鏂颁笅鍙戯紒璇疯皑鎱庢搷浣�', '鎮ㄧ‘璁ゅ叏閲忓悓姝ュ唴閮ㄤ汉鍛樹俊鎭悧锛�')
.then(() => {
this.loading = true
memberSync({})
--
Gitblit v1.9.3