Merge branch 'Nov16thResetMusic' into online

src/components/save-form/index.vue

@@ -1,5 +1,6 @@
 <template>
   <el-form
+    class="save-form"
     v-bind="{...$attrs, ...$props}"
     v-on="$listeners"
     ref="form"
@@ -45,3 +46,9 @@ export default {
   },
 }
 </script>
+<style lang="less" scoped>
+.save-form{
+
+}
+
+</style>

src/views/save-form-test/index.vue

@@ -6,26 +6,24 @@
     <div class="m-core">
       <saveform ref="form" :model.sync="form" inline>
         <el-form-item
-          label="内容"
           prop="input"
           :rules="[{required: true}]"
         >
           <el-input v-model="form.input" placeholder="请输入内容"/>
         </el-form-item>
         <el-form-item
-          label="内容2"
           prop="input2"
           :rules="[{required: true}]"
         >
           <el-input v-model="form.input2" placeholder="请输入内容2"/>
         </el-form-item>
-        <el-form-item label="活动区域" prop="region">
+        <el-form-item prop="region">
           <el-select v-model="form.region" placeholder="请选择活动区域">
             <el-option label="区域一" value="shanghai"></el-option>
             <el-option label="区域二" value="beijing"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="活动时间" required>
+        <el-form-item required>
           <el-col :span="11">
             <el-form-item prop="date1">
               <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
@@ -38,27 +36,27 @@
             </el-form-item>
           </el-col>
         </el-form-item>
-        <el-form-item label="即时配送" prop="delivery">
+        <!-- <el-form-item prop="delivery">
           <el-switch v-model="form.delivery"></el-switch>
-        </el-form-item>
-        <el-form-item label="活动性质" prop="type">
+        </el-form-item> -->
+        <!-- <el-form-item prop="type">
           <el-checkbox-group v-model="form.type">
             <el-checkbox label="美食/餐厅线上活动" value="1" name="type"></el-checkbox>
             <el-checkbox label="地推活动" value="2" name="type"></el-checkbox>
             <el-checkbox label="线下主题活动" value="3" name="type"></el-checkbox>
             <el-checkbox label="单纯品牌曝光" value="4" name="type"></el-checkbox>
           </el-checkbox-group>
-        </el-form-item>
-        <el-form-item label="特殊资源" prop="resource">
+        </el-form-item> -->
+        <!-- <el-form-item prop="resource">
           <el-radio-group v-model="form.resource">
             <el-radio label="线上品牌商赞助"></el-radio>
             <el-radio label="线下场地免费"></el-radio>
           </el-radio-group>
-        </el-form-item>
-        <el-form-item label="活动形式" prop="desc">
+        </el-form-item> -->
+        <el-form-item prop="desc">
           <el-input type="textarea" v-model="form.desc"></el-input>
         </el-form-item>
-        <el-form-item label="活动时间范围" prop="times">
+        <el-form-item prop="times">
           <el-date-picker
             v-model="form.times"
             type="daterange"
@@ -72,12 +70,14 @@
         <el-button @click="testvisible = true">打开弹窗</el-button>
       </saveform>
     </div>
-    <pagination :total="rules.total"
-                :page.sync="rules.page"
-                :limit.sync="rules.limit"
-                :page-sizes="rules.page_size"
-                :sync="true"
-                @pagination="getList" />
+    <pagination
+      :total="rules.total"
+      :page.sync="rules.page"
+      :limit.sync="rules.limit"
+      :page-sizes="rules.page_size"
+      :sync="true"
+      @pagination="getList"
+    />
     <el-dialog :visible.sync="testvisible" destroy-on-close>
       <test v-if="testvisible"/>
       <template #footer>

src/views/teamDetail/componentCourse/infoMsg.vue

