11/12

11

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/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;
   }
 }