Merge branch 'tmp_meeting_needs' into online

src/api/buildTeam.js

@@ -107,7 +107,7 @@ export function getTeamRecruit (data) {
   })
 }
 
-// 获取乐团单技班
+// 获取乐团声部班
 export function getSingleClass (data) {
   return request({
     url: api + '/classGroup/findMusicGroupClass',
@@ -163,7 +163,7 @@ export function createClass (data) {
 
   })
 }
-// 新增单技课班
+// 新增声部课班
 export function addSingleClass (data) {
   return request({
     url: api + '/classGroup/add',
@@ -173,7 +173,7 @@ export function addSingleClass (data) {
   })
 }
 
-// 删除单技课班
+// 删除声部课班
 export function removeSingleClass (data) {
   return request({
     url: api + '/classGroup/delSingle',
@@ -183,7 +183,7 @@ export function removeSingleClass (data) {
   })
 }
 
-// 获取未分班的单技班
+// 获取未分班的声部班
 export function findNoClassSingle (data) {
   return request({
     url: api + '/classGroup/findNoClassSubjects',
@@ -223,7 +223,7 @@ export function removeAllClass (data) {
   })
 }
 
-// 确认是否所有学生和单技能班都被分配完成
+// 确认是否所有学生和声部能班都被分配完成
 export function checkAllStudent (data) {
   return request({
     url: api + '/classGroup/addMusicGroupTeam',
@@ -262,7 +262,7 @@ export function setTeamTeacher (data) {
 //   })
 // }
 
-// 根据合奏班获取合奏班下的所有单技能班
+// 根据合奏班获取合奏班下的所有声部能班
 
 export function getAllSignClass (data) {
   return request({
@@ -272,7 +272,7 @@ export function getAllSignClass (data) {
   })
 }
 
-// 根据合奏班id获取单技班以及老师
+// 根据合奏班id获取声部班以及老师
 export function getAllSignClassandTeacher (data) {
   return request({
     url: api + '/classGroup/classGroupAndTeacher',
@@ -1121,7 +1121,7 @@ export function getReviewsInfo (data) {
 
 
 
-// 获取所有教务老师
+// 获取所有乐团主管
 export function findEducationUsers (data) {
   return request({
     url: api + '/employee/findEducationUsers',
@@ -1444,7 +1444,7 @@ export function mergeClassSplitClassAffirm (data) {
 export function getOrganCourseDurationSettings (data) {
   return request2({
     url: api + `/organizationCourseDurationSettings/queryByOrganId`,
-    method: 'get', 
+    method: 'get',
     params:data,
     data:{}
   })

src/api/systemManage.js

@@ -325,7 +325,7 @@ export function resetAppVersionInfo (data) {
   })
 }
 
-// 判断该用户是否是教务老师关联的学生乐团 employee/hasCourseGroupRelation
+// 判断该用户是否是乐团主管关联的学生乐团 employee/hasCourseGroupRelation
 export function hasCourseGroupRelation (data) {
   return request({
     url: api + '/employee/hasCourseGroupRelation',
@@ -334,7 +334,7 @@ export function hasCourseGroupRelation (data) {
   })
 }
 
-// 教务老师转移课程
+// 乐团主管转移课程
 
 export function updateEducationTeacherId (data) {
   return request({
@@ -342,4 +342,4 @@ export function updateEducationTeacherId (data) {
     method: 'post',
     data: qs.stringify(data)
   })
-}
+}

src/constant/index.js

@@ -26,11 +26,11 @@ export const feeProject = {
   19: '退费',
 }
 export const filterCourseType = {
-  SINGLE: '单技课',
+  SINGLE: '声部课',
   MIX: '合奏课',
   HIGH: '基础训练课',
   COMPREHENSIVE: '综合课',
-  TRAINING_SINGLE: '集训单技课',
+  TRAINING_SINGLE: '集训声部课',
   TRAINING_MIX: '集训合奏课',
   HIGH_ONLINE: '网络基础训练课',
   MUSIC_NETWORK: '乐团网管课',

src/router/notKeepAliveList.js

@@ -5,6 +5,7 @@ export default [
   '/business/teamCourseList',
   '/business/auditList',
   '/journal/payAppeal',
-  '/orderList/financeManager'
+  '/orderList/financeManager',
   // '/operateManager/HumanResources'
+  '/vipClassSet/vipNewActive'
 ]

src/utils/searchArray.js

@@ -2,7 +2,7 @@
 import { payOrderType, auditType, auditPaymentType, orderServerType, orderAuditType,classTime } from '../constant'
 // 课程类型
 export const courseType = [
-  { label: "单技课", value: "SINGLE" },
+  { label: "声部课", value: "SINGLE" },
   { label: "合奏课", value: "MIX" },
   { label: "基础技能课", value: "HIGH" },
   { label: "线上基础技能课", value: "HIGH_ONLINE" },
@@ -12,19 +12,19 @@ export const courseType = [
   { label: "网管课", value: "PRACTICE" },
   { label: "乐团网管课", value: "MUSIC_NETWORK" },
   { label: "启蒙课", value: "ENLIGHTENMENT" },
-  { label: "集训单技课", value: "TRAINING_SINGLE" },
+  { label: "集训声部课", value: "TRAINING_SINGLE" },
   { label: "集训合奏课", value: "TRAINING_MIX" },
   { label: "课堂课", value: "CLASSROOM" },
   { label: "对外课", value: "COMM" }
 ]
 
 export const musicCourseType = [
-  { label: "单技课", value: "SINGLE" },
+  { label: "声部课", value: "SINGLE" },
   { label: "合奏课", value: "MIX" },
   { label: "基础技能课", value: "HIGH" },
   { label: "线上基础技能课", value: "HIGH_ONLINE" },
   { label: "乐团网管课", value: "MUSIC_NETWORK" },
-  { label: "集训单技课", value: "TRAINING_SINGLE" },
+  { label: "集训声部课", value: "TRAINING_SINGLE" },
   { label: "集训合奏课", value: "TRAINING_MIX" },
   { label: "课堂课", value: "CLASSROOM" },
   { label: "综合课", value: "COMPREHENSIVE" },
@@ -195,7 +195,7 @@ export const stockType = [
   { value: 'EXTERNAL', label: '外部' },
   { value: 'ALL', label: '全部' }
 ]
-export const classTimeList = getValueForKey(classTime) 
+export const classTimeList = getValueForKey(classTime)
 
 export const payOrderTypeList = getValueForKey(payOrderType)
 export const auditTypeList = getValueForKey(auditType)

src/utils/utils.js

@@ -66,8 +66,8 @@ export const getCourseType=(type)=>{
   switch (type) {
     case "NORMAL": {
       arr = [
-        { value: "SINGLE", label: "单技课" },
-        { value: "TRAINING_SINGLE", label: "集训单技课" },
+        { value: "SINGLE", label: "声部课" },
+        { value: "TRAINING_SINGLE", label: "集训声部课" },
         { value: "COMPREHENSIVE", label: "综合课" },
         { value: "CLASSROOM", label: "课堂课" },
       ];
@@ -100,9 +100,9 @@ export const getCourseType=(type)=>{
     }
     case "SNAP": {
       arr = [
-        { value: "SINGLE", label: "单技课" },
+        { value: "SINGLE", label: "声部课" },
         { value: "MIX", label: "合奏课" },
-        { value: "TRAINING_SINGLE", label: "集训单技课" },
+        { value: "TRAINING_SINGLE", label: "集训声部课" },
         { value: "TRAINING_MIX", label: "集训合奏课" },
         { value: "HIGH", label: "基础技能课" },
         { value: "COMPREHENSIVE", label: "综合课" },
@@ -111,4 +111,4 @@ export const getCourseType=(type)=>{
     }
   }
   return arr
-}
+}

src/utils/vueFilter.js

@@ -76,8 +76,8 @@ Vue.filter('instrumentType', (value) => {
 // 课程类型
 Vue.filter('coursesType', (value) => {
   let template = {
-    NORMAL: '单技课',
-    SINGLE: '单技课',
+    NORMAL: '声部课',
+    SINGLE: '声部课',
     MIX: "合奏课",
     HIGH: "基础技能课",
     VIP: "VIP课",
@@ -86,7 +86,7 @@ Vue.filter('coursesType', (value) => {
     // PRACTICE: '练习课',
     ENLIGHTENMENT: '启蒙课',
     TRAINING: '集训课',
-    TRAINING_SINGLE: '集训单技课',
+    TRAINING_SINGLE: '集训声部课',
     TRAINING_MIX: '集训合奏课',
     CLASSROOM: '课堂课',
     PRACTICE: '网管课',
@@ -203,7 +203,7 @@ Vue.filter('formatWeek', date => {
 Vue.filter('jobType', value => {
   let template = {
     ADVISER: "指导老师",
-    ACADEMIC: "教务老师",
+    ACADEMIC: "乐团主管",
     TEACHING: "乐队指导"
   }
   return template[value]
@@ -376,7 +376,7 @@ Vue.filter('studentSign', value => {
 // 班级类型
 Vue.filter('classType', value => {
   let template = {
-    NORMAL: "单技班",
+    NORMAL: "声部班",
     MIX: '合奏班',
     HIGH: '基础技能班',
     VIP: 'VIP',
@@ -594,7 +594,7 @@ Vue.filter('isProbationPeriod', value => {
 Vue.filter('visiterType', value => {
   let template = {
     'TEACHER': "指导老师",
-    'EDU_TEACHER': "教务老师",
+    'EDU_TEACHER': "乐团主管",
   }
   return template[value]
 })

src/views/HumanResources/form.vue

@@ -214,7 +214,7 @@
                             placeholder="请选择职位">
                     <el-option label="指导老师"
                               value="ADVISER"></el-option>
-                    <el-option label="教务老师"
+                    <el-option label="乐团主管"
                               value="ACADEMIC"></el-option>
                     <el-option label="乐队指导"
                               value="TEACHING"></el-option>

src/views/HumanResources/index.vue

@@ -55,7 +55,7 @@
                      placeholder="请选择职位">
             <el-option label="指导老师"
                        value="ADVISER"></el-option>
-            <el-option label="教务老师"
+            <el-option label="乐团主管"
                        value="ACADEMIC"></el-option>
             <el-option label="乐队指导"
                        value="TEACHING"></el-option>

src/views/accompanyManager/accompanyList.vue

@@ -51,7 +51,7 @@
                      v-model.trim="searchForm.hasEducationalTeacherId"
                      filterable
                      clearable
-                     placeholder="是否有教务老师">
+                     placeholder="是否有乐团主管">
             <el-option label="是"
                        value="true"></el-option>
             <el-option label="否"
@@ -130,7 +130,7 @@
           <!-- educationalTeacherId -->
           <el-table-column align="center"
                            prop="educationalTeacherName"
-                           label="教务老师"></el-table-column>
+                           label="乐团主管"></el-table-column>
           <el-table-column align="center"
                            prop="teacherName"
                            label="指导老师"></el-table-column>
@@ -608,4 +608,4 @@ export default {
     margin-right: 10px;
   }
 }
-</style>
+</style>

src/views/accompanyManager/accompanys.vue

@@ -304,7 +304,7 @@
                        :label="item.realName"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="教务老师"
+        <el-form-item label="乐团主管"
                       v-show="isMultiple">
           <el-select v-model.trim="teacherForm.educationalTeacherId"
                      filterable
@@ -565,7 +565,7 @@ export default {
       teacherRules: {
         teacher: [{ required: true, message: "请选择老师", trigger: "blur" }],
         subjectId: [{ required: true, message: "请选择声部", trigger: "blur" }],
-        educationalTeacherId: [{ required: true, message: "请选择教务老师", trigger: "blur" }]
+        educationalTeacherId: [{ required: true, message: "请选择乐团主管", trigger: "blur" }]
       },
       teacherForm: {
         teacher: null,
@@ -642,7 +642,7 @@ export default {
       if (this.$route.query.searchForm) {
         this.FsearchForm = this.$route.query.searchForm;
       }
-      //  获取教务老师
+      //  获取乐团主管
       findEducationUsers({
 
       }).then(res => {
@@ -1171,4 +1171,4 @@ export default {
     width: 100px !important;
   }
 }
-</style>
+</style>

src/views/buildVip/index.vue

@@ -41,7 +41,7 @@
                          :value="item.id" />
             </el-select>
           </el-form-item>
-          <el-form-item label="教务老师"
+          <el-form-item label="乐团主管"
                         prop="educationalTeacherId">
             <el-select v-model.trim="leftForm.educationalTeacherId"
                        filterable
@@ -646,7 +646,7 @@ export default {
         }
       });
 
-      //  获取教务老师
+      //  获取乐团主管
       findEducationUsers({}).then(res => {
         if (res.code == 200) {
           this.educationList = res.data;
@@ -1311,7 +1311,7 @@ export default {
       // 初始化上课学生
       this.studentList = []
       this.leftForm.students = []
-      if (!teacher || !educationalTeacherId) { // 如果没有选择指导老师和教务老师则不请求
+      if (!teacher || !educationalTeacherId) { // 如果没有选择指导老师和乐团主管则不请求
         return
       }
       getPublicOrgans({

src/views/businessManager/orderManager/salesList.vue

@@ -176,7 +176,7 @@
                            label="所属学校"></el-table-column>
           <el-table-column align='center'
                            prop="eduTeacher"
-                           label="教务老师"></el-table-column>
+                           label="乐团主管"></el-table-column>
           <el-table-column align='center'
                            prop="receiveStatus"
                            label="确认收货">
@@ -284,12 +284,12 @@
                              :fetch-suggestions="querySearch"
                              placeholder="请输入成本"></el-autocomplete>
           </el-form-item>
-          <el-form-item label="教务老师"
+          <el-form-item label="乐团主管"
                         :label-width="formLabelWidth">
             <el-select v-model.trim="form.eduTeacherId"
                        filterable
                        clearable
-                       placeholder="请选择教务老师">
+                       placeholder="请选择乐团主管">
               <el-option v-for="(item,index) in educationList"
                          :key="index"
                          :value="item.userId"

src/views/businessManager/resetList/index.vue

@@ -84,7 +84,7 @@
                 <el-form-item label="更换金额(元)">
                   <span>{{ props.row.changeMusicalPrice |moneyFormat}}</span>
                 </el-form-item>
-                <el-form-item label="教务老师">
+                <el-form-item label="乐团主管">
                   <span>{{ props.row.eduTeacher }}</span>
                 </el-form-item>
                 <el-form-item label="交易方式">
@@ -327,4 +327,4 @@ export default {
 /deep/.demo-table-expand label {
   color: #99a9bf;
 }
-</style>
+</style>

src/views/categroyManager/insideSetting/gradientSet.vue

@@ -4,7 +4,7 @@
     <div class="m-core">
       <!-- 列表 -->
       <el-tabs tab-position="left">
-        <el-tab-pane label="单技课">
+        <el-tab-pane label="声部课">
           <el-form :model="singleForm"
                    label-width="100px"
                    class="demo-dynamic">
@@ -339,4 +339,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/categroyManager/insideSetting/staffManager.vue

@@ -261,11 +261,11 @@
       <el-form :model="educationForm"
                :inline="true"
                ref="educationForm">
-        <el-form-item label="教务老师"
+        <el-form-item label="乐团主管"
                       :rules="[{
                       required:
                       true,
-                      message: '请选择教务老师'
+                      message: '请选择乐团主管'
                       ,
                       trigger: 'blur'
                       }]">
@@ -539,7 +539,7 @@ export default {
         if (type === 'DEMISSION' && !data.demissionDate) {
           this.activeRow = data;
           // 1.点击的是离职按钮
-          // 2.判断该考级是否存在教务老师
+          // 2.判断该考级是否存在乐团主管
           const status = await this.checkStatus(data)
           if (!status) {
             return
@@ -613,4 +613,4 @@ export default {
 /deep/.el-date-editor.el-input {
   width: 100% !important;
 }
-</style>
+</style>

src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -63,7 +63,7 @@
                         :label-width="formLabelWidth">
             <el-radio-group :disabled="formActionTitle == 'update' ? true: false"
                             v-model.trim="form.classGroupType">
-              <el-radio label="NORMAL">单技课</el-radio>
+              <el-radio label="NORMAL">声部课</el-radio>
               <el-radio label="MIX">合奏课</el-radio>
             </el-radio-group>
           </el-form-item>
@@ -120,7 +120,7 @@ export default {
         create: '添加作业模板',
         update: '修改作业模板'
       },
-      jobStatus: false, // 添加教学点 
+      jobStatus: false, // 添加教学点
       formLabelWidth: '120px',
       form: {
         name: null, // 作业模块名称
@@ -269,4 +269,4 @@ export default {
 /deep/.el-select {
   width: 98% !important;
 }
-</style>
+</style>

src/views/categroyManager/vipActiveList.vue

@@ -163,7 +163,7 @@
           <el-form-item label="活动名称"
                         prop="name">
             <el-input style="width:400px"
-                      disabled
+
                       v-model.trim="resetForm.name"></el-input>
           </el-form-item>
           <el-form-item label="适用分部"
@@ -171,7 +171,7 @@
             <el-select v-model.trim="resetForm.organ"
                        filterable
                        multiple
-                       disabled
+
                        clearable>
               <el-option v-for="(item,index) in organList"
                          :key="index"
@@ -185,7 +185,7 @@
             <el-select v-model.trim="resetForm.stauts"
                        filterable
                        clearable
-                       disabled
+
                        multiple>
               <el-option v-for="(item,index) in courseStatusList"
                          :key="index"
@@ -199,7 +199,7 @@
                       v-model.trim="resetForm.desc"
                       style="width:400px"
                       :rows="5"
-                      disabled
+
                       placeholder="请输入活动说明"></el-input>
           </el-form-item>
           <el-form-item label="活动时间"
@@ -235,10 +235,10 @@
           <div class="right">
             <div class="chioseWrap">
               <el-checkbox label="线上课"
-                           disabled
+
                            v-model.trim="online"></el-checkbox>
               <el-select v-model.trim="onlineSalary"
-                         disabled
+
                          clearable
                          filterable>
                 <el-option label="老师默认课酬"
@@ -250,7 +250,7 @@
               </el-select>
               <!--   v-show='onlineSalary!= "TEACHER_DEFAULT"' -->
               <el-input placeholder="请输入"
-                        disabled
+
                         style="width:150px"
                         type="number"
                         @mousewheel.native.prevent
@@ -259,7 +259,7 @@
                 <template slot="append">元</template>
               </el-input>
               <el-input placeholder="请输入"
-                        disabled
+
                         style="width:150px"
                         type="number"
                         @mousewheel.native.prevent
@@ -268,17 +268,17 @@
                 <template slot="append">%</template>
               </el-input>
               <el-checkbox label="是否参加梯度"
-                           disabled
+
                            style="margin-left:20px;"
                            v-model.trim="onlineClassJoinGradientRewards"></el-checkbox>
             </div>
             <div class="chioseWrap">
               <el-checkbox label="线下课"
-                           disabled
+
                            v-model.trim="unonline"></el-checkbox>
               <el-select v-model.trim="unonlineSalary"
                          filterable
-                         disabled
+
                          clearable>
                 <el-option label="老师默认课酬"
                            value="TEACHER_DEFAULT"></el-option>
@@ -289,7 +289,7 @@
               </el-select>
               <!-- unonlineSalary -->
               <el-input placeholder="请输入"
-                        disabled
+
                         style="width:150px"
                         type="number"
                         @mousewheel.native.prevent
@@ -298,7 +298,7 @@
                 <template slot="append">元</template>
               </el-input>
               <el-input placeholder="请输入"
-                        disabled
+
                         style="width:150px"
                         type="number"
                         @mousewheel.native.prevent
@@ -308,13 +308,13 @@
                 <template slot="append">%</template>
               </el-input>
               <el-checkbox label="是否参加梯度"
-                           disabled
+
                            style="margin-left:20px;"
                            v-model.trim="offlineClassJoinGradientRewards"></el-checkbox>
             </div>
             <div class="chioseWrap">
               <el-checkbox v-model.trim="paymentReadonlyFlag"
-                           disabled
+
                            label="可自定义单价"></el-checkbox>
               <!-- <el-checkbox v-model.trim="salaryReadonlyFlag"
                            disabled
@@ -999,4 +999,4 @@ export default {
 .ishidden {
   visibility: hidden;
 }
-</style>
+</style>

src/views/categroyManager/vipNewActive.vue

@@ -86,6 +86,7 @@
             <el-checkbox label="线上课"
                          v-model.trim="online"></el-checkbox>
             <el-select v-model.trim="onlineSalary"
+            disabled
                        clearable
                        filterable>
               <el-option label="老师默认课酬"
@@ -113,15 +114,16 @@
             </el-input>
             <div style="width:200px;"
                  v-if="onlineSalary== 'TEACHER_DEFAULT'"></div>
-            <el-checkbox label="是否参加梯度"
+            <!-- <el-checkbox label="是否参加梯度"
                          style="margin-left:20px;"
-                         v-model.trim="onlineClassJoinGradientRewards"></el-checkbox>
+                         v-model.trim="onlineClassJoinGradientRewards"></el-checkbox> -->
           </div>
           <div class="chioseWrap">
             <el-checkbox label="线下课"
                          v-model.trim="unonline"></el-checkbox>
             <el-select v-model.trim="unonlineSalary"
                        clearable
+                       disabled
                        filterable>
               <el-option label="老师默认课酬"
                          value="TEACHER_DEFAULT"></el-option>
@@ -148,16 +150,16 @@
             </el-input>
             <div style="width:200px;"
                  v-if="unonlineSalary== 'TEACHER_DEFAULT'"></div>
-            <el-checkbox label="是否参加梯度"
+            <!-- <el-checkbox label="是否参加梯度"
                          style="margin-left:20px;"
-                         v-model.trim="offlineClassJoinGradientRewards"></el-checkbox>
+                         v-model.trim="offlineClassJoinGradientRewards"></el-checkbox> -->
           </div>
-          <div class="chioseWrap">
+          <!-- <div class="chioseWrap">
             <el-checkbox v-model.trim="paymentReadonlyFlag"
                          label="可自定义单价"></el-checkbox>
-            <!-- <el-checkbox v-model.trim="salaryReadonlyFlag"
-                         label="可自定义课酬"></el-checkbox> -->
-          </div>
+            <el-checkbox v-model.trim="salaryReadonlyFlag"
+                         label="可自定义课酬"></el-checkbox>
+          </div> -->
         </div>
       </div>
       <div class="activeType">
@@ -282,12 +284,12 @@ export default {
   },
   activated () {
     this.onReSet()
-    if (this.$route.query.rules) {
-      this.rules = this.$route.query.rules;
-    }
-    if (this.$route.query.searchForm) {
-      this.searchForm = this.$route.query.searchForm;
-    }
+    // if (this.$route.query.rules) {
+    //   this.rules = this.$route.query.rules;
+    // }
+    // if (this.$route.query.searchForm) {
+    //   this.searchForm = this.$route.query.searchForm;
+    // }
 
     this.pageType = this.$route.query.type
     this.$refs.vipform.resetFields();
@@ -307,12 +309,12 @@ export default {
       }
     });
     this.onReSet()
-    if (this.$route.query.rules) {
-      this.rules = this.$route.query.rules;
-    }
-    if (this.$route.query.searchForm) {
-      this.searchForm = this.$route.query.searchForm;
-    }
+    // if (this.$route.query.rules) {
+    //   this.rules = this.$route.query.rules;
+    // }
+    // if (this.$route.query.searchForm) {
+    //   this.searchForm = this.$route.query.searchForm;
+    // }
 
     this.pageType = this.$route.query.type
     this.$refs.vipform.resetFields();
@@ -403,8 +405,7 @@ export default {
               this.$message.success("恭喜你,活动创建成功");
               this.onReSet();
               this.$router.push({
-                path: "/vipClassSet/vipActiveList",
-                query: { rules: this.rules, searchForm: this.searchForm }
+                path: "/vipClassSet/vipActiveList"
               });
             }
           });
@@ -555,4 +556,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/evaluateManager/networkList.vue

@@ -35,7 +35,7 @@
         <el-select v-model.trim="searchForm.eduTeacherId"
                    filterable
                    clearable
-                   placeholder="教务老师">
+                   placeholder="乐团主管">
           <el-option v-for="(item,index) in educationList"
                      :key="index"
                      :value="item.userId"
@@ -182,7 +182,7 @@
                          label="指导老师"></el-table-column>
         <el-table-column align="center"
                          prop="eduTeacherName"
-                         label="教务老师"></el-table-column>
+                         label="乐团主管"></el-table-column>
         <el-table-column align="center"
                          prop="type"
                          label="课程组类型"
@@ -297,7 +297,7 @@
           </div>
           <div class="leftCell"
                v-if="courseScheduleReview">
-            <p>教务老师</p>
+            <p>乐团主管</p>
             <p>{{courseScheduleReview.eduTeacherName}}</p>
           </div>
           <div class="leftCell">
@@ -738,4 +738,4 @@ export default {
 /deep/.el-tag {
   cursor: pointer;
 }
-</style>
+</style>

src/views/evaluateManager/vipEvaluateList.vue

@@ -35,7 +35,7 @@
         <el-select v-model.trim="searchForm.eduTeacherId"
                    filterable
                    clearable
-                   placeholder="教务老师">
+                   placeholder="乐团主管">
           <el-option v-for="(item,index) in educationList"
                      :key="index"
                      :value="item.userId"
@@ -151,7 +151,7 @@
                          label="指导老师"></el-table-column>
         <el-table-column align="center"
                          prop="eduTeacherName"
-                         label="教务老师"></el-table-column>
+                         label="乐团主管"></el-table-column>
         <el-table-column align="center"
                          label="老师评价">
           <template slot-scope="scope">
@@ -235,7 +235,7 @@
           </div>
           <div class="leftCell"
                v-if="courseScheduleReview">
-            <p>教务老师</p>
+            <p>乐团主管</p>
             <p>{{courseScheduleReview.eduTeacherName}}</p>
           </div>
           <div class="leftCell">
@@ -678,4 +678,4 @@ export default {
 /deep/.el-tag {
   cursor: pointer;
 }
-</style>
+</style>

src/views/operateManager/serverIndexList.vue

@@ -159,7 +159,7 @@
                            label="指导老师"></el-table-column>
           <el-table-column align="center"
                            prop="educationalTeacherName"
-                           label="教务老师"></el-table-column>
+                           label="乐团主管"></el-table-column>
           <!-- <el-table-column align="center" label="当前有VIP课" width="100" >
             <template slot-scope="scope">
               <div>{{scope.row.existVipCourse?'是':'否'}}</div>
@@ -552,4 +552,4 @@ export default {
   top: 3px;
   right: 2px;
 }
-</style>
+</style>

src/views/returnVisitManager/returnVisitList.vue

@@ -30,7 +30,7 @@
             <el-option value="TEACHER"
                        label="指导老师"></el-option>
             <el-option value="EDU_TEACHER"
-                       label="教务老师"></el-option>
+                       label="乐团主管"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -274,4 +274,4 @@ export default {
 .label {
   width: 520px;
 }
-</style>
+</style>

src/views/studentManager/components/studentNetwork.vue

@@ -18,7 +18,7 @@
                            label="指导老师"></el-table-column>
           <el-table-column align="center"
                            prop="educationalTeacherName"
-                           label="教务老师"></el-table-column>
+                           label="乐团主管"></el-table-column>
           <el-table-column align="center"
                            prop="type"
                            label="课程组类型"
@@ -119,4 +119,4 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-</style>
+</style>

src/views/studentManager/components/studentVip.vue

@@ -55,7 +55,7 @@
         <el-table-column label="指导老师"
                          align="center"
                          prop="teacherName"></el-table-column>
-        <el-table-column label="教务老师"
+        <el-table-column label="乐团主管"
                          align="center"
                          prop="eduTeacherName"></el-table-column>
         <el-table-column label="班级人数"
@@ -277,4 +277,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/studentManager/components/teamAndcourse.vue

@@ -148,6 +148,8 @@
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
+import {musicCourseType} from "@/utils/searchArray"
+
 import {
   findStudentMusicGroups,
   findStudentCourses
@@ -170,13 +172,7 @@ export default {
         classGroupName: null,
         teacherName: null
       },
-      courseArray: [
-        { label: "单技课", value: "NORMAL" },
-        { label: "合奏课", value: "MIX" },
-        { label: "基础技能班", value: "HIGH" },
-        { label: "VIP课", value: "VIP" },
-        { label: "试听课", value: "DEMO" }
-      ],
+      courseArray: musicCourseType,
       courseStatus: [
         { value: "NOT_START", label: "未开始" },
         { value: "UNDERWAY", label: "进行中" },
@@ -243,4 +239,4 @@ export default {
 .tabTopWrap {
   margin-bottom: 30px;
 }
-</style>
+</style>

src/views/teacherManager/teacherDetail/components/resetComponent.vue

@@ -153,7 +153,7 @@ export default {
       },
       teacherRules: {
         teacher: [{ required: true, message: "请选择老师", trigger: "blur" }],
-        educationalTeacherId: [{ required: true, message: "请选择教务老师", trigger: "blur" }]
+        educationalTeacherId: [{ required: true, message: "请选择乐团主管", trigger: "blur" }]
       },
       tableList: [],
       rules: {
@@ -249,4 +249,4 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-</style>
+</style>

src/views/teacherManager/teacherDetail/index.vue

@@ -119,34 +119,20 @@ export default {
         leaveRecord: permission("/teacherDetail/leaveRecord"),
         settlement: permission("/teacherDetail/settlement"),
         timerList: permission("/teacherDetail/timerList"),
-        outCourseList: permission("/teacherDetail/outCourseList"), // 
+        outCourseList: permission("/teacherDetail/outCourseList"), //
         teacherNetwork: permission("/teacherDetail/teacherNetwork"),
         serveStudentList: permission("/teacherDetail/serveStudentList"),
         calendarList: permission("/teacherDetail/calendarList"),
         weeklyCalendar: permission("/teacherDetail/weeklyCalendar"),
       },
-      Fsearch: null,
-      Frules: null
     };
   },
   activated () {
     this.teacherName = this.$route.query.teacherName;
-    if (this.$route.query.search) {
-      this.Fsearch = this.$route.query.search;
-    }
-    if (this.$route.query.rules) {
-      this.Frules = this.$route.query.rules;
-    }
     this.activeName = "0";
   },
 
   created () {
-    if (this.$route.query.search) {
-      this.Fsearch = this.$route.query.search;
-    }
-    if (this.$route.query.rules) {
-      this.Frules = this.$route.query.rules;
-    }
   },
   methods: {
     handleClick (val, event) {
@@ -155,12 +141,11 @@ export default {
     },
     onCancel () {
       this.$router.push({
-        path: "/business/teacherList",
-        query: { rules: this.Frules, search: this.Fsearch }
+        path: "/business/teacherList"
       });
     }
   }
 };
 </script>
 <style lang="scss">
-</style>
+</style>

src/views/teacherManager/teacherList.vue

@@ -1,239 +1,324 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>老师列表
+      <div class="squrt"></div>
+      老师列表
     </h2>
     <div class="m-core">
-      <div class="newBand"
-           v-permission="'/teacherOperationAdd'"
-           @click="onTeacher('create')">老师新增</div>
+      <div
+        class="newBand"
+        v-permission="'/teacherOperationAdd'"
+        @click="onTeacher('create')"
+      >
+        老师新增
+      </div>
       <!-- 搜索标题 -->
-      <el-form :inline="true"
-               class="searchForm"
-               v-model.trim="searchForm">
+      <save-form
+        :inline="true"
+        @submit="search"
+        @reset="onReSet"
+        class="searchForm"
+        :model="searchForm"
+      >
         <el-form-item>
-          <el-input v-model.trim="searchForm.search"
-                    @keyup.enter.native="getList"
-                    placeholder="老师姓名或电话"></el-input>
+          <el-input
+            v-model.trim="searchForm.search"
+            @keyup.enter.native="getList"
+            placeholder="老师姓名或电话"
+          ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.lockFlag"
-                     clearable
-                     filterable
-                     placeholder="老师状态">
-            <el-option v-for="item in teacherStatus"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+          <el-select
+            v-model.trim="searchForm.lockFlag"
+            clearable
+            filterable
+            placeholder="老师状态"
+          >
+            <el-option
+              v-for="item in teacherStatus"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.subjectId"
-                     filterable
-                     clearable
-                     placeholder="专业技能">
-            <el-option-group v-for="group in subjectList"
-                             :key="group.label"
-                             :label="group.label">
-              <el-option v-for="item in group.options"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value"></el-option>
+          <el-select
+            v-model.trim="searchForm.subjectId"
+            filterable
+            clearable
+            placeholder="专业技能"
+          >
+            <el-option-group
+              v-for="group in subjectList"
+              :key="group.label"
+              :label="group.label"
+            >
+              <el-option
+                v-for="item in group.options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
             </el-option-group>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.organId"
-                     filterable
-                     clearable
-                     placeholder="请选择分部">
-            <el-option v-for="item in branchList"
-                       :key="item.id"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+          <el-select
+            v-model.trim="searchForm.organId"
+            filterable
+            clearable
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="item in branchList"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.jobNature"
-                     filterable
-                     clearable
-                     placeholder="工作类型">
-            <el-option v-for="item in jobNature"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+          <el-select
+            v-model.trim="searchForm.jobNature"
+            filterable
+            clearable
+            placeholder="工作类型"
+          >
+            <el-option
+              v-for="item in jobNature"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.isProbationPeriod"
-                     clearable
-                     filterable
-                     placeholder="人事状态">
-            <el-option label="正式"
-                       value="0"></el-option>
-            <el-option label="试用"
-                       value="1"></el-option>
+          <el-select
+            v-model.trim="searchForm.isProbationPeriod"
+            clearable
+            filterable
+            placeholder="人事状态"
+          >
+            <el-option label="正式" value="0"></el-option>
+            <el-option label="试用" value="1"></el-option>
           </el-select>
         </el-form-item>
         <!-- isSupportExtraPracticeLesson -->
         <el-form-item>
-          <el-select v-model.trim="searchForm.isSupportExtraPracticeLesson"
-                     clearable
-                     filterable
-                     placeholder="开放陪练">
-            <el-option label="是"
-                       value="true"></el-option>
-            <el-option label="否"
-                       value="false"></el-option>
+          <el-select
+            v-model.trim="searchForm.isSupportExtraPracticeLesson"
+            clearable
+            filterable
+            placeholder="开放陪练"
+          >
+            <el-option label="是" value="true"></el-option>
+            <el-option label="否" value="false"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search"
-                     type="danger">搜索</el-button>
-          <el-button @click="onReSet"
-                     type="primary">重置</el-button>
+          <el-button native-type="submit" type="danger">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data="tableList"
-                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align="center"
-                           prop="id"
-                           label="老师编号"></el-table-column>
-          <el-table-column align="center"
-                           prop="realName"
-                           label="老师名称">
+        <el-table
+          :data="tableList"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        >
+          <el-table-column
+            align="center"
+            prop="id"
+            label="老师编号"
+          ></el-table-column>
+          <el-table-column align="center" prop="realName" label="老师名称">
             <template slot-scope="scope">
               <div>
-                <p>{{scope.row.realName}}</p>
-                <p v-if="scope.row.memo">{{'('+scope.row.memo+')'}}</p>
+                <p>{{ scope.row.realName }}</p>
+                <p v-if="scope.row.memo">{{ "(" + scope.row.memo + ")" }}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="organName"
-                           label="所属分部"></el-table-column>
-          <el-table-column align="center"
-                           width="150px"
-                           label="老师状态">
-            <template slot-scope="scope">{{ scope.row.lockFlag | teacherStatus }}</template>
+          <el-table-column
+            align="center"
+            prop="organName"
+            label="所属分部"
+          ></el-table-column>
+          <el-table-column align="center" width="150px" label="老师状态">
+            <template slot-scope="scope">{{
+              scope.row.lockFlag | teacherStatus
+            }}</template>
           </el-table-column>
-          <el-table-column align="center"
-                           :show-overflow-tooltip="true"
-                           width="200px"
-                           label="专业技能">
+          <el-table-column
+            align="center"
+            :show-overflow-tooltip="true"
+            width="200px"
+            label="专业技能"
+          >
             <template slot-scope="scope">
-              <span style="max-height: 68px;display: block;"
-                    :title="scope.row.splitSubjectName">{{ scope.row.splitSubjectName }}</span>
+              <span
+                style="max-height: 68px; display: block"
+                :title="scope.row.splitSubjectName"
+                >{{ scope.row.splitSubjectName }}</span
+              >
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="phone"
-                           width="150px"
-                           label="联系电话"></el-table-column>
-          <el-table-column align="center"
-                           label="工作类型">
-            <template slot-scope="scope">{{ scope.row.jobNature | jobNature }}</template>
+          <el-table-column
+            align="center"
+            prop="phone"
+            width="150px"
+            label="联系电话"
+          ></el-table-column>
+          <el-table-column align="center" label="工作类型">
+            <template slot-scope="scope">{{
+              scope.row.jobNature | jobNature
+            }}</template>
           </el-table-column>
-          <el-table-column align="center"
-                           label="人事状态">
+          <el-table-column align="center" label="人事状态">
             <template slot-scope="scope">
-              {{ scope.row.isProbationPeriod == 0 ? '正式' : '试用' }}
+              {{ scope.row.isProbationPeriod == 0 ? "正式" : "试用" }}
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="vipNum"
-                           label="已开小课"></el-table-column>
-          <el-table-column align="center"
-                           width="130px"
-                           label="试听课安排">
-            <template slot-scope="scope">{{ scope.row.demoNum > 0 ? '是' : '否' }}</template>
+          <el-table-column
+            align="center"
+            prop="vipNum"
+            label="已开小课"
+          ></el-table-column>
+          <el-table-column align="center" width="130px" label="试听课安排">
+            <template slot-scope="scope">{{
+              scope.row.demoNum > 0 ? "是" : "否"
+            }}</template>
           </el-table-column>
-          <el-table-column align="center"
-                           width="120px"
-                           label="开放网管课">
-            <template slot-scope="scope">{{ scope.row.isSupportExtraPracticeLesson ? '是' : '否' }}</template>
+          <el-table-column align="center" width="120px" label="开放网管课">
+            <template slot-scope="scope">{{
+              scope.row.isSupportExtraPracticeLesson ? "是" : "否"
+            }}</template>
           </el-table-column>
 
-          <el-table-column align="center"
-                           label="运营指标">
+          <el-table-column align="center" label="运营指标">
             <template slot-scope="scope">
-              <el-button type="text"
-                         @click="gotoOperating(scope.row)">{{ scope.row.operatingIndex +'%' }}</el-button>
+              <el-button type="text" @click="gotoOperating(scope.row)">{{
+                scope.row.operatingIndex + "%"
+              }}</el-button>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           label="服务指标">
+          <el-table-column align="center" label="服务指标">
             <template slot-scope="scope">
-              <el-button type="text"
-                         @click="gotoAfterSchool(scope.row)">{{ scope.row.serviceIndex +'%' }}</el-button>
+              <el-button type="text" @click="gotoAfterSchool(scope.row)">{{
+                scope.row.serviceIndex + "%"
+              }}</el-button>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           fixed="right"
-                           width="200"
-                           label="操作">
+          <el-table-column
+            align="center"
+            fixed="right"
+            width="200"
+            label="操作"
+          >
             <template slot-scope="scope">
               <!--   let search = JSON.stringify(this.searchForm)
               let rules = JSON.stringify(this.pageInfo)-->
-              <router-link v-permission="'/teacherDetail'"
-                           class="el-button--text"
-                           :to="{path:`/business/teacherDetail?teacherId=${scope.row.id}&teacherName=${scope.row.realName}`,query:{search:JSON.stringify(searchForm),rules:JSON.stringify(pageInfo)}}">查看</router-link>
-              <el-button v-permission="'/teacherIperationUpdate'"
-                         @click="onTeacher('update', scope.row)"
-                         type="text">修改</el-button>
-              <el-button v-permission="'employee/employeeOperate'"
-                         @click="onStaffOperation('LOCK_UNLOCK', scope.row)"
-                         type="text">{{ scope.row.lockFlag == 1 ? '解冻' : '冻结' }}</el-button>
+              <router-link
+                v-permission="'/teacherDetail'"
+                class="el-button--text"
+                :to="{
+                  path: `/business/teacherDetail?teacherId=${scope.row.id}&teacherName=${scope.row.realName}`,
+                }"
+                >查看</router-link
+              >
+              <el-button
+                v-permission="'/teacherIperationUpdate'"
+                @click="onTeacher('update', scope.row)"
+                type="text"
+                >修改</el-button
+              >
+              <el-button
+                v-permission="'employee/employeeOperate'"
+                @click="onStaffOperation('LOCK_UNLOCK', scope.row)"
+                type="text"
+                >{{ scope.row.lockFlag == 1 ? "解冻" : "冻结" }}</el-button
+              >
               <!--  -->
-              <el-button v-permission="'api-auth/user/updatePassword2'"
-                         @click="resetPassWrod(scope.row)"
-                         type="text">修改密码</el-button>
+              <el-button
+                v-permission="'api-auth/user/updatePassword2'"
+                @click="resetPassWrod(scope.row)"
+                type="text"
+                >修改密码</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
-                    :page.sync="pageInfo.page"
-                    :limit.sync="pageInfo.limit"
-                    :page-sizes="pageInfo.page_size"
-                    @pagination="getList" />
+        <pagination
+          sync
+          :total.sync="pageInfo.total"
+          :page.sync="pageInfo.page"
+          :limit.sync="pageInfo.limit"
+          :page-sizes="pageInfo.page_size"
+          @pagination="getList"
+        />
       </div>
     </div>
-    <el-dialog title="修改密码"
-               :visible.sync="passwrodVisiable"
-               :before-close="closePassWord"
-               width="400px">
-      <el-form :model="passwrodForm"
-               ref="passwrodForm"
-               :inline="true">
-        <el-form-item label="手机号"
-                      prop="phone"
-                      label-width="80px"
-                      :rules="[{ required: true, message: '手机号不能为空',trigger: 'blur'},{pattern: /^1\d{10}$/, message: '请输入正确的手机号',trigger: 'blur' }]">
-          <el-input v-model.trim="passwrodForm.phone"
-                    minlength="11"
-                    maxlength="11"
+    <el-dialog
+      title="修改密码"
+      :visible.sync="passwrodVisiable"
+      :before-close="closePassWord"
+      width="400px"
+    >
+      <el-form :model="passwrodForm" ref="passwrodForm" :inline="true">
+        <el-form-item
+          label="手机号"
+          prop="phone"
+          label-width="80px"
+          :rules="[
+            { required: true, message: '手机号不能为空', trigger: 'blur' },
+            {
+              pattern: /^1\d{10}$/,
+              message: '请输入正确的手机号',
+              trigger: 'blur',
+            },
+          ]"
+        >
+          <el-input
+            v-model.trim="passwrodForm.phone"
+            minlength="11"
+            maxlength="11"
           ></el-input>
         </el-form-item>
-        <el-form-item label="输入密码"
-                      prop="password"
-                      label-width="80px"
-                      :rules="[{ required: true, message: '密码不能为空',trigger: 'blur'},{pattern:/^[\w]{6,20}$/,message:'密码为6-20位',trigger: 'blur'}]">
+        <el-form-item
+          label="输入密码"
+          prop="password"
+          label-width="80px"
+          :rules="[
+            { required: true, message: '密码不能为空', trigger: 'blur' },
+            {
+              pattern: /^[\w]{6,20}$/,
+              message: '密码为6-20位',
+              trigger: 'blur',
+            },
+          ]"
+        >
           <el-input v-model.trim="passwrodForm.password"></el-input>
         </el-form-item>
-        <el-form-item label="再次输入"
-                      prop="password2"
-                      label-width="80px"
-                      :rules="[{ required: true, message: '密码不能为空',trigger: 'blur'},{pattern:/^[\w]{6,20}$/,message:'密码为6-20位',trigger: 'blur'}]">
+        <el-form-item
+          label="再次输入"
+          prop="password2"
+          label-width="80px"
+          :rules="[
+            { required: true, message: '密码不能为空', trigger: 'blur' },
+            {
+              pattern: /^[\w]{6,20}$/,
+              message: '密码为6-20位',
+              trigger: 'blur',
+            },
+          ]"
+        >
           <el-input v-model.trim="passwrodForm.password2"></el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer"
-            class="dialog-footer">
+      <span slot="footer" class="dialog-footer">
         <el-button @click="passwrodVisiable = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitResetPassWord">确 定</el-button>
+        <el-button type="primary" @click="submitResetPassWord">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -249,9 +334,9 @@ import store from "@/store";
 export default {
   name: "teacherList",
   components: {
-    pagination
+    pagination,
   },
-  data () {
+  data() {
     return {
       searchForm: {
         lockFlag: null,
@@ -260,7 +345,7 @@ export default {
         subjectId: null,
         organId: null,
         search: null, // 老师姓名或电话
-        isSupportExtraPracticeLesson: null
+        isSupportExtraPracticeLesson: null,
       },
       jobNature: jobNature, // 工作类型
       teacherStatus: teacherStatus, // 老师状态
@@ -273,31 +358,31 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 1, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       passwrodVisiable: false,
       passwrodForm: {
         phone: "",
         password: "",
-        password2: ""
+        password2: "",
       },
-      activatedRow: null
+      activatedRow: null,
     };
   },
-  activated () {
+  activated() {
     this.__init();
     this.getList();
   },
-  mounted () {
+  mounted() {
     this.__init();
     this.getList();
   },
   methods: {
-    search () {
+    search() {
       this.pageInfo.page = 1;
       this.getList();
     },
-    __init () {
+    __init() {
       if (this.$route.query.search) {
         this.$route.query.search instanceof Object
           ? (this.searchForm = this.$route.query.search)
@@ -308,37 +393,37 @@ export default {
           ? (this.pageInfo = this.$route.query.rules)
           : (this.pageInfo = JSON.parse(this.$route.query.rules));
       }
-      getEmployeeOrgan().then(res => {
+      getEmployeeOrgan().then((res) => {
         if (res.code == 200) {
           this.branchList = [];
-          res.data.forEach(item => {
+          res.data.forEach((item) => {
             this.branchList.push({
               label: item.name,
-              value: item.id
+              value: item.id,
             });
           });
         }
       });
 
       subjectListTree({
-        delFlag: 'NO',
-        rows: 9999
-      }).then(res => {
+        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 => {
+            item.subjects.forEach((s) => {
               subject.push({
                 value: s.id,
-                label: s.name
+                label: s.name,
               });
             });
 
             tempArray[index] = {
               label: item.name,
-              options: subject
+              options: subject,
             };
           });
           this.subjectList = tempArray;
@@ -346,13 +431,9 @@ export default {
       });
       // this.getList();
     },
-    onTeacher (type, row) {
-      let search = JSON.stringify(this.searchForm);
-      let rules = JSON.stringify(this.pageInfo);
+    onTeacher(type, row) {
       let params = {
         type: type,
-        search,
-        rules
       };
       if (row) {
         params.teacherId = row.id;
@@ -363,10 +444,10 @@ export default {
       }
       this.$router.push({
         path: path,
-        query: params
+        query: params,
       });
     },
-    getList () {
+    getList() {
       let params = this.searchForm;
       // params.organId = this.organId
       // searchForm: {
@@ -391,7 +472,7 @@ export default {
         : (params.isSupportExtraPracticeLesson = null);
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
-      teacherQueryPage(params).then(res => {
+      teacherQueryPage(params).then((res) => {
         if (res.code == 200) {
           // console.log(res)
           this.tableList = res.data.rows;
@@ -399,7 +480,7 @@ export default {
         }
       });
     },
-    onStaffOperation (type, data) {
+    onStaffOperation(type, data) {
       let str = "";
       if (data.lockFlag != 1) {
         str = `是否冻结${data.realName}老师？`;
@@ -409,13 +490,13 @@ export default {
       this.$confirm(str, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           employeeOperate({
             employeeId: data.id,
-            operate: type
-          }).then(res => {
+            operate: type,
+          }).then((res) => {
             if (res.code == 200) {
               this.$message.success("更改成功");
               this.roleStatus = false;
@@ -425,46 +506,46 @@ export default {
             }
           });
         })
-        .catch(() => { });
+        .catch(() => {});
     },
-    onReSet () {
+    onReSet() {
       this.searchForm = {
         lockFlag: null,
         isProbationPeriod: null,
         jobNature: null,
         organId: null,
         subjectId: null,
-        search: null
+        search: null,
       };
     },
-    resetPassWrod (row) {
+    resetPassWrod(row) {
       this.activatedRow = row;
       this.passwrodForm.phone = row.phone;
       this.passwrodVisiable = true;
     },
-    closePassWord () {
+    closePassWord() {
       this.activatedRow = null;
       this.passwrodForm = {
         phone: "",
         password: "",
-        password2: ""
+        password2: "",
       };
       this.$refs["passwrodForm"].resetFields();
       this.passwrodVisiable = false;
     },
-    submitResetPassWord () {
+    submitResetPassWord() {
       if (this.passwrodForm.password !== this.passwrodForm.password2) {
         this.$message.error("两次密码必须相同");
         return;
       }
-      this.$refs["passwrodForm"].validate(res => {
+      this.$refs["passwrodForm"].validate((res) => {
         if (res) {
           // 发请求
           resetPassword2({
             mobile: this.passwrodForm.phone,
             newPassword: this.passwrodForm.password,
-            userId: this.activatedRow.id
-          }).then(res => {
+            userId: this.activatedRow.id,
+          }).then((res) => {
             if (res.code == 200) {
               // 修改成功
               this.$message.success("修改成功");
@@ -474,20 +555,20 @@ export default {
         }
       });
     },
-    gotoAfterSchool (row) {
+    gotoAfterSchool(row) {
       // 需要的参数 id
       this.$router.push({
         path: "/operateManager/serverIndexList",
-        query: { teacherId: row.id, activeIndex: "2" }
+        query: { teacherId: row.id, activeIndex: "2" },
       });
     },
-    gotoOperating (row) {
+    gotoOperating(row) {
       this.$router.push({
         path: "/operateManager/operateStudent",
-        query: { teacherId: row.id, operatingTag: '1' }
+        query: { teacherId: row.id, operatingTag: "1" },
       });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/teacherManager/teacherOperation/index.vue

@@ -53,8 +53,6 @@ export default {
       activeStatus: [true, false],
       isTeacher: true,
       isCreate: false,
-      Fsearch: null,
-      Frules: null
     }
   },
   mounted () {
@@ -74,12 +72,6 @@ export default {
   },
   methods: {
     init () {
-      if (this.$route.query.search) {
-        this.Fsearch = this.$route.query.search;
-      }
-      if (this.$route.query.rules) {
-        this.Frules = this.$route.query.rules
-      }
       if (this.teacherId) {
         this.isTeacher = false
       }
@@ -92,7 +84,7 @@ export default {
       this.activeStatus[val.name] = true
     },
     onCancel () {
-      this.$router.push({ path: '/business/teacherList', query: { rules: this.Frules, search: this.Fsearch } })
+      this.$router.push({ path: '/business/teacherList' })
     },
     onTeacher (id) {
       let type = this.$route.query.type
@@ -117,4 +109,4 @@ export default {
 }
 </script>
 <style lang="scss">
-</style>
+</style>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -125,9 +125,9 @@
           </el-select>
         </el-form-item>
         <el-form-item
-          label="教务老师"
+          label="乐团主管"
           prop="teacher"
-          :rules="[{ required: true, message: '教务老师不能为空' }]"
+          :rules="[{ required: true, message: '乐团主管不能为空' }]"
         >
           <el-select
             v-model.trim="topFrom.teacher"
@@ -581,7 +581,7 @@ export default {
         type: "", // 收费类型
         section: "", //所属分部
         school: "", // 合作单位
-        teacher: "", // 教务老师
+        teacher: "", // 乐团主管
         name: "", //乐团名称
         boss: "", // 运营主管
         time: "", // 报名截止时间
@@ -917,7 +917,7 @@ export default {
           type: "", // 收费类型
           section: "", //所属分部
           school: "", // 合作单位
-          teacher: "", // 教务老师
+          teacher: "", // 乐团主管
           name: "", //乐团名称
           boss: "", // 运营主管
           time: "", // 报名截止时间
@@ -983,7 +983,7 @@ export default {
       sessionStorage.setItem("resetCode", "1");
     },
     changeSection(val) {
-      // 修改分部的时候 重置运营主管 重置教务老师 重置乐队指导 合作单位  教学点
+      // 修改分部的时候 重置运营主管 重置乐团主管 重置乐队指导 合作单位  教学点
       this.topFrom.teacher = "";
       this.topFrom.boss = "";
       this.topFrom.head = "";

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

@@ -199,7 +199,7 @@
         <div class="restBtn"
              v-if='buttonType == "MIX"'
              :class="signBtnActive?'active':''"
-             @click="resetClass">修改为单技课</div> -->
+             @click="resetClass">修改为声部课</div> -->
           <!-- <div class="restBtn"
              @click='skipClass'
              :class="skipBtnActive?'active':''">跳过此天</div> -->
@@ -282,7 +282,7 @@ export default {
     return {
       // type: this.$route.query.type || null, // 当前页面类型
       resetAllClassVisible: false, //修改合奏课弹窗
-      openSignListVisible: false, // 修改单个单技课的弹窗
+      openSignListVisible: false, // 修改单个声部课的弹窗
       first: true,
       leftFrom: {
         all: '',
@@ -331,7 +331,7 @@ export default {
       ],
       weekDay: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
       maxClassList: [], // 所有的合奏班
-      activeSingleList: [], // 合奏班下的所有单技班
+      activeSingleList: [], // 合奏班下的所有声部班
       isholiday: false,
       classCardList: [], //这个是传给后台的真正数据集合
       allChioseDate: [], // 记录所有准备排课的日期
@@ -348,8 +348,8 @@ export default {
       skipBtnActive: false,
       SignList: [], // 存储当前合奏课里当天的所有单机课
       courseTypeList: [
-        { name: '单技课', value: 'SINGLE' },
-        { name: '集训单技课', value: 'TRAINING_SINGLE' },
+        { name: '声部课', value: 'SINGLE' },
+        { name: '集训声部课', value: 'TRAINING_SINGLE' },
         { name: '合奏课', value: 'MIX' },
         { name: '集训合奏课', value: 'TRAINING_MIX' },
         { name: '课堂课', value: 'CLASSROOM' },
@@ -458,7 +458,7 @@ export default {
       // this.checkTime();
       let classCount = parseInt(this.leftFrom.num);
       let date = this.leftFrom.time;
-      // 1 排课时间 2.排课次数 3.排课周期集合 4.排课合奏班的信息 
+      // 1 排课时间 2.排课次数 3.排课周期集合 4.排课合奏班的信息
       this.workOut(date, classCount, this.week, this.leftFrom.all);
       this.$refs['leftFrom'].resetFields();
       this.week = this.$options.data().week;
@@ -493,7 +493,7 @@ export default {
 
     },
     changeMixClass (val) {
-      // 根据合奏班id获取合奏班下的所有单技班
+      // 根据合奏班id获取合奏班下的所有声部班
       let activeVal = val;
       if (!this.first) {
         // Object.assign(this.$data, this.$options.data());
@@ -612,8 +612,8 @@ export default {
       let startClassTime;
       let endClassTime;
       if (this.chioseType.indexOf('MIX') != -1) {
-        // 改合奏 
-        // 删除真实课表里的所有相关单技课
+        // 改合奏
+        // 删除真实课表里的所有相关声部课
         for (let i = 0; i < this.classCardList.length; i++) {
           if (row.classDate == this.classCardList[i].classDate && this.startClassTimeStr == this.classCardList[i].startClassTimeStr && this.endClassTimeStr == this.classCardList[i].endClassTimeStr) {
             this.classCardList.splice(i, 1);
@@ -634,7 +634,7 @@ export default {
         }
         //
       } else if (this.chioseType.indexOf('SINGLE') != -1 || this.chioseType.indexOf('CLASSROOM') != -1) {
-        // 改单技 
+        // 改声部
         for (let i in this.tableList) {
           if (row.classDate == this.tableList[i].classDate && this.startClassTimeStr == this.tableList[i].startClassTimeStr && this.endClassTimeStr == this.tableList[i].endClassTimeStr) {
             this.tableList[i].type = this.chioseType;
@@ -688,7 +688,7 @@ export default {
         for (let i in weekArr) {
           let date1 = new Date(date.getTime());
           let num; // 下次上课上几天后
-          // 星期4 - 当前是星期几 => 
+          // 星期4 - 当前是星期几 =>
           weekArr[i].weekNum - date.getDay() >= 0 ? num = weekArr[i].weekNum - date.getDay() : num = weekArr[i].weekNum - date.getDay() + 7
 
           let dataStr = this.getThinkDate(date, num);
@@ -708,7 +708,7 @@ export default {
               return item.name
             }
           })
-          // 排的是合奏班 
+          // 排的是合奏班
           if (!startTime) {
             // 有这个说明是修改=> 没有说明是添加
             if (!this.week[i].startTime || !this.week[i].endTime) {
@@ -742,7 +742,7 @@ export default {
             'weekNum': weekArr[i].weekNum,
             'classGroupId': id
           })
-          // 这里我排单技课
+          // 这里我排声部课
           //               date: this.getNowFormatDate(date),
 
           for (let j in this.activeSingleList) {
@@ -798,7 +798,7 @@ export default {
       row.option == 1 ? row.option = 2 : row.option = 1;
       // console.log(this.SignList);
     },
-    // 重置单技课
+    // 重置声部课
     resetSiginClass () {
       this.openSignListVisible = false;
       // for (let i in this.classCardList) {
@@ -1045,4 +1045,4 @@ export default {
     margin: 0 auto;
   }
 }
-</style>
+</style>

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

@@ -15,8 +15,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type='danger'
-                   @click="removeAllCourse">清空课表</el-button>
+        <!-- <el-button type='danger'
+                   @click="removeAllCourse">清空课表</el-button> -->
       </el-form-item>
     </el-form>
     <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
@@ -103,12 +103,12 @@ export default {
       classScheduleType: null,
       tableList: [],
       courseType: [
-        { label: "单技课", value: "SINGLE" },
+        { label: "声部课", value: "SINGLE" },
         { label: "合奏课", value: "MIX" },
         { label: "基础技能课", value: "HIGH" },
         { label: "线上基础技能课", value: "HIGH_ONLINE" },
         { label: "综合课", value: "COMPREHENSIVE" },
-        { label: "集训单技课", value: "TRAINING_SINGLE" },
+        { label: "集训声部课", value: "TRAINING_SINGLE" },
         { label: "集训合奏课", value: "TRAINING_MIX" },
         { label: "课堂课", value: "CLASSROOM" },
       ],
@@ -197,4 +197,4 @@ export default {
   cursor: pointer;
   margin: 20px 0;
 }
-</style>
+</style>

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

@@ -720,7 +720,7 @@ export default {
 
       tableList: [],
       classTypeList: [
-        { value: "NORMAL", label: "单技班" },
+        { value: "NORMAL", label: "声部班" },
         { value: "MIX", label: "合奏班" },
         { value: "HIGH", label: "基础技能班" },
         { value: "HIGH_ONLINE", label: "线上基础技能课" }
@@ -876,7 +876,7 @@ export default {
     },
     newClassSecond () {
       // 判断当前选择的课程类型
-      // 单技 合奏等等
+      // 声部 合奏等等
       this.$refs["newClassForm"].validate(res => {
         if (res) {
           this.isNewClass = true;
@@ -1180,8 +1180,8 @@ export default {
       switch (type) {
         case "NORMAL": {
           this.courseTypeList = [
-            { value: "SINGLE", label: "单技课" },
-            { value: "TRAINING_SINGLE", label: "集训单技课" },
+            { value: "SINGLE", label: "声部课" },
+            { value: "TRAINING_SINGLE", label: "集训声部课" },
             { value: "COMPREHENSIVE", label: "综合课" },
             { value: "CLASSROOM", label: "课堂课" }
           ];
@@ -1208,9 +1208,9 @@ export default {
         }
         case "SNAP": {
           this.courseTypeList = [
-            { value: "SINGLE", label: "单技课" },
+            { value: "SINGLE", label: "声部课" },
             { value: "MIX", label: "合奏课" },
-            { value: "TRAINING_SINGLE", label: "集训单技课" },
+            { value: "TRAINING_SINGLE", label: "集训声部课" },
             { value: "TRAINING_MIX", label: "集训合奏课" },
             { value: "HIGH", label: "基础技能课" },
             { value: "COMPREHENSIVE", label: "综合课" },
@@ -1272,7 +1272,7 @@ export default {
     // 提交临时班的信息
     submitTemporary (type) {
       // 参数是一样  type为1 新增临时班
-      // type为2  新增单技班
+      // type为2  新增声部班
       // type为3 修改班级信息
       if (type == 1) {
         this.isTemporary = true;
@@ -1368,7 +1368,7 @@ export default {
               }
             });
           } else if (type == 2) {
-            // 新增单技班
+            // 新增声部班
             revisionAddClassGroup(obj).then(res => {
               if (res.code == 200) {
                 // 修改成功
@@ -1408,7 +1408,7 @@ export default {
       this.activeType = row.type;
       this.newClassForm.type = row.type
       this.activeChioseSound = null
-      // 根据单机班id 查询单技班内的所有学生
+      // 根据单机班id 查询声部班内的所有学生
       getClassAllStudent({ classGroupId: row.id }).then(res => {
         if (res.code == 200) {
           this.activeListStudent = res.data.map(item => {

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

@@ -140,7 +140,7 @@ export default {
   mounted () {
     sessionStorage.setItem('setStep', 1)
     this.organId = sessionStorage.getItem('createTeamOrgnId') || null
-    // 该乐团里所有的单技班与合奏班
+    // 该乐团里所有的声部班与合奏班
     this.getEveryClass();
     // 获取所有的老师列表
     getTeacher({ organId: this.organId }).then(res => {
@@ -196,7 +196,7 @@ export default {
       let allListTeacher = []
 
 
-      // 验证单技班主教老师是否指认
+      // 验证声部班主教老师是否指认
       for (let i in this.singinList) {
         singinListTeacher.push(this.singinList[i].coreTeacher);
         singinListTeacher = singinListTeacher.concat(this.singinList[i].assistant)
@@ -339,4 +339,4 @@ export default {
 .tableClass.el-select {
   width: 100% !important;
 }
-</style>
+</style>

src/views/teamDetail/componentCourse/addCompound.vue

@@ -14,7 +14,7 @@
           </div>
           <el-button type="text"
                      style="float:right"
-                     @click="clearCom">清空课表</el-button>
+                     @click="clearCom">清空列表</el-button>
           <div>
             <el-radio-group v-model="radio">
               <el-table :data="dataList"
@@ -129,14 +129,14 @@ export default {
         this.$message.error('请至少选择2节课程')
         return
       }
-      // 做判断 
+      // 做判断
       this.idList = idList.join(',')
       this.show = true;
       this.isLook = false
 
     },
-    getList () { 
-      
+    getList () {
+
     },
     closeReset () {
       this.clearCom()
@@ -186,4 +186,4 @@ export default {
   font-size: 20px;
   cursor: pointer;
 }
-</style>
+</style>

src/views/teamDetail/componentCourse/courseList.vue

@@ -19,9 +19,9 @@
                      value="MIX"></el-option>
           <el-option label="集训合奏课"
                      value="TRAINING_MIX"></el-option>
-          <el-option label="集训单技课"
+          <el-option label="集训声部课"
                      value="TRAINING_SINGLE"></el-option>
-          <el-option label="单技课"
+          <el-option label="声部课"
                      value="SINGLE"></el-option>
           <el-option label="线上基础技能课"
                      value="HIGH_ONLINE"></el-option>
@@ -144,7 +144,7 @@ export default {
      *  courseStatus: '', // 课程类型
         classStatus: '', // 课程状态
         timer:[] // 时间
-     * 
+     *
      */
     init () {
       this.getList();
@@ -218,4 +218,4 @@ export default {
     margin-right: 20px;
   }
 }
-</style>
+</style>

src/views/teamDetail/components/baseInfo.vue

@@ -10,7 +10,7 @@
             <el-input v-model.trim="topForm.num"
                       disabled></el-input>
           </el-form-item>
-          <el-form-item label="教务老师">
+          <el-form-item label="乐团主管">
             <el-input v-model.trim="topForm.teacher"
                       disabled></el-input>
           </el-form-item>

src/views/teamDetail/components/courseList.vue

@@ -9,24 +9,10 @@
                    clearable
                    filterable
                    placeholder="课程类型">
-          <el-option label="基础技能课"
-                     value="HIGH"></el-option>
-          <el-option label="综合课"
-                     value="COMPREHENSIVE"></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-option label="线上基础技能课"
-                     value="HIGH_ONLINE"></el-option>
-          <el-option label="乐团网管课"
-                     value="MUSIC_NETWORK"></el-option>
+            <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>
@@ -207,16 +193,6 @@
                label-position="right"
                label-width="120px"
                :inline="true">
-        <!-- <el-form-item label="课程类型" prop="type">
-          <el-select v-model.trim="maskForm.type" clearable filterable>
-            <el-option
-              v-for="(item,index) in courseType"
-              :key="index"
-              :value="item.value"
-              :label="item.label"
-            ></el-option>
-          </el-select>
-        </el-form-item>-->
         <el-form-item label="主教老师"
                       prop="teacher">
           <el-select v-model.trim="maskForm.teacher"
@@ -400,34 +376,6 @@
                   :page-sizes="rollCall.page_size"
                   @pagination="getCallName" />
     </el-dialog>
-    <el-dialog title="类型修改"
-               width="400px"
-               :visible.sync="typeVisible">
-      <el-form :model="typeForm"
-               ref="typeForm"
-               :rules="typeRules"
-               label-position="right"
-               label-width="80px;"
-               :inline="true">
-        <el-form-item label="课程类型"
-                      prop="type">
-          <el-select v-model.trim="typeForm.type"
-                     clearable
-                     filterable>
-            <el-option v-for="(item,index) in courseType"
-                       :key="index"
-                       :value="item.value"
-                       :label="item.label"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer"
-           class="dialog-footer">
-        <el-button @click="typeVisible = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitResetType">确定</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
@@ -450,7 +398,7 @@ import {
 } from "@/api/buildTeam";
 import { permission } from "@/utils/directivePage";
 import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
-import { classTimeList } from "@/utils/searchArray";
+import { classTimeList,musicCourseType } from "@/utils/searchArray";
 import { getSchool } from "@/api/systemManage"
 import cleanDeep from 'clean-deep'
 export default {
@@ -458,17 +406,7 @@ export default {
   data () {
     return {
       classTimeList,
-      courseType: [
-        { value: "SINGLE", label: "单技课" },
-        { value: "MIX", label: "合奏课" },
-        { value: "TRAINING_SINGLE", label: "集训单技课" },
-        { value: "TRAINING_MIX", label: "集训合奏课" },
-        { value: "HIGH", label: "基础技能课" },
-        { value: "COMPREHENSIVE", label: "综合课" },
-        { value: "CLASSROOM", label: "课堂课" },
-        // { value: "HIGH_ONLINE", label: "线上基础技能课" },
-        // { value: "MUSIC_NETWORK", label: "乐团网管课" },
-      ],
+      courseArray:musicCourseType,
       typeVisible: false,
       timerVisible: false,
       courseVisible: false,
@@ -574,9 +512,9 @@ export default {
       try{
         const res = await getOrganCourseDurationSettings({organId:this.organId})
         this.courseTimeList = res.data
-       
+
       }catch{}
-     
+
       // MusicStore.dispatch('getBaseInfo', {
       //     data: { musicGroupId: this.teamid }
       //   }).then((res) => {
@@ -983,4 +921,4 @@ export default {
     width: 220px;
   }
 }
-</style>
+</style>

src/views/teamDetail/components/modals/create-user-pay.vue

@@ -5,7 +5,7 @@
     <el-form :model="form" label-width="100px">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="单技班">
+          <el-form-item label="声部班">
             <el-select v-model.trim="form.signClass" filterable clearable>
               <el-option
                 v-for="(item, index) in signList"

src/views/teamDetail/components/resetClass.vue

@@ -160,7 +160,7 @@
           </div>
           <div class="right">
             <div class="add" @click="temporary">新建临时班</div>
-            <div class="add" @click="addNewClass('NORMAL')">新建单技班</div>
+            <div class="add" @click="addNewClass('NORMAL')">新建声部班</div>
             <div class="add" @click="addNewClass('MIX')">新建合奏班</div>
             <div class="add" @click="addNewClass('MUSIC_NETWORK')">
               新建乐团网管课
@@ -606,7 +606,7 @@ export default {
       ],
       // 班级类型
       classTypeList: [
-        { value: "NORMAL", label: "单技班" },
+        { value: "NORMAL", label: "声部班" },
         { value: "MIX", label: "合奏班" },
         { value: "HIGH", label: "基础技能班" },
         { value: "SNAP", label: "临时班" },
@@ -743,7 +743,7 @@ export default {
       }
     },
     changeMixClass(val) {
-      // 根据合奏班id获取合奏班下的所有单技班
+      // 根据合奏班id获取合奏班下的所有声部班
       this.getList(val);
       this.activeMixClass = val;
     },
@@ -755,7 +755,7 @@ export default {
             this.mergeList = res.data.filter(item=>{
               return item.type!='MUSIC_NETWORK'
             })
-            
+
             // this.topForm.count = this.activeSingleList.length
           }
         }
@@ -893,7 +893,7 @@ export default {
       this.isSearch = false;
       this.activeType = row.type;
       this.activeChioseSound = null;
-      // 根据单机班id 查询单技班内的所有学生
+      // 根据单机班id 查询声部班内的所有学生
       getClassAllStudent({ classGroupId: row.id }).then((res) => {
         if (res.code == 200) {
           this.activeListStudent = res.data.map((item) => {
@@ -1113,7 +1113,7 @@ export default {
     // 提交临时班的信息
     submitTemporary(type) {
       // 参数是一样  type为1 新增临时班
-      // type为2  新增单技班
+      // type为2  新增声部班
       // type为3 修改班级信息
 
       if (type == 1) {
@@ -1216,7 +1216,7 @@ export default {
           } else if (type == 2) {
             (obj.subjectId = this.teacherForm.sound),
               (obj.expectStudentNum = this.teacherForm.expectStudentNum);
-            // 新增单技班
+            // 新增声部班
             revisionAddClassGroup(obj).then((res) => {
               if (res.code == 200) {
                 // 修改成功

src/views/teamDetail/components/studentList.vue

@@ -357,7 +357,7 @@
           </el-col>
         </el-form-item>
         <!-- <br />
-        <el-form-item label="单技班">
+        <el-form-item label="声部班">
           <el-select v-model.trim="maskForm.signClass"
                      filterable
                      clearable>
@@ -870,7 +870,7 @@ export default {
         // phone: [{ required: true, message: '请输入手机号' }, { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }],
         sound: [{ required: true, message: "请选择声部" }],
         timer: [{ required: true, message: "请选择出生日期" }],
-        signClass: [{ required: true, message: "请选择单技班" }],
+        signClass: [{ required: true, message: "请选择声部班" }],
         // price: [{ required: true, message: '请输入首缴金额' },],
         startClass: [{ required: true, message: "请选择年级" }],
         id: [{ required: true, message: "请输入证件号" }],
@@ -990,7 +990,7 @@ export default {
       //     this.soundList = res.data;
       //   }
       // })
-      // 获取乐团所有单技课班
+      // 获取乐团所有声部课班
       // getSingleClass({ musicGroupId: this.teamid }).then(res => {
       //   if (res.code == 200) {
       //     this.signList = res.data;

src/views/teamDetail/teamList.vue

@@ -113,7 +113,7 @@
           </el-table-column>
           <el-table-column prop="educationalTeacherName"
                            align='center'
-                           label="教务老师">
+                           label="乐团主管">
           </el-table-column>
           <el-table-column prop="teamTeacherName"
                            align='center'

src/views/vipClass/vipDetail/components/vipBaseInfo.vue

@@ -8,7 +8,7 @@
           <el-input v-model.trim="topForm.teacherCount"
                     disabled></el-input>
         </el-form-item>
-        <el-form-item label="教务老师">
+        <el-form-item label="乐团主管">
           <el-input v-model.trim="topForm.educationalTeacherName"
                     disabled></el-input>
         </el-form-item>
@@ -159,7 +159,7 @@ export default {
           onlineClass: '', //线上课数
           offlineClass: '', //线下课数
           startTime: '', // 报名开始时间
-           * 
+           *
            */
           this.topForm.teacherCount = res.data.userName;
           this.topForm.educationalTeacherName = res.data.educationalTeacherName
@@ -283,4 +283,4 @@ export default {
     width: 180px;
   }
 }
-</style>
+</style>

src/views/vipClass/vipList.vue

@@ -77,7 +77,7 @@
                      v-model.trim="searchForm.hasEducationalTeacherId"
                      filterable
                      clearable
-                     placeholder="是否有教务老师">
+                     placeholder="是否有乐团主管">
             <el-option label="是"
                        value="true"></el-option>
             <el-option label="否"
@@ -131,7 +131,7 @@
                            width='100px'></el-table-column>
           <el-table-column align="center"
                            prop="educationalTeacherName"
-                           label="教务老师"></el-table-column>
+                           label="乐团主管"></el-table-column>
           <el-table-column align="center"
                            prop="studentNum"
                            label="班级人数"></el-table-column>
@@ -597,4 +597,4 @@ export default {
 .newBand {
   display: inline-block;
 }
-</style>
+</style>

src/views/vipClass/vipReset.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="vipwrap">
       <!-- <div class="newBand"
-           v-permission="'vipGroupManage/appendVipGroupCourseSchedules'" 
+           v-permission="'vipGroupManage/appendVipGroupCourseSchedules'"
            @click="addCourse">VIP加课</div> -->
       <div class="newBand"
            v-permission="'courseSchedule/vipCourseAdjust'"
@@ -422,7 +422,7 @@
                        :value="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="教务老师"
+        <el-form-item label="乐团主管"
                       prop="educationalTeacherId">
           <el-select v-model.trim="addrForm.educationalTeacherId"
                      filterable
@@ -631,7 +631,7 @@ export default {
       if (query.searchForm) {
         this.FsearchForm = query.searchForm;
       }
-      //  获取教务老师
+      //  获取乐团主管
       // findEducationUsers().then(res => {
       //   if (res.code == 200) {
       //     this.educationList = res.data;
@@ -969,10 +969,10 @@ export default {
         return;
       }
       if (!addrForm.educationalTeacherId) {
-        this.$message.error("请选择教务老师");
+        this.$message.error("请选择乐团主管");
         return;
       }
-      // 修改教务老师
+      // 修改乐团主管
       updateVipBaseInfo({
         id: this.vipid,
         organId: addrForm.organId,
@@ -1157,4 +1157,4 @@ export default {
   justify-content: flex-start;
   align-items: center;
 }
-</style>
+</style>