Merge branch 'online' into resetSound

dist/static/css/chunk-79d3c4ea.fc32408e.css

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

dist/static/css/chunk-93111822.e13a4b2b.css

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

src/views/teamDetail/components/courseList.vue

@@ -1,59 +1,88 @@
 <template>
   <div class="cl-container">
     <!-- 搜索类型 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item>
-        <el-select v-model.trim="searchForm.courseStatus" 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-select v-model.trim="searchForm.courseStatus"
+                   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-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model.trim="searchForm.classStatus" clearable filterable placeholder="课程状态">
-          <el-option label="未开始" value="NOT_START"></el-option>
-          <el-option label="进行中" value="UNDERWAY"></el-option>
-          <el-option label="已结束" value="OVER"></el-option>
+        <el-select v-model.trim="searchForm.classStatus"
+                   clearable
+                   filterable
+                   placeholder="课程状态">
+          <el-option label="未开始"
+                     value="NOT_START"></el-option>
+          <el-option label="进行中"
+                     value="UNDERWAY"></el-option>
+          <el-option label="已结束"
+                     value="OVER"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
         <!-- getMusicGroupAllClass -->
-        <el-select v-model.trim="searchForm.class" placeholder="班级名称" filterable clearable>
-          <el-option
-            v-for="(item,index) in classList"
-            :key="index"
-            :value="item.id"
-            :label="item.name"
-          ></el-option>
+        <el-select v-model.trim="searchForm.class"
+                   placeholder="班级名称"
+                   filterable
+                   clearable>
+          <el-option v-for="(item,index) in classList"
+                     :key="index"
+                     :value="item.id"
+                     :label="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model.trim="searchForm.isSettlement" placeholder="是否结算" filterable clearable>
-          <el-option value="0" label="未结算"></el-option>
-          <el-option value="1" label="已结算"></el-option>
+        <el-select v-model.trim="searchForm.isSettlement"
+                   placeholder="是否结算"
+                   filterable
+                   clearable>
+          <el-option value="0"
+                     label="未结算"></el-option>
+          <el-option value="1"
+                     label="已结算"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-date-picker
-          v-model.trim="searchForm.timer"
-          style="width:420px;"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
+        <el-date-picker v-model.trim="searchForm.timer"
+                        style="width:420px;"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <div class="searchBtn" @click="search">搜索</div>
+        <div class="searchBtn"
+             @click="search">搜索</div>
       </el-form-item>
     </el-form>
     <div class="btnWraps">
-      <div class="newBand" @click="removeCourses" v-permission="'courseSchedule/batchDelete'">批量删除</div>
+      <div class="newBand"
+           @click="removeCourses"
+           v-permission="'courseSchedule/batchDelete'">批量删除</div>
       <!-- <div class="newBand"
       @click="resetTimer">修改日期</div>-->
     </div>
