|
@@ -65,12 +65,11 @@
|
|
|
<span>{{ user.info.name }}</span>
|
|
<span>{{ user.info.name }}</span>
|
|
|
|
|
|
|
|
<el-tooltip class="item" effect="dark" placement="top-start">
|
|
<el-tooltip class="item" effect="dark" placement="top-start">
|
|
|
- <div slot="content">{{ user.info.groupNameList && user.info.groupNameList.join('/') }}</div>
|
|
|
|
|
- <span>{{ user.info.groupName }}</span>
|
|
|
|
|
|
|
+ <span>{{ getRoleName( user.info.loginChangeGroupVOList,1) }}</span>
|
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
|
|
|
|
|
|
|
|
|
|
|
- <span>{{ getRoleName( user.info.loginChangeGroupVOList)}}</span>
|
|
|
|
|
|
|
+ <span>{{ getRoleName( user.info.loginChangeGroupVOList,2)}}</span>
|
|
|
|
|
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -395,8 +394,14 @@
|
|
|
computed: {
|
|
computed: {
|
|
|
...mapGetters(['user']),
|
|
...mapGetters(['user']),
|
|
|
getRoleName(){
|
|
getRoleName(){
|
|
|
- return (list=[])=>{
|
|
|
|
|
- return list.map(item=>item.loginChangeRoleVOList.map(i=>i.roleName))?.join('/') || '';
|
|
|
|
|
|
|
+ const currentUser=JSON.parse(sessionStorage['currentUser'])
|
|
|
|
|
+ return (list=[],type)=>{
|
|
|
|
|
+ const dept= list.find(item=>item.groupId==currentUser.currentGroupId)
|
|
|
|
|
+ if(type==1){
|
|
|
|
|
+ return dept.groupName
|
|
|
|
|
+ }else{
|
|
|
|
|
+ return dept.loginChangeRoleVOList.find(item=>item.roleId==currentUser.currentRoleId)?.roleName
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|