修改显示

src/api/buildTeam.js

@@ -1490,3 +1490,12 @@ export function spanGroupMergeClassSplitClassAffirm(data) {
     data:data
   })
 }
+
+// 获取用户所在分部的年级列表
+export function getMusicGroupGradeList(data) {
+  return request2({
+    url: api + '/musicGroup/getGradeList',
+    method: 'get',
+    params: data
+  })
+}

src/views/teamDetail/components/studentList.vue

@@ -44,7 +44,7 @@
       </statistic-item> -->
     <div style="margin-bottom: 15px;" class="studentListWrap">
       <el-button type="primary" v-permission="'studentRegistration/insertStudent'"
-              @click="addStudentVisible = true">新增学员</el-button>
+              @click="createStudentFrom">新增学员</el-button>
       <!-- 可以直接去学生考勤查看 -->
       <!-- <el-button type="primary" v-permission="'/studentSignin'"
               @click="gotoSignin">点名总览</el-button> -->
@@ -83,6 +83,13 @@
           <el-option label="报名" value="APPLY"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item prop="currentGrade">
+        <el-input
+          v-model.trim="searchForm.currentGrade"
+          clearable
+          placeholder="学员年级"
+        ></el-input>
+      </el-form-item>
       <el-form-item prop="classGroupId">
         <el-select
           v-model.trim="searchForm.classGroupId"
@@ -408,14 +415,15 @@
           ></el-input>
         </el-form-item>
 
-        <el-form-item label="年级" prop="startClass">
+        <el-form-item label="年级" prop="currentGradeNum">
           <el-select
             placeholder="起始年级"
             filterable
             clearable
-            v-model.trim="maskForm.startClass"
+            v-model.trim="maskForm.currentGradeNum"
           >
-            <el-option value="一年级" label="一年级"></el-option>
+          <el-option v-for="item in gradeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            <!-- <el-option value="一年级" label="一年级"></el-option>
             <el-option value="二年级" label="二年级"></el-option>
             <el-option value="三年级" label="三年级"></el-option>
             <el-option value="四年级" label="四年级"></el-option>
@@ -426,7 +434,7 @@
             <el-option value="初三" label="初三"></el-option>
             <el-option value="高一" label="高一"></el-option>
             <el-option value="高二" label="高二"></el-option>
-            <el-option value="高三" label="高三"></el-option>
+            <el-option value="高三" label="高三"></el-option> -->
           </el-select>
         </el-form-item>
         <el-form-item label="班级" prop="course">
@@ -682,6 +690,7 @@ import {
   getMusicGroupAllClass,
   StudentFeeIsLock,
   updateStudentFee,
+  getMusicGroupGradeList
 } from "@/api/buildTeam";
 import {
   addStudent,
@@ -718,7 +727,6 @@ export default {
       addStudentVisible: false, //新增学员弹窗
       timesVisible: false,
       timerDetail: null,
-      teamid: '',
       topFrom: {
         // 顶部的禁选框集合
         expect: "2", // 预期招生
@@ -734,6 +742,7 @@ export default {
         search: "",
         isActive: "",
         oweFlag: '',
+        currentGrade: null,
         classGroupId: null,
         hasCourse: null,
         carePackage: null,
@@ -777,6 +786,7 @@ export default {
       qrcodes: true,
       qrcode: null,
       codeUrl: null,
+      gradeList: [], // 学生
       maskForm: {
         studentName: "",
         sex: "",
@@ -792,6 +802,7 @@ export default {
         highonline: "",
         muiscnetwork: "",
         startClass: "",
+        currentGradeNum: null,
         id: "",
         // courseFee: null, // 声部费用
         temporaryCourseFee: null, // 本次课程费用
@@ -825,7 +836,7 @@ export default {
         timer: [{ required: true, message: "请选择出生日期" }],
         signClass: [{ required: true, message: "请选择声部班" }],
         // price: [{ required: true, message: '请输入首缴金额' },],
-        startClass: [{ required: true, message: "请选择年级" }],
+        currentGradeNum: [{ required: true, message: "请选择年级" }],
         id: [{ required: true, message: "请输入证件号" }],
         // courseFee: [{ required: true, message: "请输入声部费用" }],
         temporaryCourseFee: [{ required: true, message: "请输课程费用" }],
@@ -928,6 +939,7 @@ export default {
     },
     init() {
       this.teamid = this.$route.query.id;
+
       // 获取汇总数据
       getTeamStudentInfo({ musicGroupId: this.teamid }).then((res) => {
         if (res.code == 200) {
@@ -1019,6 +1031,7 @@ export default {
         search: this.searchForm.search || null,
         isActive: this.searchForm.isActive || null,
         classGroupId: this.searchForm.classGroupId || null,
+        currentGrade: this.searchForm.currentGrade || null,
         hasCourse: this.searchForm.hasCourse || null,
         comeOnPackage: this.searchForm.comeOnPackage,
         carePackage: this.searchForm.carePackage,
@@ -1096,6 +1109,7 @@ export default {
         search: this.searchForm.search || null,
         isActive: this.searchForm.isActive || null,
         classGroupId: this.searchForm.classGroupId || null,
+        currentGrade: this.searchForm.currentGrade || null,
         oweFlag: this.searchForm.oweFlag || null,
         hasCourse: this.searchForm.hasCourse || null,
         comeOnPackage: this.searchForm.comeOnPackage,
@@ -1242,6 +1256,7 @@ export default {
               parentsName: maskForm.parentName,
               parentsPhone: maskForm.phone,
               currentGrade: maskForm.startClass,
+              currentGradeNum: maskForm.currentGradeNum,
               currentClass: maskForm.course,
               subjectId: maskForm.sound,
               musicGroupId: this.teamid,
@@ -1398,6 +1413,7 @@ export default {
               this.maskForm.parentName = res.data.parentsName;
               this.maskForm.course = res.data.currentClass;
               this.maskForm.startClass = res.data.currentGrade;
+              this.maskForm.currentGradeNum = res.data.currentGradeNum;
               this.maskForm.phone = val;
               this.maskForm.timer = res.data.birthdate;
             }
@@ -1493,6 +1509,22 @@ export default {
         },
       };
     },
+    createStudentFrom() {
+      getMusicGroupGradeList({ musicGroupId: this.teamid }).then(res => {
+        console.log(res)
+        let result = res.data
+        if(res.code == 200 && result) {
+          for(let i in result) {
+            this.gradeList.push({
+              value: i,
+              label: result[i]
+            })
+          }
+        }
+      })
+
+      this.addStudentVisible = true
+    }
   },
   watch: {
     quitVisible(val) {
@@ -1555,8 +1587,8 @@ export default {
 
 .studentInfo {
   /deep/.el-dialog__body {
-    padding-top: 0;
-    padding-bottom: 0;
+    // padding-top: 0;
+    // padding-bottom: 0;
   }
 }
 // .instrList {