Commit 31fd7459 authored by jingnan's avatar jingnan 👀

合并产品【10495】在团队管理中,增加人员组织列,显示人员单位<2> 两版都已合并

parent 301e7ed8
...@@ -201,6 +201,15 @@ export default { ...@@ -201,6 +201,15 @@ export default {
}, },
tableColums: [ tableColums: [
{ title: '角色/用户', key: 'name', align: 'center' }, { title: '角色/用户', key: 'name', align: 'center' },
{ title: '用户单位', key: 'dxOrganization', align: 'left',
formatter: (row, column) => {
if (row.isUser) {
return this.$utils._get(row, 'dxOrganization.fullPath') || this.$utils._get(row, 'dxOrganization.name') || '/'
} else {
return '/'
}
}
},
{ title: '操作', key: 'operator', align: 'center', component: { { title: '操作', key: 'operator', align: 'center', component: {
show: true, show: true,
name: 'EditTableRow', name: 'EditTableRow',
...@@ -330,6 +339,13 @@ export default { ...@@ -330,6 +339,13 @@ export default {
'sortOrder': 'desc' 'sortOrder': 'desc'
} }
], ],
'openProps': [
{
'name': 'dxOrganization',
'pageFrom': 1,
'pageSize': 9999
}
],
'searchItems': { 'searchItems': {
'operator': 'AND', 'operator': 'AND',
'items': [], 'items': [],
...@@ -357,7 +373,8 @@ export default { ...@@ -357,7 +373,8 @@ export default {
tel: item.telephone, tel: item.telephone,
isUser: true, isUser: true,
id: data.dxContextTeamMembers.find(i => i.userId === item.id).id, id: data.dxContextTeamMembers.find(i => i.userId === item.id).id,
teamRoleCode: data.teamRoleCode teamRoleCode: data.teamRoleCode,
dxOrganization: item.dxOrganization
}) })
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment