1111 20:53

111

dist/static/css/chunk-24a1caba.d0810af7.css

@@ -1 +0,0 @@
-.setBtn[data-v-0dad9994]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-5572fd9c]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-5572fd9c]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

dist/static/css/chunk-755bc695.cdda01e3.css → dist/static/css/chunk-3112337f.c65a5178.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-593991d4]{font-size:14px}.btnList[data-v-593991d4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-593991d4]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-90107580]{font-size:14px}.btnList[data-v-90107580]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-90107580]{margin-right:15px}

dist/static/css/chunk-43d1d8c2.a47baed6.css

@@ -0,0 +1 @@
+.floor[data-v-064430f0]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-064430f0]{background:#f85043;margin-left:164px}.floor .add[data-v-064430f0],.floor .remove[data-v-064430f0]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-064430f0]{background:#14928a;margin-left:20px}.studentMask[data-v-064430f0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-064430f0]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-064430f0]{margin-bottom:20px}.studentMask .left h4[data-v-064430f0]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-064430f0]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-064430f0]{padding-left:10px;line-height:25px}.studentMask .right .tableList[data-v-064430f0]{max-height:500px;overflow-y:auto}.el-date-editor.el-input[data-v-064430f0],.el-date-editor.el-input__inner[data-v-064430f0]{width:100px}

dist/static/css/chunk-670d72f8.64d2428a.css

@@ -0,0 +1 @@
+.setBtn[data-v-ed788c88]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-9994dfb6]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-9994dfb6]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

dist/static/css/chunk-98da1dcc.a0913f45.css

