Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivManage
Commits
c57480b4
Commit
c57480b4
authored
Feb 28, 2023
by
涂伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '机构管理列表操作按钮分类样式优化'
parent
9423132b
Pipeline
#68148
passed with stages
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
92 additions
and
37 deletions
+92
-37
UserManage.jsx
src/pages/userCenter/userManage/UserManage.jsx
+92
-37
No files found.
src/pages/userCenter/userManage/UserManage.jsx
View file @
c57480b4
...
...
@@ -226,47 +226,102 @@ const UserManage = () => {
return
<
span
>
未绑定
</
span
>;
},
},
// {
// title: '钉钉账户',
// dataIndex: 'ddid',
// key: 'ddid',
// // width: 150,
// render: record => {
// if (record) {
// return (
// <Tooltip title={record}>
// <span style={{ color: '#50aefc', cursor: 'pointer' }}>已绑定</span>
// </Tooltip>
// );
// }
// return <span>未绑定</span>;
// },
// },
// {
// title: '微信账户',
// dataIndex: 'wxid',
// key: 'wxid',
// // width: 140,
// render: record => {
// if (record) {
// return (
// <Tooltip title={record}>
// <span style={{ color: '#50aefc', cursor: 'pointer' }}>已绑定</span>
// </Tooltip>
// );
// }
// return <span>未绑定</span>;
// },
// },
{
title
:
'钉钉账户'
,
dataIndex
:
'ddid'
,
key
:
'ddid'
,
// width: 150,
render
:
record
=>
{
if
(
record
)
{
return
(
<
Tooltip
title=
{
record
}
>
<
span
style=
{
{
color
:
'#50aefc'
,
cursor
:
'pointer'
}
}
>
已绑定
</
span
>
</
Tooltip
>
);
}
return
<
span
>
未绑定
</
span
>;
},
},
{
title
:
'微信账户'
,
dataIndex
:
'wxid'
,
key
:
'wxid'
,
// width: 140,
render
:
record
=>
{
if
(
record
)
{
return
(
<
Tooltip
title=
{
record
}
>
<
span
style=
{
{
color
:
'#50aefc'
,
cursor
:
'pointer'
}
}
>
已绑定
</
span
>
</
Tooltip
>
);
}
return
<
span
>
未绑定
</
span
>;
},
title
:
'权限设置'
,
key
:
'action'
,
// fixed: 'right',
width
:
150
,
align
:
'center'
,
render
:
record
=>
(
<
Space
size=
"middle"
>
<
Tooltip
title=
"关联权限"
>
<
IdcardOutlined
onClick=
{
()
=>
relateRole
(
record
)
}
style=
{
{
fontSize
:
'16px'
,
color
:
'#1890FF'
}
}
/>
</
Tooltip
>
<
Tooltip
title=
"更改机构"
>
<
ApartmentOutlined
onClick=
{
()
=>
changeOrg
(
record
)
}
style=
{
{
fontSize
:
'16px'
,
color
:
'#1890FF'
}
}
/>
</
Tooltip
>
<
Tooltip
title=
"设置为主管"
>
<
Popconfirm
placement=
"bottomRight"
title=
{
<
p
>
确定将用户
<
span
className=
{
styles
.
redText
}
>
{
voca
.
stripTags
(
record
.
loginName
)
}
</
span
>
设置为
{
orgTitle
}
主管吗?
</
p
>
}
okText=
"确认"
cancelText=
"取消"
onConfirm=
{
()
=>
{
console
.
log
(
groupId
,
'groupId'
);
SetGroupManager
({
groupId
,
userId
:
record
.
userId
}).
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
// eslint-disable-next-line no-unused-expressions
currentSelectOrg
===
'-1'
?
submitSearchUser
()
:
onSelect
([
currentSelectOrg
]);
}
else
{
notification
.
error
({
message
:
'设置失败'
,
description
:
res
.
msg
,
});
}
});
}
}
>
<
UserOutlined
style=
{
{
fontSize
:
'16px'
,
color
:
record
.
isManager
?
'#FAAD14'
:
'#1890FF'
}
}
/>
</
Popconfirm
>
</
Tooltip
>
</
Space
>
),
},
{
title
:
'操作'
,
key
:
'action'
,
// fixed: 'right',
// width: 2
00,
width
:
1
00
,
align
:
'center'
,
render
:
record
=>
(
<
Space
size=
"middle"
>
<
Tooltip
title=
"关联权限"
>
{
/*
<Tooltip title="关联权限">
<IdcardOutlined
onClick={() => relateRole(record)}
style={{ fontSize: '16px', color: '#1890FF' }}
...
...
@@ -309,7 +364,7 @@ const UserManage = () => {
style={{ fontSize: '16px', color: record.isManager ? '#FAAD14' : '#1890FF' }}
/>
</Popconfirm>
</
Tooltip
>
</Tooltip>
*/
}
{
/* <Tooltip title="修改密码">
<UnlockOutlined
onClick={() => changePassword(record)}
...
...
@@ -772,12 +827,12 @@ const UserManage = () => {
if
(
currentSelectOrg
!==
props
[
0
])
{
setPageSize
(
20
);
setCurrentPage
(
1
);
sizedata
=
size
?
size
:
20
;
currentData
=
index
?
index
:
1
;
sizedata
=
size
||
20
;
currentData
=
index
||
1
;
}
else
{
// 分页查询
sizedata
=
size
?
size
:
pageSize
;
currentData
=
index
?
index
:
currentPage
;
sizedata
=
size
||
pageSize
;
currentData
=
index
||
currentPage
;
}
getOneOUUserListNew
(
props
[
0
]
||
currentSelectOrg
,
sizedata
,
currentData
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment