dev #9

Merged
hy merged 2 commits from dev into staging 2025-08-26 20:09:40 +08:00
4 changed files with 23 additions and 10 deletions

View File

@ -12,6 +12,17 @@ type Rule = {
pattern?: RegExp; 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[] => { export const ruleRequiredI = (max: number = 20, min: number = 0): Rule[] => {
let res: Rule[] = [ let res: Rule[] = [
{ required: true, message: "不能为空", trigger: "blur" }, { required: true, message: "不能为空", trigger: "blur" },

View File

@ -103,13 +103,13 @@ const tableData: TableConfig = {
add: false, // add: false, //
edit: false, // edit: false, //
}, },
entryPerson: { // entryPerson: {
label: "录入人", // label: "",
width: "200px", // width: "200px",
search: true, // search: false,
add: false, // // add: false, //
edit: false, // // edit: false, //
}, // },
createTime: { createTime: {
label: "录入时间", label: "录入时间",
width: "200px", width: "200px",

View File

@ -8,6 +8,7 @@ import { getenum } from "@/api/enum";
import { import {
ruleNumber, ruleNumber,
ruleRequired, ruleRequired,
ruleRequiredGrade,
ruleRequiredI, ruleRequiredI,
ruleRequiredNumber, ruleRequiredNumber,
} from "@/utils/rules"; } from "@/utils/rules";
@ -108,7 +109,7 @@ const tableData: TableConfig = {
}, },
grade: { grade: {
label: "年级", label: "年级",
rules: ruleRequiredI(6, 2), rules: ruleRequiredGrade,
width: "100px", width: "100px",
search: true, search: true,
add: true, // add: true, //

View File

@ -380,12 +380,13 @@ const handleSubmitForm = () => {
userEditForm.value.validate(async (valid) => { userEditForm.value.validate(async (valid) => {
if (valid) { if (valid) {
loading.value = true; loading.value = true;
let ac = form.value.account || new Date().getTime() + "";
const formData = { const formData = {
id: form.value.uId || 0, id: form.value.uId || 0,
userType: form.value.userType || 1, userType: form.value.userType || 1,
level: form.value.level || 0, level: form.value.level || 0,
account: form.value.account || "", account: form.value.account || new Date().getTime() + "",
// PassWord: form.value.id === 0 ? md5(form.value.PassWord).toUpperCase() : "", PassWord: form.value.id === 0 ? "无效密码" : "",
realName: form.value.realName || "", realName: form.value.realName || "",
studentId: form.value.studentId || "", studentId: form.value.studentId || "",
templateId: form.value.templateId || 0, templateId: form.value.templateId || 0,