|
@@ -11,9 +11,9 @@
|
|
|
<div class="sc-user-select">
|
|
|
<div class="sc-user-select__left">
|
|
|
<div class="sc-user-select__search">
|
|
|
- <el-input v-model="keyword" prefix-icon="el-icon-search" placeholder="搜索成员">
|
|
|
+ <el-input v-model="keyword" prefix-icon="Search" placeholder="搜索成员">
|
|
|
<template #append>
|
|
|
- <el-button icon="el-icon-search" @click="search"></el-button>
|
|
|
+ <el-button icon="Search" @click="search"></el-button>
|
|
|
</template>
|
|
|
</el-input>
|
|
|
</div>
|
|
@@ -68,15 +68,15 @@
|
|
|
</div>
|
|
|
<div class="sc-user-select__selected">
|
|
|
<header>已选 ({{ selected.length }})</header>
|
|
|
- <ul>
|
|
|
+ <ul style="margin: 0; padding: 0">
|
|
|
<el-scrollbar>
|
|
|
<li v-for="(item, index) in selected" :key="item.id">
|
|
|
<span class="name">
|
|
|
- <el-avatar size="small">{{ item.username }}</el-avatar>
|
|
|
- <label>{{ item.username }}</label>
|
|
|
+ <el-avatar size="small">{{ item.name.substring(0, 1) }}</el-avatar>
|
|
|
+ <label>{{ item.name }}</label>
|
|
|
</span>
|
|
|
<span class="delete">
|
|
|
- <el-button type="danger" icon="el-icon-delete" circle size="small" @click="deleteSelected(index)"></el-button>
|
|
|
+ <el-button type="danger" icon="Delete" circle size="small" @click="deleteSelected(index)" />
|
|
|
</span>
|
|
|
</li>
|
|
|
</el-scrollbar>
|
|
@@ -109,18 +109,18 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="sc-user-select__toicon">
|
|
|
- <el-icon><arrow-right /></el-icon>
|
|
|
+ <el-icon><ArrowRight /></el-icon>
|
|
|
</div>
|
|
|
<div class="sc-user-select__selected">
|
|
|
<header>已选 ({{ selected.length }})</header>
|
|
|
- <ul>
|
|
|
+ <ul style="padding: 0; margin: 0">
|
|
|
<el-scrollbar>
|
|
|
<li v-for="(item, index) in selected" :key="item.id">
|
|
|
<span class="name">
|
|
|
- <label>{{ item.username }}</label>
|
|
|
+ <label>{{ item.name }}</label>
|
|
|
</span>
|
|
|
<span class="delete">
|
|
|
- <el-button type="danger" icon="el-icon-delete" circle size="small" @click="deleteSelected(index)"></el-button>
|
|
|
+ <el-button type="danger" icon="Delete" circle size="small" @click="deleteSelected(index)" />
|
|
|
</span>
|
|
|
</li>
|
|
|
</el-scrollbar>
|
|
@@ -140,7 +140,7 @@
|
|
|
import config from '@/config/workflow'
|
|
|
import department from '@/api/system/department'
|
|
|
import user from '@/api/system/user'
|
|
|
-
|
|
|
+import role from '@/api/system/role'
|
|
|
export default {
|
|
|
props: {
|
|
|
modelValue: { type: Boolean, default: false }
|
|
@@ -154,11 +154,11 @@ export default {
|
|
|
},
|
|
|
userProps: {
|
|
|
key: 'id',
|
|
|
- label: 'username'
|
|
|
+ label: 'realName'
|
|
|
},
|
|
|
roleProps: {
|
|
|
key: 'id',
|
|
|
- label: 'label',
|
|
|
+ label: 'name',
|
|
|
children: 'children'
|
|
|
},
|
|
|
|
|
@@ -215,7 +215,7 @@ export default {
|
|
|
var params = {
|
|
|
data: {
|
|
|
keyword: this.keyword || null,
|
|
|
- departmentId: this.groupId || null,
|
|
|
+ departmentId: this.groupId || null
|
|
|
},
|
|
|
page: this.currentPage,
|
|
|
pageSize: this.pageSize
|
|
@@ -229,26 +229,26 @@ export default {
|
|
|
//获取角色
|
|
|
async getRole() {
|
|
|
this.showGrouploading = true
|
|
|
- var res = await config.role.apiObj.get()
|
|
|
+ var res = await role.rolePageApi({ page: 1, pageSize: 999 })
|
|
|
this.showGrouploading = false
|
|
|
- this.role = config.role.parseData(res).rows
|
|
|
+ this.role = res?.records
|
|
|
},
|
|
|
//组织点击
|
|
|
groupClick(data) {
|
|
|
this.keyword = ''
|
|
|
this.currentPage = 1
|
|
|
- this.groupId = data[config.group.props.key]
|
|
|
+ this.groupId = data.id
|
|
|
this.getUser()
|
|
|
},
|
|
|
//用户点击
|
|
|
userClick(data, checked) {
|
|
|
if (checked) {
|
|
|
this.selected.push({
|
|
|
- id: data[config.user.props.key],
|
|
|
- name: data[config.user.props.label]
|
|
|
+ id: data.id,
|
|
|
+ name: data.realName
|
|
|
})
|
|
|
} else {
|
|
|
- this.selected = this.selected.filter(item => item.id != data[config.user.props.key])
|
|
|
+ this.selected = this.selected.filter(item => item.id != data.id)
|
|
|
}
|
|
|
},
|
|
|
//用户分页点击
|
|
@@ -275,11 +275,11 @@ export default {
|
|
|
roleClick(data, checked) {
|
|
|
if (checked) {
|
|
|
this.selected.push({
|
|
|
- id: data[config.role.props.key],
|
|
|
- name: data[config.role.props.label]
|
|
|
+ id: data.id,
|
|
|
+ name: data.name
|
|
|
})
|
|
|
} else {
|
|
|
- this.selected = this.selected.filter(item => item.id != data[config.role.props.key])
|
|
|
+ this.selected = this.selected.filter(item => item.id != data.id)
|
|
|
}
|
|
|
},
|
|
|
//提交保存
|