diff --git a/src/utils/rules.ts b/src/utils/rules.ts index 745a37f..3ca2c0f 100644 --- a/src/utils/rules.ts +++ b/src/utils/rules.ts @@ -12,6 +12,17 @@ type Rule = { pattern?: RegExp; }; + +export const ruleRequiredGrade = [ + { required: true, message: "不能为空", trigger: "blur" }, + { + pattern: /^(初[一二三]|高[一二三]|初\d{4}|高\d{4})$/, + message: "请输入正确的年级 例[初一,初2025]", + trigger: "blur" + } +]; + + export const ruleRequiredI = (max: number = 20, min: number = 0): Rule[] => { let res: Rule[] = [ { required: true, message: "不能为空", trigger: "blur" }, diff --git a/src/views/exam/classDetails.vue b/src/views/exam/classDetails.vue index 9f8ec28..699f20d 100644 --- a/src/views/exam/classDetails.vue +++ b/src/views/exam/classDetails.vue @@ -103,13 +103,13 @@ const tableData: TableConfig = { add: false, // 字段允许添加 edit: false, // 字段允许修改 }, - entryPerson: { - label: "录入人", - width: "200px", - search: true, - add: false, // 字段允许添加 - edit: false, // 字段允许修改 - }, + // entryPerson: { + // label: "录入人", + // width: "200px", + // search: false, + // add: false, // 字段允许添加 + // edit: false, // 字段允许修改 + // }, createTime: { label: "录入时间", width: "200px", diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue index 6d180be..42b0dd7 100644 --- a/src/views/exam/index.vue +++ b/src/views/exam/index.vue @@ -8,6 +8,7 @@ import { getenum } from "@/api/enum"; import { ruleNumber, ruleRequired, + ruleRequiredGrade, ruleRequiredI, ruleRequiredNumber, } from "@/utils/rules"; @@ -108,7 +109,7 @@ const tableData: TableConfig = { }, grade: { label: "年级", - rules: ruleRequiredI(6, 2), + rules: ruleRequiredGrade, width: "100px", search: true, add: true, // 字段允许添加 diff --git a/src/views/student/edit.vue b/src/views/student/edit.vue index 4b98f7d..e01f01d 100644 --- a/src/views/student/edit.vue +++ b/src/views/student/edit.vue @@ -380,12 +380,13 @@ const handleSubmitForm = () => { userEditForm.value.validate(async (valid) => { if (valid) { loading.value = true; + let ac = form.value.account || new Date().getTime() + ""; const formData = { id: form.value.uId || 0, userType: form.value.userType || 1, level: form.value.level || 0, - account: form.value.account || "", - // PassWord: form.value.id === 0 ? md5(form.value.PassWord).toUpperCase() : "", + account: form.value.account || new Date().getTime() + "", + PassWord: form.value.id === 0 ? "无效密码" : "", realName: form.value.realName || "", studentId: form.value.studentId || "", templateId: form.value.templateId || 0,