Merge branch 'online' into LAOMO

dist/static/css/chunk-32b1c352.dbbc6037.css

@@ -0,0 +1 @@
+.alert[data-v-34b5a86f]{margin:10px 0}.dialog-footer[data-v-7a45b8f0]{margin-top:20px;display:block;text-align:right}.el-button--primary[data-v-286a96f8],.el-button--primary[data-v-286a96f8]:active,.el-button--primary[data-v-286a96f8]:focus,.el-button--primary[data-v-286a96f8]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-286a96f8] .el-date-editor.el-input,[data-v-286a96f8] .el-select{width:100%!important}[data-v-286a96f8] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-286a96f8] .el-dialog__body{padding:10px 20px}.newBand[data-v-286a96f8]{display:inline-block}

dist/static/css/chunk-589bfba6.6e57ddf6.css

@@ -1 +0,0 @@
-.alert[data-v-34b5a86f]{margin:10px 0}.dialog-footer[data-v-7a45b8f0]{margin-top:20px;display:block;text-align:right}.el-button--primary[data-v-6b67decf],.el-button--primary[data-v-6b67decf]:active,.el-button--primary[data-v-6b67decf]:focus,.el-button--primary[data-v-6b67decf]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-6b67decf] .el-date-editor.el-input,[data-v-6b67decf] .el-select{width:100%!important}[data-v-6b67decf] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-6b67decf] .el-dialog__body{padding:10px 20px}.newBand[data-v-6b67decf]{display:inline-block}

src/utils/vueFilter.js

@@ -639,7 +639,7 @@ Vue.filter('saleType', value => {
 Vue.filter('teamPayStatus', value => {
   const tpl = {
     0: '按月',
-    1: '按季',
+    1: '按学期',
     2: '一次性',
   }
   return tpl[value]

src/views/auditList/index.vue

@@ -7,191 +7,169 @@
     </h2>
     <div class="m-core">
       <!-- 搜索标题 -->
-      <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+      <el-form :inline="true"
+               class="searchForm"
+               v-model.trim="searchForm">
         <el-form-item>
-          <el-input
-            v-model.trim="searchForm.search"
-            @keyup.enter.native="search"
-            placeholder="乐团名称/编号"
-          ></el-input>
+          <el-input v-model.trim="searchForm.search"
+                    @keyup.enter.native="search"
+                    placeholder="乐团名称/编号"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.organId"
-            filterable
-            clearable
-            placeholder="请选择分部"
-          >
-            <el-option
-              v-for="(item, index) in organList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.organId"
+                     filterable
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="(item, index) in organList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.paymentType"
-            filterable
-            clearable
-            placeholder="申请类型"
-          >
-            <el-option
-              v-for="(item, index) in paymentTypeList"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.paymentType"
+                     filterable
+                     clearable
+                     placeholder="申请类型">
+            <el-option v-for="(item, index) in paymentTypeList"
+                       :key="index"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.status"
-            filterable
-            clearable
-            placeholder="审核状态"
-          >
-            <el-option
-              v-for="(item, index) in statusList"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.status"
+                     filterable
+                     clearable
+                     placeholder="审核状态">
+            <el-option v-for="(item, index) in statusList"
+                       :key="index"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList" type="danger">搜索</el-button>
+          <el-button @click="getList"
+                     type="danger">搜索</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
-        <el-table
-          :data="tableList"
-          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
-        >
+        <el-table :data="tableList"
+                  :header-cell-style="{ background: '#EDEEF0', color: '#444' }">
           <!-- <el-table-column type="selection" width="55"></el-table-column> -->
-          <el-table-column
-            align="center"
-            prop="organName"
-            label="分部名称"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            prop="musicGroupName"
-            label="乐团名称"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            width="180px"
-            prop="musicGroupId"
-            label="乐团编号"
-          ></el-table-column>
-          <el-table-column align="center" prop="paymentType" label="申请类型">
+          <el-table-column align="center"
+                           prop="organName"
+                           label="分部名称"></el-table-column>
+          <el-table-column align="center"
+                           prop="musicGroupName"
+                           label="乐团名称">
+            <template slot-scope="scope">
+              <div>
+                <Tooltip :content="scope.row.musicGroupName" />
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
+                           width="180px"
+                           prop="musicGroupId"
+                           label="乐团编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="paymentType"
+                           label="申请类型">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.paymentType | auditPaymentType }}
               </div>
-            </template></el-table-column
-          >
-          <el-table-column align="center" prop="payUserType" label="订单类型">
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="payUserType"
+                           label="订单类型">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.payUserType | payOrderType }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="addCourseTotalTime"
-            label="加课总时长(分钟)"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            prop="courseOriginalPrice"
-            label="原现价(元)"
-          >
+          <el-table-column align="center"
+                           prop="addCourseTotalTime"
+                           label="加课总时长(分钟)"></el-table-column>
+          <el-table-column align="center"
+                           prop="courseOriginalPrice"
+                           label="原现价(元)">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.courseOriginalPrice | moneyFormat }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="courseCurrentPrice"
-            label="申请价格(元)"
-          >
+          <el-table-column align="center"
+                           prop="courseCurrentPrice"
+                           label="申请价格(元)">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.courseCurrentPrice | moneyFormat }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="memo" label="备注">
+          <el-table-column align="center"
+                           prop="memo"
+                           label="备注">
             <template slot-scope="scope">
               <tooltip :content="scope.row.memo" />
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="operatorName"
-            label="申请人"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            prop="auditStatus"
-            label="状态"
-            width="100px"
-          >
+          <el-table-column align="center"
+                           prop="operatorName"
+                           label="申请人"></el-table-column>
+          <el-table-column align="center"
+                           prop="auditStatus"
+                           label="状态"
+                           width="100px">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.auditStatus | auditType }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="createTime"
-            label="申请时间"
-            width="140px"
-          >
+          <el-table-column align="center"
+                           prop="createTime"
+                           label="申请时间"
+                           width="140px">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.createTime | dateForMinFormat }}
               </div>