@@ -61,113 +90,118 @@
 
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table
-        :data="tableList"
-        :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
-        <el-table-column align="center" width="180px" label="时间">
-          <template
-            slot-scope="scope"
-          >{{ scope.row.classDate }} {{ scope.row.startClassTime ? scope.row.startClassTime.substr(0, 5) : '' }}-{{ scope.row.endClassTime ? scope.row.endClassTime.substr(0, 5) : '' }}</template>
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection"
+                         width="55"
+                         :selectable="checkSelectable"></el-table-column>
+        <el-table-column align="center"
+                         width="180px"
+                         label="时间">
+          <template slot-scope="scope">{{ scope.row.classDate }} {{ scope.row.startClassTime ? scope.row.startClassTime.substr(0, 5) : '' }}-{{ scope.row.endClassTime ? scope.row.endClassTime.substr(0, 5) : '' }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="classGroupName" label="班级名称"></el-table-column>
+        <el-table-column align="center"
+                         prop="classGroupName"
+                         label="班级名称"></el-table-column>
         <!-- <el-table-column align='center'
                          prop="mixClassGroupName"
                          label="合奏班">
         </el-table-column>-->
-        <el-table-column align="center" prop="courseScheduleType" label="课程类型">
+        <el-table-column align="center"
+                         prop="courseScheduleType"
+                         label="课程类型">
           <template slot-scope="scope">
             <div>{{ scope.row.courseScheduleType | coursesType}}</div>
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="courseScheduleStatus" label="课程状态">
+        <el-table-column align="center"
+                         prop="courseScheduleStatus"
+                         label="课程状态">
           <template slot-scope="scope">
             <div>{{ scope.row.courseScheduleStatus | coursesStatus }}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="老师签到">
+        <el-table-column align="center"
+                         label="老师签到">
           <template slot-scope="scope">
             <div>{{ scope.row.signInStatus | attendanceType}}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="老师签退">
+        <el-table-column align="center"
+                         label="老师签退">
           <template slot-scope="scope">
             <div>{{ scope.row.signOutStatus | attendanceOutType}}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="masterTeacherName" label="指导老师"></el-table-column>
-        <el-table-column align="center" label="结算状态">
+        <el-table-column align="center"
+                         prop="masterTeacherName"
+                         label="指导老师"></el-table-column>
+        <el-table-column align="center"
+                         label="结算状态">
           <template slot-scope="scope">{{ scope.row.settlementTime ? '已结算' : '未结算' }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="remark" label="是否点名">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="是否点名">
           <template slot-scope="scope">{{ scope.row.isCallNames ? '已点名' : '未点名' }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="remark" label="备注"></el-table-column>
-        <el-table-column align="center" width="280px" label="操作" fixed="right">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="备注"></el-table-column>
+        <el-table-column align="center"
+                         width="280px"
+                         label="操作"
+                         fixed="right">
           <template slot-scope="scope">
             <div>
               <!-- {child: 'teacherAttendance/updateTeacherAttendance', parent: '/teamDetails/courseList'} -->
-              <el-button
-                v-if="scope.row.courseScheduleStatus == 'OVER' && !scope.row.settlementTime && permission('teacherAttendance/updateTeacherAttendance', '/teamDetails/courseList')"
-                type="text"
-                @click="onMarkAttendance(scope.row)"
-              >补考勤</el-button>
-              <el-button
-                v-if="scope.row.courseScheduleStatus == 'OVER' && !scope.row.settlementTime && permission('studentAttendance/updateStudentAttendances')"
-                type="text"
-                @click="onCallName(scope.row)"
-              >点名表</el-button>
+              <el-button v-if="scope.row.courseScheduleStatus == 'OVER' && !scope.row.settlementTime && permission('teacherAttendance/updateTeacherAttendance', '/teamDetails/courseList')"
+                         type="text"
+                         @click="onMarkAttendance(scope.row)">补考勤</el-button>
+              <el-button v-if="scope.row.courseScheduleStatus == 'OVER' && !scope.row.settlementTime && permission('studentAttendance/updateStudentAttendances')"
+                         type="text"
+                         @click="onCallName(scope.row)">点名表</el-button>
               <!-- OVER -->
               <!-- <el-button
                 v-if="scope.row.courseScheduleStatus == 'OVER' && permission('courseSchedule/classStartDateAdjust1')"
                 type="text"
                 @click="resetClass(scope.row)"
               >调整</el-button>-->
-              <el-button
-                v-if="!scope.row.settlementTime && permission('courseSchedule/classStartDateAdjust')"
-                type="text"
-                @click="resetClass(scope.row)"
-              >调整</el-button>
-              <el-button
-                v-if="scope.row.courseScheduleStatus == 'NOT_START' && permission('courseSchedule/batchDelete')"
-                type="text"
-                @click="removeSingleClass(scope.row)"
-              >删除</el-button>
+              <el-button v-if="!scope.row.settlementTime && permission('courseSchedule/classStartDateAdjust')"
+                         type="text"
+                         @click="resetClass(scope.row)">调整</el-button>
+              <el-button v-if="scope.row.courseScheduleStatus == 'NOT_START' && permission('courseSchedule/batchDelete')"
+                         type="text"
+                         @click="removeSingleClass(scope.row)">删除</el-button>
               <!-- v-if="scope.row.courseScheduleStatus == 'NOT_START' && permission('courseSchedule/batchDelete')"  teamDetail/resetTpye-->
-              <el-button
-                type="text"
-                @click="resetType(scope.row)"
-                v-if="permission('teamDetail/resetTpye')"
-              >类型调整</el-button>
-              <el-button
-                type="text"
-                v-if="permission('courseSchedule/cleanAttendance')"
-                @click="clearAttend(scope.row)"
-              >清除考勤</el-button>
+              <el-button type="text"
+                         @click="resetType(scope.row)"
+                         v-if="permission('teamDetail/resetTpye')">类型调整</el-button>
+              <el-button type="text"
+                         v-if="permission('courseSchedule/cleanAttendance')"
+                         @click="clearAttend(scope.row)">清除考勤</el-button>
             </div>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        :total="rules.total"
-        :page.sync="rules.page"
-        :limit.sync="rules.limit"
-        :page-sizes="rules.page_size"
-        @pagination="getList"
-      />
+      <pagination :total="rules.total"
+                  :page.sync="rules.page"
+                  :limit.sync="rules.limit"
+                  :page-sizes="rules.page_size"
+                  @pagination="getList" />
     </div>
-    <el-dialog title="课程调整" width="400px" :before-close="handleClose" :visible.sync="courseVisible">
-      <el-form
-        :model="maskForm"
-        ref="maskForm"
-        :rules="maskRules"
-        label-position="right"
-        label-width="80px;"
-        :inline="true"
-      >
+    <el-dialog title="课程调整"
+               width="400px"
+               :before-close="handleClose"
+               :visible.sync="courseVisible">
+      <el-form :model="maskForm"
+               ref="maskForm"
+               :rules="maskRules"
+               label-position="right"
+               label-width="80px;"
+               :inline="true">
         <!-- <el-form-item label="课程类型" prop="type">
           <el-select v-model.trim="maskForm.type" clearable filterable>
             <el-option
@@ -178,168 +212,176 @@
             ></el-option>
           </el-select>
         </el-form-item>-->
-        <el-form-item label="主教老师" prop="teacher">
-          <el-select v-model.trim="maskForm.teacher" clearable filterable>
-            <el-option
-              v-for="(item,index) in teacherList"
-              :key="index"
-              :value="item.id"
-              :label="item.realName"
-            ></el-option>
+        <el-form-item label="主教老师"
+                      prop="teacher">
+          <el-select v-model.trim="maskForm.teacher"
+                     clearable
+                     filterable>
+            <el-option v-for="(item,index) in teacherList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.realName"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="助教老师" prop="assistant">
-          <el-select v-model.trim="maskForm.assistant" clearable filterable multiple collapse-tags>
-            <el-option
-              v-for="(item,index) in teacherList"
-              :key="index"
-              :value="item.id"
-              :label="item.realName"
-            ></el-option>
+        <el-form-item label="助教老师"
+                      prop="assistant">
+          <el-select v-model.trim="maskForm.assistant"
+                     clearable
+                     filterable
+                     multiple
+                     collapse-tags>
+            <el-option v-for="(item,index) in teacherList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.realName"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="上课日期" prop="date">
-          <el-date-picker
-            v-model.trim="maskForm.date"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期"
-          ></el-date-picker>
+        <el-form-item label="上课日期"
+                      prop="date">
+          <el-date-picker v-model.trim="maskForm.date"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期"></el-date-picker>
         </el-form-item>
-        <el-form-item label="开始时间" v-if="courseVisible" prop="startTime">
-          <el-time-select
-            placeholder="起始时间"
-            v-model.trim="maskForm.startTime"
-            :picker-options="{
+        <el-form-item label="开始时间"
+                      v-if="courseVisible"
+                      prop="startTime">
+          <el-time-select placeholder="起始时间"
+                          v-model.trim="maskForm.startTime"
+                          :picker-options="{
                             start: '04:30',
                             step: '00:05',
                             end: '23:30'
-                            }"
-          ></el-time-select>
+                            }"></el-time-select>
         </el-form-item>
-        <el-form-item label="结束时间" v-if="courseVisible" prop="endTime">
-          <el-time-select
-            placeholder="结束时间"
-            v-model.trim="maskForm.endTime"
-            :picker-options="{
+        <el-form-item label="结束时间"
+                      v-if="courseVisible"
+                      prop="endTime">
+          <el-time-select placeholder="结束时间"
+                          v-model.trim="maskForm.endTime"
+                          :picker-options="{
                             start: '04:30',
                             step: '00:05',
                             end: '23:30',
                             minTime: maskForm.startTime
-                          }"
-          ></el-time-select>
+                          }"></el-time-select>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="courseVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitResetClass">确 定</el-button>
+        <el-button type="primary"
+                   @click="submitResetClass">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog
-      title="修改时间"
-      width="400px"
-      :before-close="handleCloseTimer"
-      :visible.sync="timerVisible"
-    >
+    <el-dialog title="修改时间"
+               width="400px"
+               :before-close="handleCloseTimer"
+               :visible.sync="timerVisible">
       <el-form :model="timerMask">
