提交代码修改

This commit is contained in:
zlwu committed 2025-07-28 17:20:25 +08:00
1 parent 760fd8d07a
commit 5231d97cc1
4 files changed
+122 -5

No files matched your search

+2 -2
View File
@@ -417,7 +417,7 @@ export interface StudentMsgVO {
/**
* 学历层次 - 预留,数据从班级表关联
*/
academicLevel: string;
academicLevel: string | number;
/**
* 培养方式:全日制、在职、函授、夜大等 - 预留,数据从班级表关联
@@ -1459,7 +1459,7 @@ export interface StudentMsgQuery extends PageQuery {
/**
* 学历层次 - 预留,数据从班级表关联
*/
academicLevel?: string;
academicLevel?: string | number;
/**
* 培养方式:全日制、在职、函授、夜大等 - 预留,数据从班级表关联
+1 -1
View File
@@ -146,7 +146,7 @@ export interface StudentForm {
enrollment_year?: string;
enrollment_date?: string;
school_system?: string;
academic_level?: string;
academic_level?: string | number;
training_type?: string;
major_name?: string;
class_name?: string;
+12 -2
View File
@@ -1732,7 +1732,7 @@ const initFormData: StudentMsgForm = {
enrollmentYear: undefined,
enrollmentDate: '',
schoolSystem: undefined,
academicLevel: '',
academicLevel: undefined as number | undefined,
trainingType: '全日制',
majorId: '',
majorName: '',
@@ -2094,6 +2094,10 @@ const handleDetail = async (row: StudentVO) => {
const res = await service.get(`/studentMsg/studentMsg/${studentId}`);
if (res && res.code === 200) {
Object.assign(detailForm, res.data);
// 确保学历层次为数字类型,避免类型不匹配导致的显示问题
if (detailForm.academicLevel !== undefined && detailForm.academicLevel !== null) {
detailForm.academicLevel = Number(detailForm.academicLevel);
}
detailDialog.visible = true;
activeDetailTab.value = 'basic'; // 重置到第一个tab页
} else {
@@ -2263,7 +2267,9 @@ const handleAdd = async () => {
form.collegeName = classData.college_name || classData.collegeName;
form.majorId = classData.major_id || classData.majorId;
form.majorName = classData.major_name || classData.majorName;
form.academicLevel = Number(classData.class_type || classData.classType);
// 确保学历层次为数字类型,避免类型不匹配导致的显示问题
const classType = classData.class_type || classData.classType;
form.academicLevel = classType ? Number(classType) : undefined;
form.grade = classData.grade;
form.enrollmentYear = classData.enrollment_year || classData.enrollmentYear;
form.classTeacherId = classData.class_teacher_id || classData.classTeacherId;
@@ -2292,6 +2298,10 @@ const handleUpdate = async (row?: StudentForm) => {
dialog.visible = true;
dialog.title = '修改学生';
Object.assign(form, res.data);
// 确保学历层次为数字类型,避免类型不匹配导致的显示问题
if (form.academicLevel !== undefined && form.academicLevel !== null) {
form.academicLevel = Number(form.academicLevel);
}
// 注意:如果需要专业和班级选项,可能需要额外的接口调用
// majorOptions.value = data.data.majors;
// classOptions.value = data.data.classes;