yangjie #19

Merged
yangqiang merged 4 commits from yangjie into master 2024-10-11 16:10:36 +08:00
1 changed files with 4 additions and 5 deletions
Showing only changes of commit 3c1eab9737 - Show all commits

View File

@ -335,7 +335,7 @@ const User: React.FC = () => {
}}
/>
</div> : null}
<div>
{isCreateUser !== 'batch' ? <div>
<span></span>
<Select
placeholder='请选择角色'
@ -347,7 +347,7 @@ const User: React.FC = () => {
RoleId: e
});
}} />;
</div>
</div> : null}
{isCreateUser === 'add' ? <div>
<span></span>
<Input.Password
@ -414,7 +414,7 @@ const User: React.FC = () => {
if (!addUserFrom.Account && isCreateUser !== 'batch') {
return message.error('请输入账号!')
}
if (!addUserFrom.RoleId) {
if (!addUserFrom.RoleId && isCreateUser !== 'batch') {
return message.error('请选择角色!')
}
if (!addUserFrom.Pwd && isCreateUser === 'add') {
@ -458,8 +458,7 @@ const User: React.FC = () => {
return {
id: item,
subject: addUserFrom.subject,
year: addUserFrom.year,
RoleId: addUserFrom.RoleId,
year: addUserFrom.year
}
})
await PutUserBth(param).then(res => {