-        <el-form-item
-          label="上课日期"
-          :rules=" [{ required: true, message: '请选择日期', trigger: 'blur' },]"
-        >
-          <el-date-picker
-            v-model.trim="timerMask.timer"
-            type="date"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期"
-          ></el-date-picker>
+        <el-form-item label="上课日期"
+                      :rules=" [{ required: true, message: '请选择日期', trigger: 'blur' },]">
+          <el-date-picker v-model.trim="timerMask.timer"
+                          type="date"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期"></el-date-picker>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="timerVisible = false">取 消</el-button>
-        <el-button type="primary" @click="batchAdjustmentTime">确 定</el-button>
+        <el-button type="primary"
+                   @click="batchAdjustmentTime">确 定</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog title="补考勤" width="400px" :visible.sync="markAttendance.status">
+    <el-dialog title="补考勤"
+               width="400px"
+               :visible.sync="markAttendance.status">
       <el-form>
         <el-form-item label="签到状态">{{ markAttendance.dataInfo.signInStatus | attendanceType }}</el-form-item>
         <el-form-item label="签到时间">{{ markAttendance.dataInfo.signInTime}}</el-form-item>
         <el-form-item label="签退状态">{{ markAttendance.dataInfo.signOutStatus | attendanceOutType }}</el-form-item>
         <el-form-item label="签退时间">{{ markAttendance.dataInfo.signOutTime}}</el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="markAttendance.status = false">取 消</el-button>
