Merge branch 'master' into online

src/views/teamDetail/components/studentList.vue

@@ -48,6 +48,17 @@
         </el-select>
       </el-form-item>
       <el-form-item>
+        <el-select v-model="searchForm.classGroupId"
+                   clearable
+                   filterable
+                   placeholder="请选择班级">
+          <el-option v-for='(item,index) in classList'
+                     :key='index'
+                     :value="item.id"
+                     :label="item.name"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
         <el-select v-model="searchForm.major"
                    clearable
                    filterable
@@ -628,8 +639,8 @@ export default {
         major: '', // 报名专业
         isPay: '', // 是否缴费
         search: '',
-        isActive: ''
-
+        isActive: '',
+        classGroupId: null
       },
       quitForm: { // 退团信息确认
         isRefundCourseFee: null,
@@ -659,6 +670,7 @@ export default {
       highList: [],
       snapList: [],
       soundList: [],
+      classList: [],
       qrcodeStatus: false, // 生成二维码
       qrcodes: true,
       qrcode: null,
@@ -783,6 +795,7 @@ export default {
     // 获取乐团所有合奏课
     getMusicGroupAllClass({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
+        this.classList = res.data;
         res.data.forEach(item => {
           if (item.type == 'NORMAL') {
             this.signList.push(item);
@@ -808,7 +821,8 @@ export default {
         paymentStatus: this.searchForm.isPay || null,
         subjectId: this.searchForm.major || null,
         search: this.searchForm.search || null,
-        isActive: this.searchForm.isActive
+        isActive: this.searchForm.isActive || null,
+        classGroupId: this.searchForm.classGroupId || null
       }
       const options = {
         method: 'get',
@@ -872,7 +886,8 @@ export default {
         paymentStatus: this.searchForm.isPay || null,
         subjectId: this.searchForm.major || null,
         search: this.searchForm.search || null,
-        isActive: this.searchForm.isActive
+        isActive: this.searchForm.isActive || null,
+        classGroupId: this.searchForm.classGroupId || null
       }
       getTeamStudentList(obj).then(res => {
         if (res.code == 200) {

src/views/teamDetail/teamCourseList.vue

@@ -13,6 +13,17 @@
                     placeholder="乐团名或VIP课名" />
         </el-form-item>
         <el-form-item>
+          <el-select v-model="searchForm.schoolId"
+                    clearable
+                    filterable
+                    placeholder="请选择教学点">
+            <el-option v-for="(item, index) in schoolList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.name"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
           <el-select v-model="searchForm.teacherIdList"
                      clearable
                      filterable
@@ -174,6 +185,7 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { getTeacher, getMusicGroupAllClass, superFindCourseSchedules, getEmployeeOrgan } from '@/api/buildTeam'
+import { getSchool } from '@/api/systemManage'
 import { courseType } from '@/utils/searchArray'
 let nowTime = new Date()
 nowTime = nowTime.getFullYear() + '-' + (nowTime.getMonth() + 1) + '-' + nowTime.getDate()
@@ -191,6 +203,7 @@ export default {
         class: null,
         search: null, // 乐团名称 编号 vip课名称
         teacherIdList: null, // 老师编号
+        schoolId: null // 教学点编号
       },
       tableList: [],
       searchLsit: [],
@@ -203,6 +216,7 @@ export default {
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       teacherList: [],
+      schoolList: []
       // classList: []
     }
 
@@ -215,6 +229,34 @@ export default {
   },
   mounted () {
     this.init();
+    this.getList();
+    // 获取所有老师
+    getTeacher().then(res => {
+      if (res.code == 200) {
+        this.teacherList = res.data;
+      }
+    })
+
+    // 获取教学点
+    getSchool().then(res => {
+      if(res.code == 200) {
+        this.schoolList = res.data
+      }
+    })
+
+    // 获取班级列表
+    // getMusicGroupAllClass().then(res => {
+    //   if (res.code == 200) {
+    //     this.classList = res.data;
+    //   }
+    // })
+
+    // 获取分部
+    getEmployeeOrgan().then(res => {
+      if (res.code == 200) {
+        this.organList = res.data;
+      }
+    })
   },
   methods: {
     /**
@@ -263,7 +305,8 @@ export default {
         classGroupId: searchForm.class || null,
         organIdList: searchForm.organIdList || null,
         search: searchForm.search || null,
-        teacherIdList: searchForm.teacherIdList || null
+        teacherIdList: searchForm.teacherIdList || null,
+        schoolId: searchForm.schoolId || null
       }
       superFindCourseSchedules(obj).then(res => {
         if (res.code == 200) {