招生年级搜索处理

src/views/teamBuild/components/teamBaseInfo.vue

@@ -216,7 +216,7 @@
             placeholder="选择日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="招生年级" v-if="basdisabled">
+        <!-- <el-form-item label="招生年级" v-if="basdisabled">
           <el-tooltip
             class="item"
             effect="dark"
@@ -227,8 +227,8 @@
               {{ startClassString }}
             </div>
           </el-tooltip>
-        </el-form-item>
-        <el-form-item
+        </el-form-item> -->
+        <!-- <el-form-item
           label="招生年级"
           v-else
           prop="startClass"
@@ -249,7 +249,7 @@
               :key="item.value"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           label="课酬结算标准"
           :rules="[{ required: true, message: '请选择课酬结算标准' }]"

src/views/teamBuild/signupList.vue

@@ -114,8 +114,8 @@
         @submit="search"
         @reset="onReset"
       >
-        <el-form-item label="专业">
-          <el-select v-model.trim="searchFrom.subject" filterable clearable>
+        <el-form-item >
+          <el-select v-model.trim="searchFrom.subject" filterable clearable placeholder="请选择专业">
             <el-option
               v-for="(item, index) in soundList"
               :key="index"
@@ -124,18 +124,30 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否允许调剂">
+        <el-form-item >
           <el-select
             v-model.trim="searchFrom.isAllowAdjust"
             filterable
+            placeholder="请选择是否允许调剂"
             clearable
           >
             <el-option label="是" value="1"></el-option>
             <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="用户名或手机号">
-          <el-input v-model.trim="searchFrom.name" clearable></el-input>
+        <el-form-item>
+          <el-input v-model.trim="searchFrom.name" placeholder="请输入用户名或手机号" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <!-- <el-input v-model.trim="searchFrom.currentGrade" placeholder="请输入年级" clearable></el-input> -->
+          <el-select v-model.trim="searchFrom.currentGrade" filterable clearable placeholder="请输入年级">
+            <el-option
+              v-for="(item, index) in gradeList"
+              :key="index"
+              :label="item.label"
+              :value="item.label"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <!-- 专业actualSubjectId 调剂isAllowAdjust 手机号name -->
         <el-form-item>
@@ -677,6 +689,7 @@ import {
   getTeamBaseInfo,
   studentApplyDetailExport,
   StudentQuit,
+  getMusicGroupGradeList
 } from "@/api/buildTeam";
 import mergeMusic from "./components/merge-music";
 import forecastList from "./components/forecast-list";
@@ -719,6 +732,7 @@ export default {
         name: "",
         subject: "", // 专业
         isAllowAdjust: "", // 是否允许调剂
+        currentGrade: null, // 入学年级
       },
       quitForm: {
         // 退团信息确认
@@ -822,7 +836,8 @@ export default {
       },
       isPay: false,
       applyDates: this.applyDate(),
-      detail:null
+      detail:null,
+      gradeList: []
     };
   },
   created() {
@@ -843,6 +858,20 @@ export default {
       this.teamName = this.$route.query.name;
       // 判断是否带缓存参数
       this.pickerOptions = this.beginDate(new Date());
+
+      getMusicGroupGradeList({ musicGroupId: this.id }).then(res => {
+        let result = res.data
+        if(res.code == 200 && result) {
+          for(let i in result) {
+            this.gradeList.push({
+              value: i,
+              label: result[i]
+            })
+          }
+        }
+      })
+
+
       getTeamBaseInfo({ musicGroupId: this.id }).then((res) => {
         if (res.code == 200) {
           this.organId = res.data.musicGroup.organId;
@@ -871,6 +900,7 @@ export default {
         name: null,
         subject: null, // 专业
         isAllowAdjust: null, // 是否允许调剂
+        currentGrade: null
       };
       this.getList();
     },
@@ -893,6 +923,7 @@ export default {
         actualSubjectId: this.searchFrom.subject || null,
         isAllowAdjust: this.searchFrom.isAllowAdjust || null,
         name: this.searchFrom.name || null,
+        currentGrade: this.searchFrom.currentGrade || null,
         page: this.rules.page,
         rows: this.rules.limit,
       };

src/views/teamDetail/components/studentList.vue

@@ -83,12 +83,28 @@
           <el-option label="报名" value="APPLY"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item prop="createYear">
+        <el-date-picker
+          v-model="searchForm.createYear"
+          type="year"
+          value-format="yyyy"
+          placeholder="选择入团年份">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item prop="currentGrade">
-        <el-input
+        <!-- <el-input
           v-model.trim="searchForm.currentGrade"
           clearable
           placeholder="学员年级"
-        ></el-input>
+        ></el-input> -->
+        <el-select v-model.trim="searchForm.currentGrade" filterable clearable placeholder="请输入年级">
+          <el-option
+            v-for="(item, index) in gradeList"
+            :key="index"
+            :label="item.label"
+            :value="item.label"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item prop="classGroupId">
         <el-select
@@ -743,6 +759,7 @@ export default {
         isActive: "",
         oweFlag: '',
         currentGrade: null,
+        createYear: null,
         classGroupId: null,
         hasCourse: null,
         carePackage: null,
@@ -940,6 +957,18 @@ export default {
     init() {
       this.teamid = this.$route.query.id;
 
+      getMusicGroupGradeList({ musicGroupId: this.teamid }).then(res => {
+        let result = res.data
+        if(res.code == 200 && result) {
+          for(let i in result) {
+            this.gradeList.push({
+              value: i,
+              label: result[i]
+            })
+          }
+        }
+      })
+
       // 获取汇总数据
       getTeamStudentInfo({ musicGroupId: this.teamid }).then((res) => {
         if (res.code == 200) {
@@ -1032,6 +1061,7 @@ export default {
         isActive: this.searchForm.isActive || null,
         classGroupId: this.searchForm.classGroupId || null,
         currentGrade: this.searchForm.currentGrade || null,
+        createYear: this.searchForm.createYear || null,
         hasCourse: this.searchForm.hasCourse || null,
         comeOnPackage: this.searchForm.comeOnPackage,
         carePackage: this.searchForm.carePackage,
@@ -1110,6 +1140,7 @@ export default {
         isActive: this.searchForm.isActive || null,
         classGroupId: this.searchForm.classGroupId || null,
         currentGrade: this.searchForm.currentGrade || null,
+        createYear: this.searchForm.createYear || null,
         oweFlag: this.searchForm.oweFlag || null,
         hasCourse: this.searchForm.hasCourse || null,
         comeOnPackage: this.searchForm.comeOnPackage,
@@ -1510,19 +1541,6 @@ 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
     }
   },