Commit 4fa7c8e8 authored by 陈前坚's avatar 陈前坚

perf: serviceLog

parent 70cc8739
This diff is collapsed.
...@@ -81,7 +81,7 @@ const UserManage = () => { ...@@ -81,7 +81,7 @@ const UserManage = () => {
const [addOrgVisible, setAddOrgVisible] = useState(false); // 添加机构 const [addOrgVisible, setAddOrgVisible] = useState(false); // 添加机构
const [editOrgVisible, setEditOrgVisible] = useState(false); // 编辑机构 const [editOrgVisible, setEditOrgVisible] = useState(false); // 编辑机构
const [deleteOrgVisible, setDeleteOrgVisible] = useState(false); // 删除机构 const [deleteOrgVisible, setDeleteOrgVisible] = useState(false); // 删除机构
const [roleVisible, setRoleVisible] = useState(false); // 用户关联 const [roleVisible, setRoleVisible] = useState(false); // 关联角色
const [changeOrgVisible, setChangeOrgVisible] = useState(false); // 更改机构 const [changeOrgVisible, setChangeOrgVisible] = useState(false); // 更改机构
const [passwordVisible, setPasswordVisible] = useState(false); // 修改密码 const [passwordVisible, setPasswordVisible] = useState(false); // 修改密码
const [editUserVisible, setEditUserVisible] = useState(false); // 编辑用户 const [editUserVisible, setEditUserVisible] = useState(false); // 编辑用户
...@@ -466,7 +466,7 @@ const UserManage = () => { ...@@ -466,7 +466,7 @@ const UserManage = () => {
}, [currentUser]); }, [currentUser]);
/** ***用户批量操作****** */ /** ***用户批量操作****** */
// 用户关联 // 关联角色
const relateRoles = () => { const relateRoles = () => {
getEmptyRoleList(); getEmptyRoleList();
setRoleVisible(true); setRoleVisible(true);
...@@ -484,7 +484,7 @@ const UserManage = () => { ...@@ -484,7 +484,7 @@ const UserManage = () => {
}; };
/** ***右侧表格相关操作****** */ /** ***右侧表格相关操作****** */
// 用户关联 // 关联角色
const relateRole = record => { const relateRole = record => {
setRoleVisible(true); setRoleVisible(true);
setCurrentUser(record); setCurrentUser(record);
...@@ -558,7 +558,12 @@ const UserManage = () => { ...@@ -558,7 +558,12 @@ const UserManage = () => {
const phone = addUserForm.getFieldValue('phone') || ''; const phone = addUserForm.getFieldValue('phone') || '';
const email = addUserForm.getFieldValue('email') || ''; const email = addUserForm.getFieldValue('email') || '';
// 正则验证 // 正则验证
if (!noChinese.test(loginName)) { if (loginName === '') {
notification.error({
message: '提交失败',
description: '登录名不能为空!',
});
} else if (!noChinese.test(loginName)) {
notification.error({ notification.error({
message: '提交失败', message: '提交失败',
description: '登录名不支持中文!', description: '登录名不支持中文!',
...@@ -1320,9 +1325,9 @@ const UserManage = () => { ...@@ -1320,9 +1325,9 @@ const UserManage = () => {
> >
<p>即将删除该机构,是否确认删除?</p> <p>即将删除该机构,是否确认删除?</p>
</Modal> </Modal>
{/* 用户关联 */} {/* 关联角色 */}
<Modal <Modal
title="用户关联" title="关联角色"
visible={roleVisible} visible={roleVisible}
onOk={multiRelateRoles ? submitRoles : submitRole} onOk={multiRelateRoles ? submitRoles : submitRole}
onCancel={() => { onCancel={() => {
...@@ -1334,7 +1339,7 @@ const UserManage = () => { ...@@ -1334,7 +1339,7 @@ const UserManage = () => {
width="960px" width="960px"
> >
<Spin spinning={loading} tip="loading"> <Spin spinning={loading} tip="loading">
<Tabs defaultActiveKey="1"> <Tabs defaultActiveKey="1" style={{ marginTop: '-16px' }}>
<TabPane tab="角色" key="1"> <TabPane tab="角色" key="1">
{roleVisible && {roleVisible &&
rolelist.map((role, index) => ( rolelist.map((role, index) => (
......
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