diff --git a/src/views/student/edit.vue b/src/views/student/edit.vue index e01f01d..c6477b2 100644 --- a/src/views/student/edit.vue +++ b/src/views/student/edit.vue @@ -49,6 +49,27 @@ + + + + + + + + + + @@ -95,7 +116,7 @@ - +
@@ -260,6 +281,7 @@ interface FormData { exitTime?: string; joinTime?: string; remark?: string; + studentType?: number; status?: string; amountRelief?: number; reliefSubTime?: number; @@ -287,6 +309,7 @@ const size = "small"; const loading = ref(false); const reliefTypeEnum = ref(); +const studentTypeEnum = ref(); const subject1 = ref([ { value: 4, text: "物理" }, @@ -448,21 +471,35 @@ const handleResetForm = () => { const fetchInitData = async () => { reliefTypeEnum.value = ` - 1.复读生 - 2.艺术生 - 3.春招生 - 4.领导承诺批准全免 - 5.资源班 - 6.国际班 - 7.合同制收费学校 - 8.渠道商家属 - 9.新开班但领导承诺第一学期不收费` + 1.建卡贫困户 + 2.低保户 + 3.教师子女 + 4.孤儿 + 5.艺体生 + 6.残疾学生 + 7.领导特殊承诺减免` .split("\n") .filter((s) => s.trim()) .map((s) => { const [value, text] = s.trim().split("."); return { value: text.trim(), text: text.trim() }; }); + studentTypeEnum.value = ` + 1.复读生 + 10.艺术生 + 20.春招生 + 30.领导承诺批准全免 + 40.资源班 + 50.国际班 + 60.合同制收费学校 + 70.渠道商家属 + 80.新开班但领导承诺第一学期不收费` + .split("\n") + .filter((s) => s.trim()) + .map((s) => { + const [value, text] = s.trim().split("."); + return { value: parseInt(value.trim()), text: text.trim() }; + }); }; const fetchFormData = async () => { diff --git a/src/views/student/index.vue b/src/views/student/index.vue index 994d96c..635b4d9 100644 --- a/src/views/student/index.vue +++ b/src/views/student/index.vue @@ -109,13 +109,13 @@
已禁用 {{ position.schoolName || "-" }} - {{ - position.graduationYear ? position.graduationYear + "届" : "-" - }} {{ position.grade || "-" }} {{ position.className || "-" }} + {{ + scope.row.studentType + }}