hookehuyr

fix 优化组织结构现实,成员的信息把他的角色都显示出来

1 <!-- 1 <!--
2 * @Date: 2022-08-29 14:31:20 2 * @Date: 2022-08-29 14:31:20
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-07-30 14:42:11 4 + * @LastEditTime: 2024-07-30 15:50:20
5 * @FilePath: /data-table/src/components/OrgPickerField/MyComponent.vue 5 * @FilePath: /data-table/src/components/OrgPickerField/MyComponent.vue
6 * @Description: 树形组件 6 * @Description: 树形组件
7 --> 7 -->
...@@ -15,7 +15,14 @@ ...@@ -15,7 +15,14 @@
15 <van-icon name="user-o" />&nbsp;{{ role.name }} 15 <van-icon name="user-o" />&nbsp;{{ role.name }}
16 </div> 16 </div>
17 <div class="select-tree-item" v-for="(user) in emitCheckedGroup.user" :key="user.id" @click="clickNode(user)"> 17 <div class="select-tree-item" v-for="(user) in emitCheckedGroup.user" :key="user.id" @click="clickNode(user)">
18 - <van-icon name="contact-o" />&nbsp;{{ user.name }} 18 + <van-icon name="contact-o" />&nbsp;
19 + <span>{{ user.name }}</span>
20 + <span v-if="user?.role_list?.length">/
21 + <span v-for="(role, index) in user?.role_list" :key="role.id">
22 + {{ role.name }}
23 + <span v-if="index !== (user?.role_list?.length - 1)">,</span>
24 + </span>
25 + </span>
19 </div> 26 </div>
20 </div> 27 </div>
21 28
...@@ -50,7 +57,14 @@ ...@@ -50,7 +57,14 @@
50 {{ role.name }}&nbsp;<van-icon @click="onRemoveRoleTag(role)" name="close" /> 57 {{ role.name }}&nbsp;<van-icon @click="onRemoveRoleTag(role)" name="close" />
51 </div> 58 </div>
52 <div class="select-item" v-for="(user) in checkedGroup.user" :key="user.id"> 59 <div class="select-item" v-for="(user) in checkedGroup.user" :key="user.id">
53 - {{ user.name }}&nbsp;<van-icon @click="onRemoveUserTag(user)" name="close" /> 60 + <span>{{ user.name }}</span>
61 + <span v-if="user?.role_list?.length">/
62 + <span v-for="(role, index) in user?.role_list" :key="role.id">
63 + {{ role.name }}
64 + <span v-if="index !== (user?.role_list?.length - 1)">,</span>
65 + </span>
66 + </span>
67 + &nbsp;<van-icon @click="onRemoveUserTag(user)" name="close" />
54 </div> 68 </div>
55 </div> 69 </div>
56 70
...@@ -590,7 +604,8 @@ const onCheckUserChange = (val, evt) => { ...@@ -590,7 +604,8 @@ const onCheckUserChange = (val, evt) => {
590 let obj = { 604 let obj = {
591 id: +id, 605 id: +id,
592 name, 606 name,
593 - type 607 + type,
608 + role_list: val?.role_list?.length ? val?.role_list : []
594 } 609 }
595 checkedGroup.value.user.push(obj); 610 checkedGroup.value.user.push(obj);
596 checkedGroup.value.user = _.uniqBy(checkedGroup.value.user, 'id'); 611 checkedGroup.value.user = _.uniqBy(checkedGroup.value.user, 'id');
......