提交

1

src/views/studentManager/components/studentInfo.vue

@@ -29,14 +29,22 @@
           </el-form-item>
         </el-col>
 
-        <!-- <el-col :xl="6" :lg="8" :md="8" :xs="12">
-          <el-form-item label="年级班级">
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="学员年级">
             <el-input
-              :value="studentForm.currentGrade + studentForm.currentClass"
+              :value="studentForm.currentGrade"
               disabled
             ></el-input>
           </el-form-item>
-        </el-col> -->
+        </el-col>
+              <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="学员班级">
+            <el-input
+              :value="studentForm.currentClass"
+              disabled
+            ></el-input>
+          </el-form-item>
+        </el-col>
 
         <el-col :xl="6" :lg="8" :md="8" :xs="12">
           <el-form-item label="所属分部">

src/views/studentManager/studentList.vue

@@ -658,22 +658,7 @@
             </el-option-group>
           </el-select>
         </el-form-item>
-                <el-form-item label="学生年级" prop="currentGradeNum">
-          <el-select
-            class="multiple"
-            v-model.trim="studentForm.currentGradeNum"
-            clearable
-            filterable
-            :disabled="!studentForm.organId"
-          >
-            <el-option
-              v-for="(item, index) in maskTeacherList"
-              :label="item.realName"
-              :value="item.id"
-              :key="index"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+
         <el-form-item label="家长姓名" prop="parseName">
           <el-input
             v-model.trim="studentForm.parseName"
@@ -712,6 +697,25 @@
             ></el-option>
           </el-select>
         </el-form-item>
+                <el-form-item label="学员年级" prop="currentGradeNum">
+          <el-select
+            class="multiple"
+            v-model.trim="studentForm.currentGradeNum"
+            clearable
+            filterable
+            :disabled="!studentForm.organId"
+          >
+            <el-option
+              v-for="(item, index) in studentGradeList"
+              :label="item"
+              :value="Number(index)"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="学员班级" prop="currentClass">
+          <el-input v-model.trim="studentForm.currentClass"></el-input>
+        </el-form-item>
         <el-form-item prop="school" label="所属学校">
           <el-select
             v-model.trim="studentForm.school"
@@ -941,7 +945,7 @@ import {
   getLatest,
 } from "@/api/studentManager";
 import { queryByOrganId } from "@/api/systemManage";
-// import { getGradeList } from "@/";
+import { getGradeList } from "@/views/2021memeberActionManager/api";
 import qrCode from "@/components/QrCode/index";
 import { vaildStudentUrl } from "@/utils/validate";
 import { resetPassword2, getTeacher, getAgreement } from "@/api/buildTeam";
@@ -1010,6 +1014,8 @@ export default {
         carePackage: 0,
         comeOnPackage: 0,
         school: null,
+        currentClass: "",
+        currentGradeNum: "",
       },
       studentUpdatePackage: {
         carePackage: 0,
@@ -1043,6 +1049,7 @@ export default {
       protocolVersions: [],
       cooperationList: [],
       tenantId: null,
+      studentGradeList:[]
     };
   },
   mounted() {
@@ -1270,6 +1277,8 @@ export default {
             carePackage: studentForm.carePackage,
             comeOnPackage: studentForm.comeOnPackage,
             cooperationOrganId: studentForm.school,
+            currentClass: studentForm.currentClass,
+            currentGradeNum: studentForm.currentGradeNum,
           };
           registerStudent(obj).then((res) => {
             if (res.code == 200) {
@@ -1302,6 +1311,8 @@ export default {
             carePackage: studentForm.carePackage,
             comeOnPackage: studentForm.comeOnPackage,
             cooperationOrganId: studentForm.school,
+            currentClass: studentForm.currentClass,
+            currentGradeNum: studentForm.currentGradeNum,
           };
           updateStudent(obj).then((res) => {
             if (res.code == 200) {
@@ -1314,32 +1325,47 @@ export default {
       });
     },
     async getSubjectList() {
-      await subjectListTree({
-        delFlag: "NO",
-        rows: 9999,
-      }).then((res) => {
-        let result = res.data;
-        if (res.code == 200) {
-          let tempArray = [];
-          result.rows.forEach((item, index) => {
-            let subject = [];
-            item.subjects.forEach((s) => {
-              subject.push({
-                value: s.id,
-                label: s.name,
+      try {
+        await subjectListTree({
+          delFlag: "NO",
+          rows: 9999,
+        }).then((res) => {
+          let result = res.data;
+          if (res.code == 200) {
+            let tempArray = [];
+            result.rows.forEach((item, index) => {
+              let subject = [];
+              item.subjects.forEach((s) => {
+                subject.push({
+                  value: s.id,
+                  label: s.name,
+                });
               });
+
+              tempArray[index] = {
+                label: item.name,
+                value: item.id,
+                options: subject,
+              };
             });
+            this.subjectList = tempArray;
+          }
+        });
 
-            tempArray[index] = {
-              label: item.name,
-              value: item.id,
-              options: subject,
-            };
-          });
-          this.subjectList = tempArray;
-        }
-        console.log(this.subjectList);
-      });
+
+        // 获取 学生年级
+
+
+      } catch (e) {}
+    },
+
+    async getStudentGradeList(organId){
+      try{
+          const res = await getGradeList({ id: organId })
+          this.studentGradeList = res.data
+      }catch(e){
+        console.log(e)
+      }
     },
     async addStudent() {
       await this.getSubjectList();
@@ -1373,6 +1399,8 @@ export default {
           comeOnPackage: row.comeOnPackage,
           school: row.cooperationOrganId || null,
           extSubjectIds: row.extSubjectIds || null,
+          currentClass: row.currentClass || null,
+          currentGradeNum: row.currentGradeNum || null,
         };
         this.studentUpdatePackage = {
           carePackage: row.carePackage,
@@ -1401,7 +1429,7 @@ export default {
         cooperationOrganId: row.cooperationOrganId || null,
         extSubjectIds: row.extSubjectIds,
       };
-      console.log(row, "show");
+
       this.extVisible = true;
     },
     onMaskClose(formName) {
@@ -1463,6 +1491,7 @@ export default {
             this.cooperationList = res.data;
           }
         });
+        this.getStudentGradeList(val)
       } else {
         this.maskTeacherList = [];
       }