Merge branch 'master' of http://47.99.164.66:3000/hzdyjs-xg/all-project
This commit is contained in:
commit
10f90d3824
6 files changed
+77
-40
No files matched your search
@@ -117,36 +117,36 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="语文成绩" prop="chineseScore" required>
|
||||
<el-form-item label="语文成绩" prop="chineseScore">
|
||||
<el-input-number v-model="applyForm.chineseScore" placeholder="请输入语文成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="数学成绩" prop="mathScore" required>
|
||||
<el-form-item label="数学成绩" prop="mathScore">
|
||||
<el-input-number v-model="applyForm.mathScore" placeholder="请输入数学成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="英语成绩" prop="englishScore" required>
|
||||
<el-form-item label="英语成绩" prop="englishScore">
|
||||
<el-input-number v-model="applyForm.englishScore" placeholder="请输入英语成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="科学成绩" prop="scienceScore" required>
|
||||
<el-form-item label="科学成绩" prop="scienceScore">
|
||||
<el-input-number v-model="applyForm.scienceScore" placeholder="请输入科学成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="社会成绩" prop="socialScore" required>
|
||||
<el-form-item label="社会成绩" prop="socialScore">
|
||||
<el-input-number v-model="applyForm.socialScore" placeholder="请输入社会成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="体育成绩" prop="peScore" required>
|
||||
<el-form-item label="体育成绩" prop="peScore">
|
||||
<el-input-number v-model="applyForm.peScore" placeholder="请输入体育成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
@@ -18,6 +18,32 @@ const requiredNumber = (label: string, min: number, max?: number) => {
|
||||
return rules;
|
||||
};
|
||||
|
||||
/** 选填数字:为空跳过,有值时校验范围 */
|
||||
const optionalNumber = (label: string, min: number, max?: number) => {
|
||||
const rules: FormRules[string] = [
|
||||
{
|
||||
validator: (_rule, value, callback) => {
|
||||
if (value === undefined || value === null || value === '') {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
const num = Number(value);
|
||||
if (Number.isNaN(num) || num < min) {
|
||||
callback(new Error(`${label}不能小于${min}`));
|
||||
return;
|
||||
}
|
||||
if (max !== undefined && num > max) {
|
||||
callback(new Error(`${label}不能大于${max}`));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'blur'
|
||||
}
|
||||
];
|
||||
return rules;
|
||||
};
|
||||
|
||||
/** 招生报名信息表单校验(特长爱好、获奖情况除外) */
|
||||
export const enrollmentFormRules: FormRules = {
|
||||
name: requiredText('姓名'),
|
||||
@@ -44,12 +70,12 @@ export const enrollmentFormRules: FormRules = {
|
||||
examRegion: requiredText('中考地区'),
|
||||
totalScoreFull: requiredNumber('中考满分', 100, 1000),
|
||||
totalScore: requiredNumber('中考成绩', 0),
|
||||
chineseScore: requiredNumber('语文成绩', 0),
|
||||
mathScore: requiredNumber('数学成绩', 0),
|
||||
englishScore: requiredNumber('英语成绩', 0),
|
||||
scienceScore: requiredNumber('科学成绩', 0),
|
||||
socialScore: requiredNumber('社会成绩', 0),
|
||||
peScore: requiredNumber('体育成绩', 0),
|
||||
chineseScore: optionalNumber('语文成绩', 0),
|
||||
mathScore: optionalNumber('数学成绩', 0),
|
||||
englishScore: optionalNumber('英语成绩', 0),
|
||||
scienceScore: optionalNumber('科学成绩', 0),
|
||||
socialScore: optionalNumber('社会成绩', 0),
|
||||
peScore: optionalNumber('体育成绩', 0),
|
||||
collegeName: requiredText('所属学院', 'change'),
|
||||
collegeId: requiredText('学院代码'),
|
||||
appliedMajor: requiredText('报考专业', 'change'),
|
||||
|
||||
@@ -295,36 +295,36 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="语文成绩" prop="chineseScore" required>
|
||||
<el-form-item label="语文成绩" prop="chineseScore">
|
||||
<el-input-number v-model="form.chineseScore" placeholder="请输入语文成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="数学成绩" prop="mathScore" required>
|
||||
<el-form-item label="数学成绩" prop="mathScore">
|
||||
<el-input-number v-model="form.mathScore" placeholder="请输入数学成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="英语成绩" prop="englishScore" required>
|
||||
<el-form-item label="英语成绩" prop="englishScore">
|
||||
<el-input-number v-model="form.englishScore" placeholder="请输入英语成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="科学成绩" prop="scienceScore" required>
|
||||
<el-form-item label="科学成绩" prop="scienceScore">
|
||||
<el-input-number v-model="form.scienceScore" placeholder="请输入科学成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="社会成绩" prop="socialScore" required>
|
||||
<el-form-item label="社会成绩" prop="socialScore">
|
||||
<el-input-number v-model="form.socialScore" placeholder="请输入社会成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="体育成绩" prop="peScore" required>
|
||||
<el-form-item label="体育成绩" prop="peScore">
|
||||
<el-input-number v-model="form.peScore" placeholder="请输入体育成绩" :min="0" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
Reference in new issue
Block a user