|
@@ -99,10 +99,18 @@ async function initAllUser() {
|
|
|
let data = await userList(obj);
|
|
|
memberTotal.value = parseInt(data.total_rows);
|
|
|
data.page_data.map((item) => {
|
|
|
- if (item.user_phone != "") {
|
|
|
- item.user_realname_phone = item.user_realname + "(" + item.user_phone + ")";
|
|
|
+ if (item.user_dept != "") {
|
|
|
+ if (item.user_phone != "") {
|
|
|
+ item.user_realname_phone = item.user_realname + "(" + item.user_dept + "," + item.user_phone + ")";
|
|
|
+ } else {
|
|
|
+ item.user_realname_phone = item.user_realname + "(" + item.user_dept + ")";
|
|
|
+ }
|
|
|
} else {
|
|
|
- item.user_realname_phone = item.user_realname;
|
|
|
+ if (item.user_phone != "") {
|
|
|
+ item.user_realname_phone = item.user_realname + "(" + item.user_phone + ")";
|
|
|
+ } else {
|
|
|
+ item.user_realname_phone = item.user_realname;
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
userData.value = data.page_data;
|
|
@@ -114,6 +122,13 @@ const handleMemberChange = (val) => {
|
|
|
}
|
|
|
|
|
|
|
|
|
+function addHover(e) {
|
|
|
+ const target = e.target;
|
|
|
+ if (target.title) return
|
|
|
+ target.title = target.innerText;
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
queryPermission();
|
|
|
async function queryPermission() {
|
|
|
let obj = {
|
|
@@ -487,7 +502,7 @@ const handlePermissionChange = async (data) => {
|
|
|
<el-input v-model="keyword" clearable @clear="initAllUser" style="width: 300px;margin-right: 10px;"></el-input>
|
|
|
<el-button type="primary" @click="initAllUser">搜索</el-button>
|
|
|
</div>
|
|
|
- <el-transfer v-model="memberValue" :props="{ key: 'user_id', label: 'user_realname_phone' }" :titles="['全部', '全部']" :data="userData">
|
|
|
+ <el-transfer v-model="memberValue" @mouseover="addHover" :props="{ key: 'user_id', label: 'user_realname_phone' }" :titles="['全部', '全部']" :data="userData">
|
|
|
<template #left-footer>
|
|
|
<el-pagination background layout="prev, pager, next" :pager-count="5" :total="memberTotal" @current-change="handleMemberChange" :page-size="memberLimit" :currentPage="memberCurrentPage"></el-pagination>
|
|
|
</template>
|