@@ -1 +0,0 @@
-.floor[data-v-6dbd1cdc]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-6dbd1cdc]{background:#f85043;margin-left:164px}.floor .add[data-v-6dbd1cdc],.floor .remove[data-v-6dbd1cdc]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-6dbd1cdc]{background:#14928a;margin-left:20px}.studentMask[data-v-6dbd1cdc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-6dbd1cdc]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-6dbd1cdc]{margin-bottom:20px}.studentMask .left h4[data-v-6dbd1cdc]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-6dbd1cdc]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-6dbd1cdc]{padding-left:10px;line-height:25px}.studentMask .right .tableList[data-v-6dbd1cdc]{max-height:500px;overflow-y:auto}.el-date-editor.el-input[data-v-6dbd1cdc],.el-date-editor.el-input__inner[data-v-6dbd1cdc]{width:100px}

src/api/buildTeam.js

@@ -208,9 +208,9 @@ export function removeAllClass (data) {
 // 确认是否所有学生和单技能班都被分配完成
 export function checkAllStudent (data) {
   return request({
-    url: api + '/classGroup/findAllClassGroupByMusicGroup',
-    method: 'get',
-    params: data
+    url: api + '/classGroup/addMusicGroupTeam',
+    method: 'POST',
+    data: qs.stringify(data)
 
   })
 }

src/router/index.js

@@ -168,7 +168,7 @@ export const asyncRoutes = {
   resetClass: () => import('@/views/teamDetail/components/resetClass'),
   // 发放清单
   teamDetailedList: () => import('@/views/teamDetail/teamDetailedList'),
-  // 小班课设置
+  // 基础技能班设置
   setImprovement: () => import('@/views/teamBuild/teamSeting/components/setImprovement'),
   // 乐团修改 @/views/resetTeaming/index
   resetTeaming: () => import('@/views/resetTeaming/index'),

src/utils/searchArray.js

@@ -4,7 +4,7 @@
 const courseType = [
   { label: '单技课', value: 'SINGLE' },
   { label: '合奏课', value: 'MIX' },
-  { label: '小班课', value: 'HIGH' },
+  { label: '基础技能班', value: 'HIGH' },
   { label: 'VIP课', value: 'VIP' },
   { label: '试听课', value: 'DEMO' },
   { label: '综合课', value: 'COMPREHENSIVE' },

src/utils/vueFilter.js

@@ -75,7 +75,7 @@ Vue.filter('coursesType', (value) => {
   let template = {
     SINGLE: '单技课',
     MIX: "合奏课",
-    HIGH: "小班课",
+    HIGH: "基础技能班",
     VIP: "VIP课",
     DEMO: "试听课",
     COMPREHENSIVE: '综合课',
@@ -229,7 +229,7 @@ Vue.filter('sex', value => {
 
 // 服从调剂 isAllowAdjust
 Vue.filter('isAllowAdjust', value => {
-  let template = ['不允许调剂', '允许调剂']
+  let template = ['否', '是']
   return template[value]
 })
 // 学员缴费状态 paymentStatus

src/views/categroyManager/insideSetting/gradientSet.vue

@@ -54,7 +54,7 @@
                 </el-form-item>
             </el-form>
         </el-tab-pane>
-        <el-tab-pane label="小班课">
+        <el-tab-pane label="基础技能班">
             <el-form :model="highForm" label-width="100px" class="demo-dynamic">
                 <el-form-item style="margin-bottom: 0;">
                     <span class="min">最小值</span>

src/views/studentManager/components/studentRecord.vue

@@ -5,28 +5,38 @@
              class="searchForm"
              v-model="searchForm">
       <el-form-item>
-        <el-select v-model="searchForm.classGroupType" placeholder="课程类型">
-          <el-option v-for="(item, index) in courseArray" :key="index" 
-            :label="item.label" :value="item.value"></el-option>
+        <el-select v-model="searchForm.classGroupType"
+                   placeholder="课程类型">
+          <el-option v-for="(item, index) in courseArray"
+                     :key="index"
+                     :label="item.label"
+                     :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.attendanceStatus" placeholder="考勤状态">
-          <el-option v-for="(item, index) in att" :key="index" 
-            :label="item.label" :value="item.value"></el-option>
+        <el-select v-model="searchForm.attendanceStatus"
+                   placeholder="考勤状态">
+          <el-option v-for="(item, index) in att"
+                     :key="index"
+                     :label="item.label"
+                     :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-input placeholder="班级名称" v-model="searchForm.classGroupName"></el-input>
+        <el-input placeholder="班级名称"
+                  v-model="searchForm.classGroupName"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-input placeholder="老师姓名" v-model="searchForm.teacherName"></el-input>
+        <el-input placeholder="老师姓名"
+                  v-model="searchForm.teacherName"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
       <el-form-item>
-        <el-button @click="onReSet" type="primary">重置</el-button>
+        <el-button @click="onReSet"
+                   type="primary">重置</el-button>
       </el-form-item>
     </el-form>
     <!-- 查询列表 -->
@@ -41,15 +51,17 @@
     </div> -->
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align='center' prop="courseDate"
+      <el-table :data='tableList'
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align='center'
+                         prop="courseDate"
                          label="上课时间">
         </el-table-column>
         <el-table-column align='center'
                          label="星期几">
           <template slot-scope="scope">
             {{ scope.row.courseDate | formatWeek }}
-          </template>             
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          label="课程类型">
@@ -57,16 +69,20 @@
             {{ scope.row.classGroupType | coursesType }}
           </template>
         </el-table-column>
-        <el-table-column align='center' prop="classGroupName"
+        <el-table-column align='center'
+                         prop="classGroupName"
                          label="班级名称">
         </el-table-column>
-        <el-table-column align='center' prop="currentCLassTimes"
+        <el-table-column align='center'
+                         prop="currentCLassTimes"
                          label="当前课次">
         </el-table-column>
-        <el-table-column align='center' prop="teacherName"
+        <el-table-column align='center'
+                         prop="teacherName"
                          label="课程老师">
         </el-table-column>
-        <el-table-column align='center' prop="attendanceStatus"
+        <el-table-column align='center'
+                         prop="attendanceStatus"
                          label="考勤状态">
           <template slot-scope="scope">
             {{ scope.row.attendanceStatus | clockingIn }}
@@ -101,7 +117,7 @@ export default {
       courseArray: [
         { label: '单技课', value: 'NORMAL' },
         { label: '合奏课', value: 'MIX' },
-        { label: '小班课', value: 'HIGH' },
+        { label: '基础技能班', value: 'HIGH' },
         { label: 'VIP课', value: 'VIP' },
         { label: '试听课', value: 'DEMO' }
       ],
@@ -126,7 +142,7 @@ export default {
 
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
   },
   methods: {
@@ -135,13 +151,13 @@ export default {
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
       findStudentAttendances(params).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }
       })
     },
-    onReSet() { // 重置搜索
+    onReSet () { // 重置搜索
       this.searchForm = {
         userId: this.$route.query.userId,
         classGroupType: null,

src/views/studentManager/components/teamAndcourse.vue

@@ -143,7 +143,7 @@ export default {
       courseArray: [
         { label: '单技课', value: 'NORMAL' },
         { label: '合奏课', value: 'MIX' },
-        { label: '小班课', value: 'HIGH' },
+        { label: '基础技能班', value: 'HIGH' },
         { label: 'VIP课', value: 'VIP' },
         { label: '试听课', value: 'DEMO' }
       ],

src/views/teamBuild/signupList.vue

@@ -47,9 +47,9 @@
         <el-form-item label="是否允许调剂">
           <el-select v-model="searchFrom.isAllowAdjust"
                      clearable>
-            <el-option label="允许调剂"
+            <el-option label="是"
                        value="1"></el-option>
-            <el-option label="不允许调剂"
+            <el-option label="否"
                        value="0"></el-option>
           </el-select>
         </el-form-item>
@@ -88,6 +88,10 @@
                            prop='applyStudentNum'
                            align='center'>
           </el-table-column>
+          <el-table-column label="已缴费"
+                           prop='payNum'
+                           align='center'>
+          </el-table-column>
         </el-table>
         <div class="btnWrap"
              style="margin-right:20px;  margin-top:20px;">
@@ -781,7 +785,7 @@ export default {
     flex-direction: row;
     justify-content: flex-start;
     .left {
-      width: 304px;
+      width: 340px;
       background-color: #fff;
       height: 80vh;
       overflow: auto;

src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -57,7 +57,7 @@
                               :picker-options="{
                              start: '06:30',
                              step: '00:05',
-                             end: '18:30'
+                             end: '23:30'
                                             }">
               </el-time-select>
 

src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -30,7 +30,7 @@
     <div class="tableWrap">
       <el-table :data="tableList">
         <el-table-column prop="name"
-                         label="提高班名称">
+                         label="基础技能班名称">
         </el-table-column>
         <el-table-column prop="subjectIdList"
                          label="声部">
@@ -77,7 +77,7 @@
            @click='gotoNext'>下一步</div>
       <!-- <div class="okBtn">返回</div> -->
     </div>
-    <el-dialog title="添加提高班"
+    <el-dialog title="基础技能班"
                :visible.sync="raiseVisible"
                width="40%">
       <el-form :model="maskForm"
@@ -85,14 +85,15 @@
                :rules="maskRules"
                :label-position="labelPosition"
                label-width="100px">
-        <el-form-item label="提高班名称"
+        <el-form-item label="名称"
                       prop="name">
           <el-input v-model="maskForm.name"
                     style='width:180px;'></el-input>
         </el-form-item>
-        <el-form-item label="提高班声部"
+        <el-form-item label="声部"
                       prop="sound">
-          <el-select v-model="maskForm.sound">
+          <el-select v-model="maskForm.sound"
+                     multiple>
             <el-option v-for="(item,index) in soundList"
                        :key='index'
                        :label="item.name"
@@ -149,7 +150,7 @@
                             start: '06:30',
                             step: '00:15',
                             end: '23:30',
-                            minTime: maskForm.endTime
+                            minTime: maskForm.startTime
                           }">
           </el-time-select>
         </el-form-item>
@@ -186,7 +187,7 @@ export default {
       },
       maskForm: {
         name: '',
-        sound: '',
+        sound: [],
         count: '',
         teacher: '',
         startTime: '',
@@ -250,7 +251,7 @@ export default {
             'musicGroupId': this.teamid,
             'teachMode': 'OFFLINE',
             'name': this.maskForm.name,
-            'subjectIdList': this.maskForm.sound,
+            'subjectIdList': this.maskForm.sound.join(','),
             'moid': new Date().getTime(),
             'startDate': this.topForm.timer
           }
@@ -271,21 +272,26 @@ export default {
       }
     },
     addClass () {
+      this.raiseVisible = true;
+
+    },
+    gotoNext () {
       this.$refs['topForm'].validate(res => {
         if (res) {
-          this.raiseVisible = true;
+          for (let i in this.tableList) {
+            this.tableList[i].startDate = this.topForm.timer;
+          }
+          addHighClass(this.tableList).then(res => {
+            if (res.code == 200) {
+              this.$message.success('恭喜您创建成功')
+              this.$emit('gotoNav', 4)
+            }
+          })
         } else {
-          // this.$message.error('请先输入排课数量')
-        }
-      })
-    },
-    gotoNext () {
-      addHighClass(this.tableList).then(res => {
-        if (res.code == 200) {
-          this.$message.success('恭喜您创建成功')
-          this.$emit('goNav', 4)
+          this.$message.error('请先输入排课数量和开始时间')
         }
       })
+
     }
   },
   filters: {

src/views/teamBuild/teamSeting/components/lookCourse.vue

@@ -3,7 +3,7 @@
     <el-form :inline="true">
       <el-form-item>
         <div class="newBand"
-             @click="gotoPlan">新增/修改</div>
+             @click="gotoPlan">新增</div>
       </el-form-item>
       <el-form-item label="选择合奏班">
         <el-select v-model="chioseMix"

src/views/teamBuild/teamSeting/components/setClass.vue

@@ -482,7 +482,7 @@ export default {
 
           }).catch(res => {
             this.teacherVisible = false;
-            this.$refs['teacherForm'].resetFields();
+            this.teacherForm.name = '';
             console.log('验证失败')
           })
         }

src/views/teamBuild/teamSeting/components/setImprovement.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class='squrt'></div>提高班报名详情
+      <div class='squrt'></div>基础技能班报名详情
     </h2>
     <div class='m-core'>
       <div class="tableWrap">

src/views/teamBuild/teamSeting/components/setTeacher.vue

@@ -16,11 +16,16 @@
                          prop='name'
                          width="160px">
         </el-table-column>
+        <el-table-column label="所属合奏班"
+                         prop='mixClassName'
+                         width="160px">
+        </el-table-column>
         <el-table-column label="主教老师"
                          width="200px">
           <template slot-scope="scope">
             <div>
               <el-select v-model="scope.row.coreTeacher"
+                         clearable
                          @change="setCoreTeacher"
                          v-if='teacherList'>
                 <el-option v-for='(item,index) in teacherList'
@@ -36,7 +41,9 @@
           <template slot-scope="scope">
             <div>
               <el-select class='tableClass'
+                         @change="chioseAssistant(scope.row)"
                          v-if='teacherList'
+                         :disabled="!scope.row.coreTeacher"
                          multiple
                          v-model="scope.row.assistant">
                 <el-option v-for='(item,index) in teacherList'
@@ -62,6 +69,7 @@
           <template slot-scope="scope">
             <div>
               <el-select v-model="scope.row.coreTeacher"
+                         clearable
                          v-if='teacherList'>
                 <el-option v-for='(item,index) in teacherList'
                            :label="item.username"
@@ -77,7 +85,9 @@
             <div>
               <!-- v-if='scope.row.assistant' -->
               <el-select class='tableClass'
+                         @change="chioseAssistant(scope.row)"
                          multiple
+                         :disabled="!scope.row.coreTeacher"
                          v-model="scope.row.assistant">
                 <el-option v-for='(item,index) in teacherList'
                            :label="item.username"
@@ -177,10 +187,10 @@ export default {
           isTeachers.push(false)
         }
       }
-      if (singinListTeacher.length != [...new Set(singinListTeacher)].length) {
-        this.$message.error('存在老师设置冲突，请调整')
-        return
-      }
+      // if (singinListTeacher.length != [...new Set(singinListTeacher)].length) {
+      //   this.$message.error('存在老师设置冲突，请调整')
+      //   return
+      // }
 
       for (let j in this.allList) {
         allListTeacher.push(this.allList[j].coreTeacher);
@@ -189,10 +199,10 @@ export default {
           isTeachers.push(false)
         }
       }
-      if (allListTeacher.length != [...new Set(allListTeacher)].length) {
-        this.$message.error('存在老师设置冲突，请调整')
-        return
-      }
+      // if (allListTeacher.length != [...new Set(allListTeacher)].length) {
+      //   this.$message.error('存在老师设置冲突，请调整')
+      //   return
+      // }
       isTeachers.filter(item => {
         isTeacher = isTeacher && item
       })
@@ -229,7 +239,15 @@ export default {
       }
     },
     setCoreTeacher (val) {
-      console.log(this.teacherList)
+    },
+    chioseAssistant (row) {
+      for (let i in row.assistant) {
+        if (row.assistant[i] == row.coreTeacher) {
+          row.assistant = [];
+          this.$message.error('同一个班主教助教不能相同')
+          return
+        }
+      }
     }
   },
 

src/views/teamBuild/teamSeting/index.vue

@@ -43,7 +43,7 @@
               @click="activeIndex=3">
           <div class="step2 sptep"
                :class="activeIndex >= 3?'activestep':''">
-            小班课
+            基础技能班
           </div>
           <img :src="activeIndex >= 3?stepImgs.nol:stepImgs.active"
                alt=""
@@ -76,7 +76,9 @@
       </div>
       <div v-if='activeIndex==2'>
         <!-- <coursePlan :teamid='id' /> -->
-        <lookCourse @gotoNav='gotoNav' />
+        <div class="m-container">
+          <lookCourse @gotoNav='gotoNav' />
+        </div>
       </div>
       <div v-if='activeIndex==3 && chargeTypeId==3'>
         <improvement :teamid='id'

src/views/teamDetail/components/classList.vue

@@ -109,7 +109,7 @@ export default {
   methods: {
     getList () {
       // search: this.teamid
-      getClassList({ search: this.teamid }).then(res => {
+      getClassList({ search: this.teamid, page: this.rules.page, rows: this.rules.limit }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total

src/views/teamDetail/components/courseList.vue

@@ -8,22 +8,20 @@
         <el-select v-model="searchForm.courseStatus"
                    clearable
                    placeholder="课程类型">
-          <el-option label="合奏课"
-                     value="MIX"></el-option>
-          <el-option label="小班课"
+          <el-option label="基础技能班"
                      value="HIGH"></el-option>
-          <el-option label="VIP课"
-                     value="VIP"></el-option>
-          <el-option label="试听课"
-                     value="DEMO"></el-option>
           <el-option label="综合课"
                      value="COMPREHENSIVE"></el-option>
-          <el-option label="练习课"
-                     value="PRACTICE"></el-option>
-          <el-option label="启蒙课"
-                     value="ENLIGHTENMENT"></el-option>
-          <el-option label="集训课"
-                     value="TRAINING"></el-option>
+          <el-option label="课堂课"
+                     value="CLASSROOM"></el-option>
+          <el-option label="合奏课"
+                     value="MIX"></el-option>
+          <el-option label="集训合奏课"
+                     value="TRAINING_MIX"></el-option>
+          <el-option label="集训单技课"
+                     value="TRAINING_SINGLE"></el-option>
+          <el-option label="单技课"
+                     value="SINGLE"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="课程状态">
@@ -272,7 +270,8 @@ export default {
         classScheduleType: this.searchForm.courseStatus || null,
         musicGroupId: this.teamid,
         startTime: this.searchForm.timer[0] || null,
-        endTime: this.searchForm.timer[1] || null
+        endTime: this.searchForm.timer[1] || null,
+        page: this.rules.page, rows: this.rules.limit
 
       }
       getCourseList(obj).then(res => {

src/views/teamDetail/components/resetClass.vue

@@ -400,7 +400,7 @@ export default {
         { value: 'MIX', label: '合奏课' },
         { value: 'TRAINING_SINGLE', label: '集训单技课' },
         { value: 'TRAINING_MIX', label: '集训合奏课' },
-        { value: 'HIGH', label: '小班课' },
+        { value: 'HIGH', label: '基础技能班' },
         { value: 'COMPREHENSIVE', label: '综合课' },
         { value: 'CLASSROOM', label: '课堂课' },
       ],

src/views/teamDetail/components/salaryList.vue

@@ -197,6 +197,7 @@ export default {
         musicGroupId: this.teamid,
         startTime: this.searchForm.date[0] || null,
         endTime: this.searchForm.date[1] || null,
+        page: this.rules.page, rows: this.rules.limit
       }
       getCourseList(obj).then(res => {
         if (res.code == 200) {

src/views/teamDetail/teamList.vue

@@ -127,7 +127,7 @@
               <div>
                 <el-button type="text"
                            v-if="scope.row.status == 'PREPARE'"
-                           @click="gotoImprovement(scope.row)">小班课设置</el-button>
+                           @click="gotoImprovement(scope.row)">基础技能班设置</el-button>
                 <el-button type="text"
                            v-if="scope.row.status == 'PREPARE'"
                            @click="gotodetailList(scope.row)">发放清单</el-button>
@@ -400,7 +400,7 @@ export default {
       // row.id
       this.$router.push({ path: '/business/teamDetailedList', query: { id: row.id } })
     },
-    // setImprovement 设置小班课
+    // setImprovement 设置基础技能班
     gotoImprovement (row) {
       this.$router.push({ path: '/business/setImprovement', query: { id: row.id } })
     },