-        <el-button
-          type="primary"
-          :disabled="markAttendance.dataInfo.signOutStatus == 1 && markAttendance.dataInfo.signInStatus == 1 ? true : false"
-          @click="batchAdjustmentTime"
-        >确定补卡</el-button>
+        <el-button type="primary"
+                   :disabled="markAttendance.dataInfo.signOutStatus == 1 && markAttendance.dataInfo.signInStatus == 1 ? true : false"
+                   @click="batchAdjustmentTime">确定补卡</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog title="点名表" width="700px" :visible.sync="rollCall.status">
+    <el-dialog title="点名表"
+               width="700px"
+               :visible.sync="rollCall.status">
       <el-table :data="rollCall.gridData">
-        <el-table-column align="center" property="userName" label="学员姓名"></el-table-column>
-        <el-table-column align="center" property="phone" label="手机号"></el-table-column>
-        <el-table-column align="center" property="subjectName" label="学员声部"></el-table-column>
-        <el-table-column align="center" label="到课状态">
+        <el-table-column align="center"
+                         property="userName"
+                         label="学员姓名"></el-table-column>
+        <el-table-column align="center"
+                         property="phone"
+                         label="手机号"></el-table-column>
+        <el-table-column align="center"
+                         property="subjectName"
+                         label="学员声部"></el-table-column>
+        <el-table-column align="center"
+                         label="到课状态">
           <template slot-scope="scope">{{ scope.row.status | studentCallName }}</template>
         </el-table-column>
-        <el-table-column align="center" label="操作" width="220px">
+        <el-table-column align="center"
+                         label="操作"
+                         width="220px">
           <template slot-scope="scope">
