|
@@ -159,7 +159,7 @@
|
|
|
></a-input>
|
|
|
</a-form-item>
|
|
|
<a-form-item
|
|
|
- v-if="!userInfo.id"
|
|
|
+ v-if="userInfo.role !== 'SECTION_LEADER' && !userInfo.id"
|
|
|
label="密码"
|
|
|
v-bind="validateInfos.passwd"
|
|
|
>
|
|
@@ -507,6 +507,7 @@ const onPutUser = () => {
|
|
|
// @ts-ignore
|
|
|
{ pattern: /\d{11}/, message: "请填写正确的手机号" },
|
|
|
],
|
|
|
+ passwd: []
|
|
|
});
|
|
|
} else {
|
|
|
Object.assign(userRules, {
|
|
@@ -515,10 +516,11 @@ const onPutUser = () => {
|
|
|
}
|
|
|
validate().then((valid) => {
|
|
|
if (valid) {
|
|
|
- const { role, course, schoolTableData, ...info } = userInfo;
|
|
|
+ const { role, course, schoolTableData, passwd,...info } = userInfo;
|
|
|
editUserInfoHttp({
|
|
|
...info,
|
|
|
role,
|
|
|
+ passwd: role === "SECTION_LEADER" ? "" : passwd,
|
|
|
course: role === "SECTION_LEADER" ? course : "",
|
|
|
}).then(() => {
|
|
|
message.success(`${isEdit ? "修改" : "添加"}成功`);
|
|
@@ -526,6 +528,12 @@ const onPutUser = () => {
|
|
|
toggleAddUserModal(false);
|
|
|
});
|
|
|
}
|
|
|
+ }).catch(()=>{
|
|
|
+ if (userInfo.id) {
|
|
|
+ Object.assign(userRules, { schoolId: [], passwd: [] });
|
|
|
+ } else {
|
|
|
+ Object.assign(userRules, { ...addUserRules() });
|
|
|
+ }
|
|
|
});
|
|
|
};
|
|
|
|