@@ -64,10 +64,12 @@ export default {
   },
   methods: {
     filterKeys(item) {
+      const teachingTeacherNames = (item.teachingTeacherNames || '').split(',').sort((a, b) => (a || '').localeCompare((b || ''), 'zh'))
+      console.log(teachingTeacherNames.join(','), item.teachingTeacherNames)
       return {
         name: item.name,
         actualTeacherName: item.actualTeacherName,
-        teacherName: item.teacherName,
+        teachingTeacherNames: teachingTeacherNames.join(','),
         startClassTime: item.startClassTime,
         classDate: item.classDate,
         endClassTime: item.endClassTime,

src/views/teamDetail/componentCourse/infoMsgContent.vue

@@ -6,15 +6,21 @@
           <el-form-item label="主教老师">
             <!-- <div>{{item.actualTeacherName}}</div> -->
             <div v-if="diff.hasOwnProperty('actualTeacherName')">
-              <el-tag type="danger"><s>{{before.actualTeacherName}}</s></el-tag>
-              <el-tag type="success">{{after.actualTeacherName}}</el-tag>
+              <el-tag type="danger" v-if="before.actualTeacherName"><s>{{before.actualTeacherName}}</s></el-tag>
+              <el-tag type="success" v-if="after.actualTeacherName">{{after.actualTeacherName}}</el-tag>
             </div>
             <div v-else>{{after.actualTeacherName}}</div>
           </el-form-item>
         </el-col>
+        <el-form-item :span="12" label="助教老师">
+          <div v-if="diff.hasOwnProperty('teachingTeacherNames')">
+            <el-tag type="danger" v-if="before.teachingTeacherNames"><s>{{before.teachingTeacherNames}}</s></el-tag>
+            <el-tag type="success" v-if="after.teachingTeacherNames">{{after.teachingTeacherNames}}</el-tag>
+          </div>
+          <div v-else>{{after.teachingTeacherNames}}</div>
+        </el-form-item>
         <el-col :span="12">
           <el-form-item label="上课时间">
-            <!-- <div>{{ item.startClassTime ? item.startClassTime.substr(0, 16) : '' }}-{{ item.endClassTime ? item.endClassTime.substr(11,5) : ''}}</div> -->
             <div v-if="diff.hasOwnProperty('startClassTime')">
               <el-tag type="danger"><s>{{ before.startClassTime ? before.startClassTime.substr(0, 16) : '' }}-{{ before.endClassTime ? before.endClassTime.substr(11,5) : ''}}</s></el-tag>
               <el-tag type="success">{{ after.startClassTime ? after.startClassTime.substr(0, 16) : '' }}-{{ after.endClassTime ? after.endClassTime.substr(11,5) : ''}}</el-tag>
@@ -24,10 +30,9 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="课程时长">
-            <!-- <div>{{getTimers(item)}}分钟</div> -->
             <div v-if="diff.hasOwnProperty('timers')">
-              <el-tag type="danger"><s>{{before.timers}} 分钟</s></el-tag>
-              <el-tag type="success">{{after.timers}} 分钟</el-tag>
+              <el-tag type="danger" v-if="before.timers"><s>{{before.timers}} 分钟</s></el-tag>
+              <el-tag type="success" v-if="after.timers">{{after.timers}} 分钟</el-tag>
             </div>
             <div v-else>{{after.timers}} 分钟</div>
           </el-form-item>
@@ -36,17 +41,17 @@
           <el-form-item label="课程类型">
             <!-- <div>{{item.teachMode| teachMode}}</div> -->
             <div v-if="diff.hasOwnProperty('teachMode')">
-              <el-tag type="danger"><s>{{before.teachMode | teachMode}}</s></el-tag>
-              <el-tag type="success">{{after.teachMode | teachMode}}</el-tag>
+              <el-tag type="danger" v-if="before.teachMode"><s>{{before.teachMode | teachMode}}</s></el-tag>
+              <el-tag type="success" v-if="after.teachMode">{{after.teachMode | teachMode}}</el-tag>
             </div>
             <div v-else>{{after.teachMode | teachMode}}</div>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="教学地点">
             <div v-if="diff.hasOwnProperty('schoolName')">
-              <el-tag type="danger"><s>{{before.schoolName}}</s></el-tag>
-              <el-tag type="success">{{after.schoolName}}</el-tag>
+              <el-tag type="danger" v-if="before.schoolName"><s>{{before.schoolName}}</s></el-tag>
+              <el-tag type="success" v-if="after.schoolName">{{after.schoolName}}</el-tag>
             </div>
             <div v-else>{{after.schoolName}}</div>
           </el-form-item>

src/views/teamDetail/componentCourse/resetClass.vue

@@ -96,6 +96,7 @@
                     v-if="maskForm.type == 'VIP'"
                     prop="courseType">
         <el-select clearable
+                   @change="typeChange"
                    style="width:220px!important"
                    v-model.trim="maskForm.teachMode">
           <el-option label="线上课"
@@ -209,10 +210,12 @@ export default {
         })
         .catch(() => { });
     },
+    typeChange() {
+      this.$set(this.maskForm, 'address', null)
+    },
     changeStartTime (val) {
 
       this.$nextTick(res => {
-        console.log(addTimerFormMinute(this.maskForm.date, val, this.maskForm.timer))
         if (val) {
           this.$set(this.maskForm, 'endTime', addTimerFormMinute(this.maskForm.date, val, this.maskForm.timer))
         } else {
@@ -230,7 +233,7 @@ export default {
             this.schoolList = res.data;
           }
         })
-        this.maskForm.address = ''
+        this.maskForm.address = null
       }
     },
     getDetail (id) {

src/views/teamDetail/components/modals/classList-group.vue

@@ -0,0 +1,30 @@
+<template>
+  <div>
+    <el-form :model="form">
+      <classListItem v-for="(item,index) in form.classList"
+                     :key="index"
+                     :index='index'
+                     :item='item' />
+    </el-form>
+    <el-button icon="el-icon-circle-plus-outline"
+               plain
+               type="info"
+               size="small"
+               style="width: 100%;margin: 20px 0;">添加班级</el-button>
+  </div>
+</template>
+<script>
+import classListItem from './classList-item'
+export default {
+  components: { classListItem },
+  data () {
+    return {
+      form: {
+        classList: [{ classId: '', studentList: [], courseList: [], index: '', classList: [] }]
+      },
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>

src/views/teamDetail/components/modals/classList-item.vue

@@ -0,0 +1,38 @@
+<template>
+  <div>
+    <el-alert title="班级1"
+              type="info"
+              :closable="false"
+              class='alert'>
+    </el-alert>
+    <el-form-item label="选择班级"
+                  style="padding-left:20px;"
+                  :prop="'classList.'+index+'.value'">
+      <el-select v-model="item.classId"
+                 style="margin-right:20px;"
+                 @change="changeValue">
+        <el-option label="1"
+                   value="2"></el-option>
+      </el-select>
+      <a>学员列表>></a>
+    </el-form-item>
+  </div>
+</template>
+<script>
+export default {
+  props: ['item', 'index'],
+  data () {
+    return {}
+  },
+  methods: {
+    changeValue (val) {
+      console.log(val)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.alert {
+  margin-bottom: 10px;
+}
+</style>

src/views/teamDetail/components/modals/student-reset-view.vue

@@ -0,0 +1,29 @@
+<template>
+  <div>
+    <el-alert title="学员班级调整仅支持相同【班级类型】调整，且所选班级的剩余【课程类型】须完全相同若仅选择一个班级，则会为将所选学员从原班级中移除并新建班级"
+              type="warning"
+              :closable='false'
+              class="alert"
+              show-icon>
+    </el-alert>
+    <classListGroup />
+  </div>
+</template>
+<script>
+import classListGroup from './classList-group'
+export default {
+  components: {
+    classListGroup
+  },
+  data () {
+    return {
+
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.alert {
+  margin-bottom: 10px;
+}
+</style>

src/views/teamDetail/components/resetClass.vue

@@ -19,14 +19,6 @@
                        :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item>
-          <div class="newBand"
-               @click="search">搜索</div>
-        </el-form-item> -->
-        <!-- <el-form-item>
-          <div class="newBand"
-               @click="startRegest">开启报名</div>
-        </el-form-item> -->
       </el-form>
       <div class="tableWrap"
            style>
@@ -122,37 +114,28 @@
                              slot="reference">删除班级</el-button>
                 </el-popover>
 
-                <!-- <el-popover placement="top"
-                            width="160"
-                            :ref="scope.$index">
-                  <p>是否清空课表?</p>
-                  <div style="text-align: right; margin: 0">
-                    <el-button size="mini"
-                               type="text"
-                               @click="scope._self.$refs[scope.$index].doClose()">取消</el-button>
-                    <el-button type="primary"
-                               size="mini"
-                               @click="clearCourse(scope)">确定</el-button>
-                  </div> -->
-                <!-- v-if="scope.row.type !='MIX'" -->
-                <!-- <el-button type="text"
-                             slot="reference">清空课表</el-button>
-                </el-popover> -->
               </div>
             </template>
           </el-table-column>
         </el-table>
         <div class="floor">
-          <div class="add"
-               @click="temporary">新建临时班</div>
-          <div class="add"
-               @click="addNewClass('NORMAL')">新建单技班</div>
-          <div class="add"
-               @click="addNewClass('MIX')">新建合奏班</div>
-          <div class="add"
-               @click="addNewClass('MUSIC_NETWORK')">新建乐团网管课</div>
-          <div class="add"
-               @click="newClassVisible = true">基础技能班</div>
+          <div class="left">
+            <div class="add"
+                 @click="studentResetVisiable = true">学员班级调整</div>
+          </div>
+          <div class="right">
+            <div class="add"
+                 @click="temporary">新建临时班</div>
+            <div class="add"
+                 @click="addNewClass('NORMAL')">新建单技班</div>
+            <div class="add"
+                 @click="addNewClass('MIX')">新建合奏班</div>
+            <div class="add"
+                 @click="addNewClass('MUSIC_NETWORK')">新建乐团网管课</div>
+            <div class="add"
+                 @click="newClassVisible = true">基础技能班</div>
+          </div>
+
           <!-- <div class="add"
           @click="addNewClass('HIGH_ONLINE')">线上基础技能班</div>-->
         </div>
@@ -174,135 +157,6 @@
                      @submited="studentSubmited"
                      @close="studentVisible = false" />
     </el-dialog>
-    <!-- <el-dialog title="学员选择"
-               width="700px"
-               :visible.sync="studentVisible"
-               :modal-append-to-body="false">
-      <div class="studentMask">
-        <div class="left">
-          <div class="wrap">
-            <el-input placeholder="请输入班级名称"
-                      :disabled="!isNewClass"
-                      v-model.trim="className"></el-input>
-          </div>
-          <div class="chioseStudentList">
-            <h4 style="padding-left:10px;">当前已选学员</h4>
-            <div class="studentItem"
-                 v-for="(item,index) in activeListStudent"
-                 :key="index">
-              {{ item.name }}
-              <el-popover v-if="!isNewClass"
-                          placement="top"
-                          v-model.trim="item.isVisible"
-                          width="160">
-                <p>确定删除?</p>
-                <div style="text-align: right; margin: 0">
-                  <el-button size="mini"
-                             type="text"
-                             @click="item.isVisible = false">取消</el-button>
-                  <el-button type="primary"
-                             size="mini"
-                             @click="removeStudent(item)">确定</el-button>
-                </div>
-                <el-button type="text"
-                           slot="reference">删除</el-button>
-              </el-popover>
-              <el-button v-if="isNewClass"
-                         type="text"
-                         @click="temporaryRemoveStudent(item)">删除</el-button>
-            </div>
-          </div>
-        </div>
-        <div class="right"> -->
-    <!--  multiple
-          collapse-tags v-if="isSearch"  -->
-    <!-- <el-select v-model.trim="activeChioseSound"
-                     style="width:180px"
-                     @change="searchStudent"
-                     clearable
-                     filterable
-                     placeholder="声部选择">
-            <el-option v-for="(item,index) in soundList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
-          </el-select> -->
-    <!-- <el-button v-if="isSearch"
-                     type="danger"
-                     style="margin-left:20px;"
-          @click="searchStudent">搜索</el-button>-->
-
-    <!--   列表开始  -->
-    <!-- <div class="tableList">
-            <el-table tooltip-effect="dark"
-                      v-if="!isNewClass"
-                      style="width: 100%; margin-top:10px;"
-                      :data="studentList"
-                      ref="studentList"
-                      @selection-change="SelectionStudent">
-              <el-table-column type="selection"
-                               align="center"
-                               width="55"></el-table-column>
-              <el-table-column prop="name"
-                               align="center"
-                               width="120"
-                               label="姓名"></el-table-column>
-              <el-table-column prop="gender"
-                               align="center"
-                               width="100"
-                               label="性别">
-                <template slot-scope="scope">
-                  <div>{{ scope.row.gender | sex }}</div>
-                </template>
-              </el-table-column>
-              <el-table-column prop="subjectName"
-                               width="100"
-                               align="center"
-                               label="学员声部"></el-table-column>
-            </el-table> -->
-    <!-- 临时调整table -->
-    <!-- <el-table tooltip-effect="dark"
-                      v-if="isNewClass"
-                      style="width: 100%; margin-top:10px;"
-                      :data="studentList"
-                      ref="temporaryStudentList"
-                      @selection-change="NewselectionStudent">
-              <el-table-column type="selection"
-                               align="center"
-                               width="55"></el-table-column>
-              <el-table-column prop="name"
-                               align="center"
-                               width="120"
-                               label="姓名"></el-table-column>
-              <el-table-column prop="gender"
-                               align="center"
-                               width="100"
-                               label="性别">
-                <template slot-scope="scope">
-                  <div>{{ scope.row.gender | sex }}</div>
-                </template>
-              </el-table-column>
-              <el-table-column prop="subjectName"
-                               width="100"
-                               align="center"
-                               label="学员声部"></el-table-column>
-            </el-table>
-          </div>
-        </div>
-      </div>
-      <div slot="footer"
-           class="dialog-footer">
-        <el-button @click="studentVisible = false">取 消</el-button> -->
-    <!-- 班级学员修改 -->
-    <!-- <el-button type="primary"
-                   v-if="!isNewClass"
-                   @click="addSomeStudent">确 定</el-button> -->
-    <!-- 临时调整或者新建班级 -->
-    <!-- <el-button type="primary"
-                   v-if="isNewClass"
-                   @click="setInfoMsg">确 定</el-button>
-      </div>
-    </el-dialog> -->
     <!-- 老师以及课程设置 -->
     <el-dialog title="班级设置"
                width="950px"
@@ -320,214 +174,6 @@
                         @close="infoVisible = false"
                         @submited="getList" />
     </el-dialog>
-    <!-- <el-dialog title="班级设置"
-               width="780px"
-               :visible.sync="infoVisible"
-               :modal-append-to-body="false">
-      <el-alert
-        type="warning"
-        style="margin-bottom: 20px;"
-        :closable="false">
-        <template #title>
-          <div class="alert-content">
-            <span>
-              该班级剩余可排课时长：<strong>1000分钟</strong>
-            </span>
-            <strong>学员列表&gt;&gt;</strong>
-          </div>
-        </template>
-      </el-alert>
-      <el-form :inline="true"
-               :model="teacherForm"
-               ref="teacherForm"
-               :rules="teacherRules"
-               label-position="right"
-               label-width="100px;"> -->
-    <!-- <el-form-item label="调整方式"
-                      v-if="!isNewClass"
-                      prop="isAdd">
-          <el-radio v-model.trim="teacherForm.isAdd"
-                    label="new">班级加课</el-radio>
-          <el-radio v-model.trim="teacherForm.isAdd"
-                    label="renew">重新排课</el-radio>
-          <el-radio v-model.trim="teacherForm.isAdd"
-                    label="onlyUpdateTeacher">修改老师 -->
-    <!-- <el-tooltip placement="top"
-                        popper-class="mTooltip">
-              <div slot="content">
-                仅修改班级老师，不修改课程老师.
-              </div>
-              <i class="el-icon-question micon el-tooltip"
-                 style="font-size: 18px; color: #F56C6C"></i>
-            </el-tooltip> -->
-    <!-- </el-radio>
-
-        </el-form-item> -->
-
-    <!-- <br /> -->
-    <!-- <el-form-item label="主教老师"
-                      prop="coreTeacher">
-          <el-select v-model.trim="teacherForm.coreTeacher"
-                     placeholder="请选择主教老师"
-                     clearable
-                     filterable>
-            <el-option v-for="(item,index) in teacherList"
-                       :key="index"
-                       :label="item.realName"
-                       :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="助教老师"
-                      v-if="activeType!='HIGH_ONLINE'&&activeType!='MUSIC_NETWORK'"
-                      prop="assistant">
-          <el-select v-model.trim="teacherForm.assistant"
-                     placeholder="请选择助教老师"
-                     filterable
-                     clearable
-                     @change="setAssistant"
-                     multiple>
-            <el-option v-for="(item,index) in cooperationList"
-                       :key="index"
-                       :label="item.realName"
-                       :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <p v-if="teacherForm.isAdd =='onlyUpdateTeacher'"
-           style="padding-left: 10px; color: red;">注意：仅修改班级老师，不修改课程老师。</p>
-        <el-form-item label="课程类型"
-                      prop="courseType"
-                      v-if="teacherForm.isAdd !='onlyUpdateTeacher'">
-          <el-select v-model.trim="teacherForm.courseType"
-                     placeholder="请选择课程类型"
-                     @change="changeCourseType"
-                     clearable
-                     filterable>
-            <el-option v-for="(item,index) in courseTypeList"
-                       :key="index"
-                       :value="item.value"
-                       :label="item.label"></el-option>
-          </el-select>
-        </el-form-item> -->
-    <!--  v-if="!isNewClass" -->
-    <!-- <el-form-item label="声部"
-                      v-if="activeType=='HIGH_ONLINE'&&isNewClass"
-                      prop="sound">
-          <el-select v-model.trim="teacherForm.sound"
-                     style="width:180px"
-                     clearable
-                     filterable
-                     placeholder="请选择声部">
-            <el-option v-for="(item,index) in soundList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="预计招生人数"
-                      v-if="isNewClass"
-                      prop="expectStudentNum">
-          <el-input type="number"
-                    placeholder="请输入预计招生人数"
-                    :disabled="activeType=='HIGH_ONLINE'"
-                    @mousewheel.native.prevent
-                    v-model="teacherForm.expectStudentNum"></el-input>
-        </el-form-item>
-        <br />
-        <el-form-item label="排课次数"
-                      prop="courseNum"
-                      v-if="teacherForm.isAdd !='onlyUpdateTeacher'">
-          <el-input type="number"
-                    placeholder="请输入排课次数"
-                    @mousewheel.native.prevent
-                    v-model.trim="teacherForm.courseNum"></el-input>
-        </el-form-item>
-        <el-form-item label="排课起始时间"
-                      prop="courseTime"
-                      v-if="teacherForm.isAdd !='onlyUpdateTeacher'">
-          <el-date-picker v-model.trim="teacherForm.courseTime"
-                          :picker-options="pickerOptions"
-                          style="width:200px!important;"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择日期"></el-date-picker>
-          <el-checkbox style="margin-left:10px;"
-                       v-model.trim="teacherForm.checked">是否跳过节假日</el-checkbox>
-        </el-form-item>
-      </el-form>
-      <div class="WeekWrap"
-           v-if="teacherForm.isAdd !='onlyUpdateTeacher'">
-        <h3 style="margin-bottom:20px;">
-          循环次数
-          <el-button type="text"
-                     style="margin-left:10px;"
-                     @click="addWeek">添加</el-button>
-        </h3>
-        <div class="countWrap"
-             style="margin-bottom:10px;">
-          <div class="countItem"
-               style="margin-bottom:20px;"
-               v-for="(item,index) in weekList"
-               :key="index">
-            <span>循环周期:</span>
-            <el-select v-model.trim="item.dayOfWeek"
-                       style="width:100px!important"
-                       clearable
-                       filterable>
-              <el-option v-for="(item,index) in weekDateList"
-                         :key="index"
-                         :label="item.label"
-                         :value="item.value"></el-option>
-            </el-select>
-            <span>课程时长</span>
-            <el-input placeholder="时长(分)"
-                      type="number"
-                      v-model.trim="item.time"
-                      disabled
-                      @input="()=>{setItem(item,index)}"
-                      style="width:100px!important"></el-input>
-            <span>开始时间</span>
-            <el-time-picker style="margin-left:10px;"
-                            placeholder
-                            v-model.trim="item.startClassTime"
-                            @change="(val)=>{changeStartTimes(val,item)}"
-                            format='HH:mm'
-                            value-format='HH:mm'
-                            :picker-options="{
-                            selectableRange: '04:30:00 - 23:59:59'
-                            }"></el-time-picker>
-            <span style="margin-left:10px;">结束时间</span>
-            <el-time-picker style="margin-left:10px;"
-                            placeholder
-                            v-model.trim="item.endClassTime"
-                            format='HH:mm'
-                            value-format='HH:mm'
-                            disabled
-                            :picker-options="{
-                            selectableRange: '04:30:00 - 24:00:00'
-                            }"></el-time-picker>
-            <el-button type="danger"
-                       @click="removeWeek(item)"
-                       icon="el-icon-delete"
-                       circle></el-button>
-          </div>
-        </div>
-      </div>
-      <div slot="footer"
-           class="dialog-footer"> -->
-    <!-- 1为临时班级 -->
-    <!-- <el-button type="primary"
-                   v-if="isTemporary&&isNewClass"
-                   @click="submitTemporary(1)">确 定</el-button> -->
-    <!-- 2为新增班级 -->
-    <!-- <el-button type="primary"
-                   v-if="!isTemporary&&isNewClass"
-                   @click="submitTemporary(2)">确 定</el-button> -->
-    <!-- 修改班级信息 -->
-    <!-- <el-button type="primary"
-                   v-if="!isNewClass"
-                   @click="submitTemporary(3)">确 定</el-button>
-      </div>
-    </el-dialog> -->
     <!-- 新增合奏班 -->
     <el-dialog title="新增合奏班"
                width="700px"
@@ -713,6 +359,12 @@
       <viewStudentList :list="studentListModal"
                        @close="studentListModalVisible = false" />
     </el-dialog>
+
+    <el-dialog title='学员班级调整'
+               width="700px"
+               :visible.sync="studentResetVisiable">
+      <studentResetView />
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -751,6 +403,7 @@ import { classTimeList } from "@/utils/searchArray";
 import viewStudentList from './modals/view-student-list'
 import selectStudent from './modals/select-student'
 import classroomSetting from './modals/classroom-setting'
+import studentResetView from './modals/student-reset-view'
 import qs from "qs";
 import { permission } from '@/utils/directivePage'
 export default {
@@ -758,7 +411,8 @@ export default {
   components: {
     viewStudentList,
     selectStudent,
-    classroomSetting
+    classroomSetting,
+    studentResetView
   },
   data () {
     return {
@@ -881,7 +535,8 @@ export default {
       },
       classGroupIds: null,
       maxMun: 16,
-      courseTime: ''
+      courseTime: '',
+      studentResetVisiable: false
     };
   },
   created () {
@@ -907,37 +562,13 @@ export default {
               this.teacherList = res.data;
             }
           });
-
-          // queryEmployByOrganId({ organId: this.organId, rows: 10000 }).then(res => {
-          //   if (res.code == 200) {
-
-          //   }
-          // })
         }
       });
-      // // 获取乐团下未分班的单技班
-      // findNoClassSingle({ musicGroupId: this.teamid }).then(res => {
-      //   if (res.code == 200) {
-      //     this.singleList = res.data;
-      //   }
-      // })
-      // getMusicGroupStuNoClassType
-      // 获取合奏班下
-      // 1.获取乐团下所有的合奏班
-      // 2.根据合奏班获取所有的单技班
-      // 3.根据乐团id 查询 此乐团所有的合奏班
-      // 4.获取当年的所有节假日
       getAllClass({ musicGroupId: this.teamid }).then(res => {
         if (res.code == 200) {
           this.maxClassList = res.data;
         }
       });
-      // let year = new Date().getFullYear();
-      // axios.post('/jiari/', qs.stringify({ d: year })).then(res => {
-      //   this.holidayList = Object.keys(res.data[year])
-      // })
-      // getNoClassStudentAll({ musicGroupId: this.teamid }).then(res => {
-      // })
 
       // 获取默认乐团内的所有班
       this.changeMixClass();
@@ -947,17 +578,6 @@ export default {
           this.soundList = res.data;
         }
       });
-
-      // 获取分部所有老师
-      // findMusicGroupClassTeacher({
-      //   musicGroupId: this.teamid
-      // }).then(res => {
-      //   if (res.code == 200) {
-      //     this.teacherList = res.data
-      //   }
-      // })
-      // 获取分部所有老师
-      // 助教是从员工表里选
     },
     studentSubmited (data) {
       if (!this.isOnlyChangeUser) {
@@ -1080,12 +700,6 @@ export default {
       }
       this.isOnlyChangeUser = false
       this.classType = (types[type] || 3)
-      /**
-       *      { value: 'NORMAL', label: '单技班' },
-        { value: 'MIX', label: '合奏班' },
-        { value: 'HIGH', label: '基础技能班' },
-        { value: 'SNAP', label: '临时班' },
-       */
       this.setType(type);
       this.activeType = type;
       this.activeClass = "";
@@ -1224,21 +838,6 @@ export default {
       this.infoVisible = true;
     },
     async getNoClassStudent (type, actualSubjectId) {
-      // 获取乐团内所有未分班的学生
-      // if (type && type == 'SNAP') {
-      //   teamSoundStudent({ musicGroupId: this.teamid }).then(res => {
-      //     if (res.code == 200) {
-      //       this.studentList = res.data
-      //     }
-      //   })
-      // } else {
-      //   getMusicGroupStuNoClassType({ musicGroupId: this.teamid, type }).then(res => {
-      //     if (res.code == 200) {
-      //       this.studentList = res.data
-      //     }
-      //   })
-      // }
-      // res.data - activeListStudent
       const params = {
         musicGroupId: this.teamid,
         type,
@@ -1247,37 +846,6 @@ export default {
       await getMusicGroupStuNoClassType(params).then(
         res => {
           if (res.code == 200) {
-            // this.studentList = res.data.concat(this.activeListStudent).filter(item=>{
-            //   return res.data
-            // });
-            // if (this.activeType == "SNAP") {
-            //   let idarr2 = [];
-            //   let arr3 = res.data
-            //   for (let j in this.activeListStudent) {
-            //     idarr2.push(this.activeListStudent[j].userId);
-            //   }
-            //   this.studentList = arr3.filter(item => {
-            //     return (
-            //       idarr2.indexOf(item.userId) === -1
-            //     );
-            //   });
-            //   console.log(params, [...this.studentList])
-            //   // let idarr1 = [];
-            //   // let idarr2 = [];
-            //   // let arr3 = res.data.concat(this.activeListStudent);
-            //   // for (let i in res.data) {
-            //   //   idarr1.push(res.data[i].userId);
-            //   // }
-            //   // for (let j in this.activeListStudent) {
-            //   //   idarr2.push(this.activeListStudent[j].userId);
-            //   // }
-            //   // this.studentList = arr3.filter(item => {
-            //   //   return (
-            //   //     idarr1.indexOf(item.userId) === -1 ||
-            //   //     idarr2.indexOf(item.userId) === -1
-            //   //   );
-            //   // });
-            // } else {
             this.studentList = res.data;
             // }
           }
@@ -1763,7 +1331,7 @@ export default {
     }
   },
   watch: {
-    'newClassForm.type'() {
+    'newClassForm.type' () {
       if (this.newClassForm.type === 'HIGH_ONLINE') {
         this.$set(this.newClassForm, 'expectStudentNum', 5)
       }
@@ -1809,7 +1377,7 @@ export default {
   padding-right: 20px;
   display: flex;
   flex-direction: row;
-  justify-content: flex-end;
+  justify-content: space-between;
   width: 100%;
   height: 48px;
   line-height: 48px;
@@ -1819,16 +1387,22 @@ export default {
   align-items: center;
   position: relative;
   z-index: 1;
-  .remove {
-    width: 98px;
-    height: 32px;
-    background: rgba(248, 80, 67, 1);
-    border-radius: 3px;
-    color: #fff;
-    line-height: 32px;
-    text-align: center;
-    margin-left: 164px;
-    cursor: pointer;
+
+  .right {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    .remove {
+      width: 98px;
+      height: 32px;
+      background: rgba(248, 80, 67, 1);
+      border-radius: 3px;
+      color: #fff;
+      line-height: 32px;
+      text-align: center;
+      margin-left: 164px;
+      cursor: pointer;
+    }
   }
   .add {
     width: auto;