-            <el-button
-              size="small"
-              @click="onChangeRollCall('TRUANT', scope.row)"
-              type="primary"
-              round
-            >未到</el-button>
-            <el-button
-              size="small"
-              @click="onChangeRollCall('LEAVE', scope.row)"
-              type="warning"
-              round
-            >请假</el-button>
-            <el-button
-              size="small"
-              @click="onChangeRollCall('NORMAL', scope.row)"
-              type="success"
-              round
-            >到课</el-button>
+            <el-button size="small"
+                       @click="onChangeRollCall('TRUANT', scope.row)"
+                       type="primary"
+                       round>未到</el-button>
+            <el-button size="small"
+                       @click="onChangeRollCall('LEAVE', scope.row)"
+                       type="warning"
+                       round>请假</el-button>
+            <el-button size="small"
+                       @click="onChangeRollCall('NORMAL', scope.row)"
+                       type="success"
+                       round>到课</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        :total="rollCall.total"
-        :page.sync="rollCall.page"
-        :limit.sync="rollCall.limit"
-        :page-sizes="rollCall.page_size"
-        @pagination="getCallName"
-      />
+      <pagination :total="rollCall.total"
+                  :page.sync="rollCall.page"
+                  :limit.sync="rollCall.limit"
+                  :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-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">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="typeVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitResetType">确定</el-button>
+        <el-button type="primary"
+                   @click="submitResetType">确定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -365,7 +407,7 @@ import { permission } from "@/utils/directivePage";
 export default {
   name: "tcourseList",
   props: ["teamid"],
-  data() {
+  data () {
     return {
       courseType: [
         { value: "SINGLE", label: "单技课" },
@@ -374,7 +416,8 @@ export default {
         { value: "TRAINING_MIX", label: "集训合奏课" },
         { value: "HIGH", label: "基础技能课" },
         { value: "COMPREHENSIVE", label: "综合课" },
-        { value: "CLASSROOM", label: "课堂课" }
+        { value: "CLASSROOM", label: "课堂课" },
+        { label: "线上基础技能课", value: "HIGH_ONLINE" },
       ],
       typeVisible: false,
       timerVisible: false,
@@ -453,14 +496,14 @@ export default {
   components: {
     pagination
   },
-  mounted() {
+  mounted () {
     this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       this.getList();
       // 获取所有老师
       // findMusicGroupClassTeacher({ musicGroupId: this.teamid }).then(res => {
@@ -481,20 +524,20 @@ export default {
         }
       });
     },
-    onMarkAttendance(item) {
+    onMarkAttendance (item) {
       // 补考勤
       this.markAttendance = {
         status: true,
         dataInfo: item
       };
     },
-    onCallName(item) {
+    onCallName (item) {
       // 点名表
       this.rollCall.page = 1;
       this.rollCall.selectItem = item;
       this.getCallName();
     },
-    getCallName() {
+    getCallName () {
       let rollCall = this.rollCall;
       let params = {
         page: rollCall.page,
@@ -510,7 +553,7 @@ export default {
         }
       });
     },
-    onChangeRollCall(type, row) {
+    onChangeRollCall (type, row) {
       let rollCall = this.rollCall;
       let params = {
         courseScheduleId: rollCall.selectItem.courseScheduleId,
@@ -531,14 +574,14 @@ export default {
         }
       });
     },
-    permission(str, parent) {
+    permission (str, parent) {
       return permission(str, parent);
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    getList() {
+    getList () {
       let searchForm = this.searchForm;
       if (!searchForm.timer) {
         searchForm.timer = [];
@@ -561,7 +604,7 @@ export default {
         }
       });
     },
-    resetClass(row) {
+    resetClass (row) {
       this.maskForm.teacher = parseInt(row.masterTeacherId);
       // this.maskForm.type = row.courseScheduleType;
       this.maskForm.assistant = [];
@@ -587,7 +630,7 @@ export default {
       //   classGroupId: row.id
       // }
     },
-    removeSingleClass(row) {
+    removeSingleClass (row) {
       this.$confirm("是否删除该课程?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -602,9 +645,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    removeCourses() {
+    removeCourses () {
       // 批量删除
       if (this.activeCourseList.length < 1) {
         this.$message.error("请至少选择一节课");
@@ -628,9 +671,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    submitResetClass() {
+    submitResetClass () {
       let maskForm = this.maskForm;
       if (!maskForm.startTime || !maskForm.endTime) {
         this.$message.error("请填写开始时间或结束时间");
@@ -663,9 +706,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    handleClose() {
+    handleClose () {
       this.courseVisible = false;
       (this.maskForm = {
         teacher: "",
@@ -677,14 +720,14 @@ export default {
       }),
         this.$refs["maskForm"].resetFields();
     },
-    handleSelectionChange(val) {
+    handleSelectionChange (val) {
       this.activeCourseList = val;
     },
-    checkSelectable(val) {
+    checkSelectable (val) {
       return val.courseScheduleStatus == "NOT_START";
       // return true;
     },
-    batchAdjustmentTime() {
+    batchAdjustmentTime () {
       let tempData = this.markAttendance.dataInfo;
       let params = {
         teacherId: tempData.masterTeacherId,
@@ -702,18 +745,18 @@ export default {
         }
       });
     },
-    handleCloseTimer() {
+    handleCloseTimer () {
       this.timerVisible = false;
       this.timerMask.timer = "";
     },
-    resetTimer() {
+    resetTimer () {
       if (this.activeCourseList.length < 1) {
         this.$message.error("请至少选择一节课");
         return;
       }
       this.timerVisible = true;
     },
-    resetType(row) {
+    resetType (row) {
       this.typeForm.type = row.courseScheduleType;
       this.typeForm.id = row.courseScheduleId;
       this.typeForm.teacher = parseInt(row.masterTeacherId);
@@ -734,7 +777,7 @@ export default {
       //  console.log(row.type)
       this.typeVisible = true;
     },
-    submitResetType() {
+    submitResetType () {
       this.$refs.typeForm.validate(res => {
         if (res) {
           let teachingTeacherIdList = this.typeForm.assistant.join(",");
@@ -761,7 +804,7 @@ export default {
       });
     },
     // 清除考勤
-    clearAttend(row) {
+    clearAttend (row) {
       this.$confirm("是否清除考勤记录?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -779,7 +822,7 @@ export default {
             }
           );
         })
-        .catch(() => {});
+        .catch(() => { });
     }
   },
   filters: {

src/views/teamDetail/components/resetClass.vue

@@ -337,8 +337,9 @@
                        :label="item.label"></el-option>
           </el-select>
         </el-form-item>
+        <!--  v-if="!isNewClass" -->
         <el-form-item label="声部"
-                      v-if="activeType=='HIGH_ONLINE'"
+                      v-if="activeType=='HIGH_ONLINE'&&isNewClass"
                       prop="sound">
           <el-select v-model.trim="teacherForm.sound"
                      style="width:180px"

src/views/teamDetail/components/studentList.vue

@@ -230,15 +230,15 @@
               <el-button type="text"
                          v-if="permission('studentManage/queryStudentClassGroup')"
                          @click="lookClass(scope.row)">查看班级</el-button>
-              <!-- <el-button type="text"
+              <el-button type="text"
                          v-if="!scope.row.isLock && permission('studentManage/updateStudentFeeIsLock')"
                          @click="lockStudent(scope.row)">锁定</el-button>
               <el-button v-if="scope.row.isLock && permission('studentManage/updateStudentFeeIsLock')"
                          type="text"
-                         @click="lockStudent(scope.row)">解锁</el-button> -->
-              <!-- <el-button type="text"
+                         @click="lockStudent(scope.row)">解锁</el-button>
+              <el-button type="text"
                          v-if="permission('studentManage/updateStudentFee')"
-                         @click="resetPay(scope.row)">修改缴费</el-button> -->
+                         @click="resetPay(scope.row)">修改缴费</el-button>
               <el-button type='text'
                          v-if="permission('musicGroupQuit/directQuitMusicGroup')"
                          @click="quieTeamMask(scope.row)">退团</el-button>
@@ -259,12 +259,12 @@
                   @pagination="getList" />
     </div>
     <el-dialog title="新增学员"
-               width="640px"
+               width="680px"
                class="studentInfo"
                :visible.sync="addStudentVisible">
       <el-form :model="maskForm"
                label-position="right"
-               label-width="100px"
+               label-width="120px"
                ref="maskForm"
                :rules="maskRules"
                :inline="true">
@@ -410,6 +410,28 @@
                        :label="item.name"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="线上基础技能班">
+          <el-select v-model.trim="maskForm.highonline"
+                     filterable
+                     clearable
+                     multiple>
+            <el-option v-for="(item,index) in highonlineList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.name"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="乐团网管课">
+          <el-select v-model.trim="maskForm.muiscnetwork"
+                     filterable
+                     clearable
+                     multiple>
+            <el-option v-for="(item,index) in muiscnetworkList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.name"></el-option>
+          </el-select>
+        </el-form-item>
 
         <el-divider>首缴订单信息</el-divider>
         <el-form-item label="课程费用"
@@ -686,6 +708,8 @@ export default {
       highList: [],
       snapList: [],
       soundList: [],
+      highonlineList: [],
+      muiscnetworkList: [],
       qrcodeStatus: false, // 生成二维码
       qrcodes: true,
       qrcode: null,
@@ -702,7 +726,8 @@ export default {
         mixClass: "",
         highClass: "",
         snapClass: [],
-        // price: '',
+        highonline: '',
+        muiscnetwork: '',
         startClass: "",
         id: "",
         courseFee: null, // 声部费用
@@ -841,7 +866,12 @@ export default {
               this.highList.push(item);
             } else if (item.type == "SNAP") {
               this.snapList.push(item);
+            } else if (item.type == 'HIGH_ONLINE') {
+              this.highonlineList.push(item)
+            } else if (item.type == 'MUSIC_NETWORK') {
+              this.muiscnetworkList.push(item)
             }
+
           });
         }
       });
@@ -1022,11 +1052,14 @@ export default {
         mixClass: '',
         highClass: '',
         snapClass: [], --> */
+
           let maskForm = this.maskForm;
           if (
             !maskForm.signClass &&
             !maskForm.mixClass &&
-            !maskForm.highClass
+            !maskForm.highClass &&
+            !maskForm.highonline &&
+            !muiscnetwork
           ) {
             if (
               !maskForm.snapClass ||