|
@@ -147,7 +147,6 @@
|
|
</a-form-item>
|
|
</a-form-item>
|
|
<a-form-item label="登录名" v-bind="validateInfos.loginName">
|
|
<a-form-item label="登录名" v-bind="validateInfos.loginName">
|
|
<a-input
|
|
<a-input
|
|
- :disabled="!!userInfo.id"
|
|
|
|
v-model:value="userInfo.loginName"
|
|
v-model:value="userInfo.loginName"
|
|
maxlength="11"
|
|
maxlength="11"
|
|
:placeholder="
|
|
:placeholder="
|
|
@@ -323,11 +322,11 @@ const resetPwd = reactive({
|
|
const editUserRules = () => ({
|
|
const editUserRules = () => ({
|
|
name: [{ required: true, message: "请填写用户姓名" }],
|
|
name: [{ required: true, message: "请填写用户姓名" }],
|
|
role: [{ required: true, message: "请选择用户角色" }],
|
|
role: [{ required: true, message: "请选择用户角色" }],
|
|
|
|
+ loginName: [{ required: true, message: "请填写登录名" }],
|
|
});
|
|
});
|
|
|
|
|
|
const addUserRules = () => ({
|
|
const addUserRules = () => ({
|
|
schoolId: [{ required: true, message: "请选择用户所属学校" }],
|
|
schoolId: [{ required: true, message: "请选择用户所属学校" }],
|
|
- loginName: [{ required: true, message: "请填写登录名" }],
|
|
|
|
passwd: [
|
|
passwd: [
|
|
{ required: true, message: "请填写登录密码" },
|
|
{ required: true, message: "请填写登录密码" },
|
|
{
|
|
{
|
|
@@ -437,10 +436,12 @@ const querySchoolList = throttle(
|
|
const toggleAddUserModal = (show: boolean = true) => {
|
|
const toggleAddUserModal = (show: boolean = true) => {
|
|
if (show) {
|
|
if (show) {
|
|
if (userInfo.id) {
|
|
if (userInfo.id) {
|
|
- Object.assign(userRules, { schoolId: [], loginName: [], passwd: [] });
|
|
|
|
|
|
+ Object.assign(userRules, { schoolId: [], passwd: [] });
|
|
} else {
|
|
} else {
|
|
- Object.assign(userInfo, { schoolId: query.schoolId || mainStore.systemUserInfo?.schoolId });
|
|
|
|
Object.assign(userRules, { ...addUserRules() });
|
|
Object.assign(userRules, { ...addUserRules() });
|
|
|
|
+ Object.assign(userInfo, {
|
|
|
|
+ schoolId: query.schoolId || mainStore.systemUserInfo?.schoolId,
|
|
|
|
+ });
|
|
}
|
|
}
|
|
querySchoolList("", "form");
|
|
querySchoolList("", "form");
|
|
}
|
|
}
|
|
@@ -491,20 +492,18 @@ const onResetPwd = (record: UserInfo) => {
|
|
const onPutUser = () => {
|
|
const onPutUser = () => {
|
|
const role = userInfo.role;
|
|
const role = userInfo.role;
|
|
const isEdit = !!userInfo.id;
|
|
const isEdit = !!userInfo.id;
|
|
- if (!isEdit) {
|
|
|
|
- if (role === "SECTION_LEADER") {
|
|
|
|
- Object.assign(userRules, {
|
|
|
|
- loginName: [
|
|
|
|
- { required: true, message: "请填写登录手机号" },
|
|
|
|
- // @ts-ignore
|
|
|
|
- { pattern: /\d{11}/, message: "请填写正确的手机号" },
|
|
|
|
- ],
|
|
|
|
- });
|
|
|
|
- } else {
|
|
|
|
- Object.assign(userRules, {
|
|
|
|
- loginName: [{ required: true, message: "请填写登录名" }],
|
|
|
|
- });
|
|
|
|
- }
|
|
|
|
|
|
+ if (role === "SECTION_LEADER") {
|
|
|
|
+ Object.assign(userRules, {
|
|
|
|
+ loginName: [
|
|
|
|
+ { required: true, message: "请填写登录手机号" },
|
|
|
|
+ // @ts-ignore
|
|
|
|
+ { pattern: /\d{11}/, message: "请填写正确的手机号" },
|
|
|
|
+ ],
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
|
|
+ Object.assign(userRules, {
|
|
|
|
+ loginName: [{ required: true, message: "请填写登录名" }],
|
|
|
|
+ });
|
|
}
|
|
}
|
|
validate().then((valid) => {
|
|
validate().then((valid) => {
|
|
if (valid) {
|
|
if (valid) {
|