Commit 17e790bd authored by 涂伟's avatar 涂伟

fix: '导入用户逻辑优化'

parent a1b68fd9
Pipeline #93833 passed with stages
...@@ -1601,12 +1601,15 @@ const UserManage = () => { ...@@ -1601,12 +1601,15 @@ const UserManage = () => {
ImportUserData(params).then(res => { ImportUserData(params).then(res => {
console.log(res, 'ressssssssssssssss'); console.log(res, 'ressssssssssssssss');
if (res.code === 0 && res.data.includes('成功')) { if (res.code === 0) {
message.success(res.data) if (res.data.includes('成功')) {
setImportAccountVisible(false); message.success(res.data)
// setAlertTxt('1116666') setImportAccountVisible(false);
} else {
setAlertTxt(res.data || '导入失败!')
}
} else { } else {
setAlertTxt(res.data || '导入失败!') setAlertTxt(res.msg || '导入失败!')
} }
}) })
}) })
...@@ -1675,7 +1678,7 @@ const UserManage = () => { ...@@ -1675,7 +1678,7 @@ const UserManage = () => {
<Menu.Item key="22" onClick={() => { exportRoles({ isModal: true }) }} icon={<SnippetsOutlined />}> <Menu.Item key="22" onClick={() => { exportRoles({ isModal: true }) }} icon={<SnippetsOutlined />}>
导出模板 导出模板
</Menu.Item> </Menu.Item>
<Menu.Item key="33" onClick={() => {exportRoles({ all: true })}} icon={<UserSwitchOutlined />}> <Menu.Item key="33" onClick={() => { exportRoles({ all: true }) }} icon={<UserSwitchOutlined />}>
导出全部用户 导出全部用户
</Menu.Item> </Menu.Item>
<Menu.Item key="44" onClick={exportRoles} icon={<UserSwitchOutlined />}> <Menu.Item key="44" onClick={exportRoles} icon={<UserSwitchOutlined />}>
...@@ -2181,7 +2184,7 @@ const UserManage = () => { ...@@ -2181,7 +2184,7 @@ const UserManage = () => {
{alertTxt ? <Alert {alertTxt ? <Alert
message="错误信息" message="错误信息"
description={ description={
<div dangerouslySetInnerHTML={{__html: alertTxt}} /> <div dangerouslySetInnerHTML={{ __html: alertTxt }} />
} }
type="error" type="error"
closable closable
......
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