-            </template></el-table-column
-          >
+            </template>
+          </el-table-column>
           <!--  -->
-          <el-table-column
-            align="center"
-            label="操作"
-            width="100px"
-            fixed="right"
-          >
+          <el-table-column align="center"
+                           label="操作"
+                           width="100px"
+                           fixed="right">
             <template slot-scope="scope">
-              <el-button
-                v-permission="'helpCenterContent/modify'"
-                @click="lookDetail(scope.row)"
-                type="text"
-                >查看</el-button
-              >
+              <el-button v-permission="'helpCenterContent/modify'"
+                         @click="lookDetail(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 :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
+                    @pagination="getList" />
       </div>
     </div>
-    <el-dialog title="申请详情" width="900px" :visible.sync="typeStatus" destroy-on-close>
-      <review :detail="detail" @close="close" />
+    <el-dialog title="申请详情"
+               width="900px"
+               :visible.sync="typeStatus"
+               destroy-on-close>
+      <review :detail="detail"
+              @close="close" />
     </el-dialog>
   </div>
 </template>
@@ -207,7 +185,7 @@ import { auditTypeList, auditPaymentTypeList } from "@/utils/searchArray";
 export default {
   components: { pagination, Tooltip, review },
   name: "helpCategory",
-  data() {
+  data () {
     return {
       paymentTypeList: auditPaymentTypeList,
       organList: [],
@@ -231,10 +209,10 @@ export default {
       typeStatus: false,
     };
   },
-  activated() {
+  activated () {
     this.getList();
   },
-  mounted() {
+  mounted () {
     getEmployeeOrgan().then((res) => {
       if (res.code == 200) {
         this.organList = res.data;
@@ -243,7 +221,7 @@ export default {
     this.getList();
   },
   methods: {
-    getList() {
+    getList () {
       let params = {
         page: this.pageInfo.page,
         rows: this.pageInfo.limit,
@@ -258,22 +236,22 @@ export default {
       });
     },
 
-    lookDetail(row) {
+    lookDetail (row) {
       // this.detail = res.data
       this.detail = {
-        id:row.musicGroupPaymentCalenderId,
-        musicGroupId:row.musicGroupId,
-        status:row.auditStatus
+        id: row.musicGroupPaymentCalenderId,
+        musicGroupId: row.musicGroupId,
+        status: row.auditStatus
       }
       this.typeStatus = true;
     },
-    close() {
+    close () {
       this.typeStatus = false;
       this.getList()
     },
   },
   watch: {
-    typeStatus(val) {
+    typeStatus (val) {
       if (!val) {
         this.detail = null;
       }

src/views/categroyManager/specialSetup/discountManage.vue

@@ -143,9 +143,10 @@
       </span>
     </el-dialog>
     <el-dialog :visible.sync="createVisible"
-               title="添加折扣商品"
+               title="添加商品折扣"
                width="400px">
       <createDiscount @close="createVisible = false"
+                      @submited="getList"
                       :typesList="typesList"
                       :subjectList="subjectList" />
     </el-dialog>

src/views/categroyManager/specialSetup/modals/create-discount.vue

@@ -48,6 +48,7 @@
 </template>
 <script>
 import { insertChargeTypeSubjectMapper } from '@/api/specialSetting'
+import { listeners } from 'process';
 export default {
   props: ['typesList', 'subjectList'],
   data () {
@@ -77,6 +78,7 @@ export default {
           try {
             await insertChargeTypeSubjectMapper(data)
             this.$message.success('创建成功')
+            this.$listeners.submited()
             this.$listeners.close()
           } catch (error) { }
         }

src/views/chargeManager/three.vue

@@ -176,7 +176,7 @@ export default {
     getOrganToStr(id) {
       let name = null
       this.calcBranchList.forEach(item => {
-        if(item.value == id) {
+        if(item.organId == id) {
           name = item.label
         }
       })
@@ -242,13 +242,14 @@ export default {
             if(val) {
                this.branchList.push({
                 label: item.organName,
-                value: item.id,
+                value: item.organId,
                 payType: item.payType
               });
             } else {
               this.calcBranchList.push({
                 label: item.organName,
                 value: item.id,
+                organId: item.organId,
                 payType: item.payType
               });
             }

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -102,7 +102,7 @@
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button>
               <el-button type="text"
                          @click="openChioseStudent(scope.row)"
-                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus"
+                         v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY'"
                          v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
               <el-button type="text"
                          v-if="scope.row.status == 'REJECT'&&teamStatus"

src/views/resetTeaming/modals/user-pay-form.vue

@@ -49,7 +49,7 @@
                     :isUserType="isUserType"
                     :form.sync="cycle"
                     :isCommon="isCommon"
-                    :isDisabled="form.leixing === '1' || paymentType == '0'" />
+                    :isDisabled="true" />
     </template>
     <el-alert title="其它"
               :closable="false"
@@ -210,6 +210,7 @@ export default {
       }
     },
     priceChange (item, index) {
+      console.log({...item})
       const _ = [...this.eclass]
       const active = this.organizationCourseUnitPriceSettingsByType[item.courseType] || {}
       const price = Math.ceil((item.courseTotalMinuties || 1) * (active.unitPrice || 1))
@@ -217,6 +218,7 @@ export default {
       item.courseOriginalPrice = price
       _[index] = item
       this.eclass = [..._]
+      this.syncAllMoney()
     },
     syncAllMoney () {
       let money = 0;

src/views/teamBuild/components/soundSetComponents/chioseMusic.vue

@@ -59,10 +59,10 @@
         </div>
       </div>
     </div>
-    <div class="coreItemRow">
+    <div class="coreItemRow"
+         v-if="!basdisabled">
       <p class="title"></p>
       <el-button type="info"
-                 v-if="!basdisabled"
                  plain
                  style="width:558px"
                  size="mini"

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

@@ -81,11 +81,6 @@
                          v-permission="'classGroup/classGroupUpdate'"
                          @click="classAdjustment(scope.row)">老师调整</el-button>
               <el-button type="text"
-                         v-if="scope.row.type
-                         !='HIGH'
-                         &&scope.row.type
-                         !='HIGH_ONLINE'
-              "
                          v-permission="'classGroupStudent/updateClassGroupStudents'"
                          @click="resetClass(scope.row)">学员调整</el-button>
               <el-popover placement="top"
@@ -106,14 +101,14 @@
                            slot="reference">删除班级</el-button>
               </el-popover>
 
-              <el-button type="text"
+              <!-- <el-button type="text"
                          v-if="scope.row.type
                          ==='HIGH'
                          ||scope.row.type
                          ==='HIGH_ONLINE'
               "
                          v-permission="'classGroupStudent/addStudents'"
-                         @click="addstudentBtn(scope.row)">添加学员</el-button>
+                         @click="addstudentBtn(scope.row)">添加学员</el-button> -->
             </div>
           </template>
         </el-table-column>
@@ -688,6 +683,7 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import selectStudent from '../../../teamDetail/components/modals/select-student'
+import { updateClassGroupStudents } from '../../../teamDetail/api'
 import {
   getTeacher,
   getEmployeeOrgan,
@@ -993,13 +989,13 @@ export default {
         superFindClassGroups({ classGroupId: this.activeClass }).then(res => {
           if (res.code == 200) {
             let maxNum = res.data.rows[0].expectStudentNum;
-            if (arr.length + this.activeListStudent.length > maxNum) {
+            if (arr.length > maxNum) {
               this.$message.error("超过预计招生人数");
               return;
             } else {
-              addStudents({
+              updateClassGroupStudents({
                 classGroupId: this.activeClass,
-                userIdsStr: arr.join(",")
+                studentIds: arr.join(",")
               }).then(res => {
                 if (res.code == 200) {
                   this.studentVisible = false;
@@ -1012,9 +1008,9 @@ export default {
           }
         });
       } else {
-        addStudents({
+        updateClassGroupStudents({
           classGroupId: this.activeClass,
-          userIdsStr: arr.join(",")
+          studentIds: arr.join(",")
         }).then(res => {
           if (res.code == 200) {
             this.studentVisible = false;
@@ -1391,7 +1387,7 @@ export default {
           } else if (type == 3) {
             // activeClass
             obj.classGroupId = this.activeClass;
-            classGroupUpdate(obj).then(res => {
+            classGroupUpdate([obj]).then(res => {
               if (res.code == 200) {
                 this.$message.success("修改成功");
                 this.infoVisible = false;

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

@@ -211,10 +211,12 @@ export default {
         }
         try {
           await musicGroupPaymentCalenderAdd(data)
-          this.$messaage.success('提交成功')
+          this.$message.success('提交成功')
           this.$listeners.submited()
           this.$listeners.close()
-        } catch (error) {}
+        } catch (error) {
+          console.log(error)
+        }
       }
     }
   },

src/views/teamDetail/components/modals/select-student.vue

@@ -132,9 +132,15 @@ export default {
     renderFunc(h, option) {
       return (
         <div class="line">
-          <span>{option.name}</span>
+          <el-tooltip class="item" effect="dark" placement="top">
+            <span slot="content">{option.name}</span>
+            <span class="select-item">{option.name}</span>
+          </el-tooltip>
           <span>{option.gender}</span>
-          <span>{option.subjectName}</span>
+          <el-tooltip class="item" effect="dark" placement="top">
+            <span slot="content">{option.subjectName}</span>
+            <span class="select-item">{option.subjectName}</span>
+          </el-tooltip>
         </div>
       );
     },
@@ -202,7 +208,7 @@ export default {
 }
 .hideReturn{
   /deep/ .el-transfer__buttons button:first-child{
-    // display: none;
+    display: none;
   }
 }
 /deep/ .el-checkbox-group{
@@ -212,6 +218,12 @@ export default {
   width: 220px;
   display: flex;
   justify-content: space-around;
+  .select-item{
+    width: 33.33333%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 }
 /deep/ .dialog-footer{
   margin-top: 20px;

src/views/teamDetail/components/resetClass.vue

@@ -134,8 +134,8 @@
                                size="mini"
                                @click="clearCourse(scope)">确定</el-button>
                   </div> -->
-                  <!-- v-if="scope.row.type !='MIX'" -->
-                  <!-- <el-button type="text"
+                <!-- v-if="scope.row.type !='MIX'" -->
+                <!-- <el-button type="text"
                              slot="reference">清空课表</el-button>
                 </el-popover> -->
               </div>
@@ -159,24 +159,20 @@
       </div>
     </div>
     <!-- 学员选择 -->
-    <el-dialog
-      title="学员选择"
-      width="750px"
-      :visible.sync="studentVisible"
-      destroy-on-close
-    >
-      <selectStudent
-        :activeListStudent="activeListStudent"
-        :studentList="studentList"
-        :soundList="soundList"
-        :classGroupId="activeClass"
-        :isOnlyChangeUser="isOnlyChangeUser"
-        :activeType="activeType"
-        @changeActiveChioseSound="changeActiveChioseSound"
-        @searchStudent="searchStudent"
-        @submited="studentSubmited"
-        @close="studentVisible = false"
-      />
+    <el-dialog title="学员选择"
+               width="750px"
+               :visible.sync="studentVisible"
+               destroy-on-close>
+      <selectStudent :activeListStudent="activeListStudent"
+                     :studentList="studentList"
+                     :soundList="soundList"
+                     :classGroupId="activeClass"
+                     :isOnlyChangeUser="isOnlyChangeUser"
+                     :activeType="activeType"
+                     @changeActiveChioseSound="changeActiveChioseSound"
+                     @searchStudent="searchStudent"
+                     @submited="studentSubmited"
+                     @close="studentVisible = false" />
     </el-dialog>
     <!-- <el-dialog title="学员选择"
                width="700px"
@@ -218,9 +214,9 @@
           </div>
         </div>
         <div class="right"> -->
-          <!--  multiple
+    <!--  multiple
           collapse-tags v-if="isSearch"  -->
-          <!-- <el-select v-model.trim="activeChioseSound"
+    <!-- <el-select v-model.trim="activeChioseSound"
                      style="width:180px"
                      @change="searchStudent"
                      clearable
@@ -231,13 +227,13 @@
                        :label="item.name"
                        :value="item.id"></el-option>
           </el-select> -->
-          <!-- <el-button v-if="isSearch"
+    <!-- <el-button v-if="isSearch"
                      type="danger"
                      style="margin-left:20px;"
           @click="searchStudent">搜索</el-button>-->
 
-          <!--   列表开始  -->
-          <!-- <div class="tableList">
+    <!--   列表开始  -->
+    <!-- <div class="tableList">
             <el-table tooltip-effect="dark"
                       v-if="!isNewClass"
                       style="width: 100%; margin-top:10px;"
@@ -264,8 +260,8 @@
                                align="center"
                                label="学员声部"></el-table-column>
             </el-table> -->
-            <!-- 临时调整table -->
-            <!-- <el-table tooltip-effect="dark"
+    <!-- 临时调整table -->
+    <!-- <el-table tooltip-effect="dark"
                       v-if="isNewClass"
                       style="width: 100%; margin-top:10px;"
                       :data="studentList"
@@ -297,36 +293,32 @@
       <div slot="footer"
            class="dialog-footer">
         <el-button @click="studentVisible = false">取 消</el-button> -->
-        <!-- 班级学员修改 -->
-        <!-- <el-button type="primary"
+    <!-- 班级学员修改 -->
+    <!-- <el-button type="primary"
                    v-if="!isNewClass"
                    @click="addSomeStudent">确 定</el-button> -->
-        <!-- 临时调整或者新建班级 -->
-        <!-- <el-button type="primary"
+    <!-- 临时调整或者新建班级 -->
+    <!-- <el-button type="primary"
                    v-if="isNewClass"
                    @click="setInfoMsg">确 定</el-button>
       </div>
     </el-dialog> -->
     <!-- 老师以及课程设置 -->
-    <el-dialog
-      title="班级设置"
-      width="950px"
-      :visible.sync="infoVisible"
-      :modal-append-to-body="false"
-      destroy-on-close
-    >
-      <classroomSetting
-        :classType="classType"
-        :teacherList="teacherList"
-        :musicGroupId="teamid"
-        :activeType="activeType"
-        :courseTypeList="courseTypeList"
-        :cooperationList="cooperationList"
-        :detail="infoDetail"
-        :studentSubmitedData="studentSubmitedData"
-        @close="infoVisible = false"
-        @submited="getList"
-      />
+    <el-dialog title="班级设置"
+               width="950px"
+               :visible.sync="infoVisible"
+               :modal-append-to-body="false"
+               destroy-on-close>
+      <classroomSetting :classType="classType"
+                        :teacherList="teacherList"
+                        :musicGroupId="teamid"
+                        :activeType="activeType"
+                        :courseTypeList="courseTypeList"
+                        :cooperationList="cooperationList"
+                        :detail="infoDetail"
+                        :studentSubmitedData="studentSubmitedData"
+                        @close="infoVisible = false"
+                        @submited="getList" />
     </el-dialog>
     <!-- <el-dialog title="班级设置"
                width="780px"
@@ -351,7 +343,7 @@
                :rules="teacherRules"
                label-position="right"
                label-width="100px;"> -->
-        <!-- <el-form-item label="调整方式"
+    <!-- <el-form-item label="调整方式"
                       v-if="!isNewClass"
                       prop="isAdd">
           <el-radio v-model.trim="teacherForm.isAdd"
@@ -360,7 +352,7 @@
                     label="renew">重新排课</el-radio>
           <el-radio v-model.trim="teacherForm.isAdd"
                     label="onlyUpdateTeacher">修改老师 -->
-            <!-- <el-tooltip placement="top"
+    <!-- <el-tooltip placement="top"
                         popper-class="mTooltip">
               <div slot="content">
                 仅修改班级老师，不修改课程老师.
@@ -368,12 +360,12 @@
               <i class="el-icon-question micon el-tooltip"
                  style="font-size: 18px; color: #F56C6C"></i>
             </el-tooltip> -->
-          <!-- </el-radio>
+    <!-- </el-radio>
 
         </el-form-item> -->
 
-        <!-- <br /> -->
-        <!-- <el-form-item label="主教老师"
+    <!-- <br /> -->
+    <!-- <el-form-item label="主教老师"
                       prop="coreTeacher">
           <el-select v-model.trim="teacherForm.coreTeacher"
                      placeholder="请选择主教老师"
@@ -416,8 +408,8 @@
                        :label="item.label"></el-option>
           </el-select>
         </el-form-item> -->
-        <!--  v-if="!isNewClass" -->
-        <!-- <el-form-item label="声部"
+    <!--  v-if="!isNewClass" -->
+    <!-- <el-form-item label="声部"
                       v-if="activeType=='HIGH_ONLINE'&&isNewClass"
                       prop="sound">
           <el-select v-model.trim="teacherForm.sound"
@@ -522,16 +514,16 @@
       </div>
       <div slot="footer"
            class="dialog-footer"> -->
-        <!-- 1为临时班级 -->
-        <!-- <el-button type="primary"
+    <!-- 1为临时班级 -->
+    <!-- <el-button type="primary"
                    v-if="isTemporary&&isNewClass"
                    @click="submitTemporary(1)">确 定</el-button> -->
-        <!-- 2为新增班级 -->
-        <!-- <el-button type="primary"
+    <!-- 2为新增班级 -->
+    <!-- <el-button type="primary"
                    v-if="!isTemporary&&isNewClass"
                    @click="submitTemporary(2)">确 定</el-button> -->
-        <!-- 修改班级信息 -->
-        <!-- <el-button type="primary"
+    <!-- 修改班级信息 -->
+    <!-- <el-button type="primary"
                    v-if="!isNewClass"
                    @click="submitTemporary(3)">确 定</el-button>
       </div>
@@ -724,15 +716,11 @@
                    @click="newClassHight">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog
-      title="学员列表"
-      :visible.sync="studentListModalVisible"
-      destroy-on-close
-    >
-      <viewStudentList
-        :list="studentListModal"
-        @close="studentListModalVisible = false"
-      />
+    <el-dialog title="学员列表"
+               :visible.sync="studentListModalVisible"
+               destroy-on-close>
+      <viewStudentList :list="studentListModal"
+                       @close="studentListModalVisible = false" />
     </el-dialog>
   </div>
 </template>
@@ -913,7 +901,7 @@ export default {
   },
   mounted () { },
   methods: {
-    permission(val) {
+    permission (val) {
       return permission(val)
     },
     init () {
@@ -980,7 +968,7 @@ export default {
       // 获取分部所有老师
       // 助教是从员工表里选
     },
-    studentSubmited(data) {
+    studentSubmited (data) {
       if (!this.isOnlyChangeUser) {
         this.studentSubmitedData = data
         this.infoVisible = true
@@ -1002,7 +990,7 @@ export default {
     addMix () {
       this.MixVisible = true;
     },
-    changeActiveChioseSound(val) {
+    changeActiveChioseSound (val) {
       this.activeChioseSound = val
     },
     setAssistant (val) {
@@ -1299,7 +1287,7 @@ export default {
             //   //   );
             //   // });
             // } else {
-              this.studentList = res.data;
+            this.studentList = res.data;
             // }
           }
         }
@@ -1907,14 +1895,14 @@ export default {
     height: 40px !important;
   }
 }
-/deep/ .el-alert__content{
+/deep/ .el-alert__content {
   display: block;
   width: 100%;
 }
-.alert-content{
+.alert-content {
   display: flex;
   justify-content: space-between;
-  >strong{
+  > strong {
     cursor: pointer;
   }
 }