Merge pull request '新增 edit时的学生类型' (#11) from dev into master

Reviewed-on: #11

src/views/student/edit.vue

@@ -49,6 +49,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="学生类型" prop="studentType">
+            <el-select
+              v-model="form.studentType"
+              filterable
+              placeholder="学生类型"
+              style="width: 180px"
+            >
+              <el-option
+                v-for="(item, i) in studentTypeEnum"
+                :key="i"
+                autocomplete="off"
+                :label="item.text"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
           <el-form-item label="申请减免" prop="amountRelief">
             <el-switch v-model="form.reliefApplication" />
           </el-form-item>
@@ -95,7 +116,7 @@
           </div>
         </el-col>
       </el-row>
-
+      <!-- 选修方向 -->
       <el-row class="pb-4.5">
         <el-col :span="24">
           <div style="display: flex; gap: 10px">
@@ -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<ComboModel[]>();
+const studentTypeEnum = ref<ComboModel[]>();
 
 const subject1 = ref<ComboModel[]>([
   { 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 () => {

src/views/student/index.vue

@@ -109,13 +109,13 @@
                 <div class="subjectTagEnableDiv">
                   <el-tag v-if="position.enable === false" type="info">已禁用</el-tag>
                   <el-tag>{{ position.schoolName || "-" }}</el-tag>
-                  <el-tag type="warning">{{
-                    position.graduationYear ? position.graduationYear + "届" : "-"
-                  }}</el-tag>
                   <el-tag type="success">{{ position.grade || "-" }}</el-tag>
                   <el-tag type="primary" class="classTag">{{
                     position.className || "-"
                   }}</el-tag>
+                  <el-tag v-if="scope.row.studentType" type="info">{{
+                    scope.row.studentType
+                  }}</el-tag>
                 </div>
               </div>
             </div>