02/11 18:03

1111

src/views/accompanyManager/accompanyList.vue

@@ -227,5 +227,5 @@ export default {
 };
 </script>
 <style lang="sass">
-    
+
 </style>

src/views/accompanyManager/accompanys.vue

@@ -4,7 +4,7 @@
       <el-page-header @back="goBack" :content="name"></el-page-header>
     </h2>
     <!--   v-permission="'vipGroupManage/updateVipBaseInfo'" -->
-    <div class="newBand" @click="resetTeachers">修改老师</div>
+    <div class="newBand" @click="resetTeachers" v-permission="'courseSchedule/practiceGroupTeacherAdjust'">修改老师</div>
     <div class="tableWrap">
       <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <!-- @selection-change="handleSelectionChange" -->
@@ -56,6 +56,7 @@
               >调整</el-button>
               <!--  v-permission="'courseSchedule/classStartDateAdjust'" -->
               <el-button
+              v-permission="'courseSchedule/practiceCourseTeacherAdjust'"
                 type="text"
                 v-if="!scope.row.isSettlement"
                 @click="resetTeacher(scope.row)"

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -118,15 +118,15 @@
             </el-col>
             <el-col :span="12" class="diSpan">
                
-                 <!-- <el-tooltip placement="top">
+                 <el-tooltip placement="top" popper-class='mTooltip'>
                   <div slot="content">
                    「是」当前声部的学生都可以选择该老师；
                     <br />「否」只有该老师的VIP课，单技课，基础技能课的学生可以选择该老师；
                   </div>
-                  <i class="el-icon-warning micon"></i>
-                </el-tooltip> -->
+                  <img :src="imageIcon" class='micon el-tooltip' style="width:8px height:8px" alt="">
+                </el-tooltip>
                
-              <el-form-item label="开放陪练" :label-width="formLabelWidth">
+              <el-form-item label="开放陪练" label-width="90px" class="course">
                 <el-select
                   v-model.trim="topForm.isSupportExtraPracticeLesson"
                   clearable
@@ -306,8 +306,10 @@ export default {
         certificateType: null,
         certificateNum: null,
         isSupportCourseScheduleRewardsRules: true,
-        isSupportExtraPracticeLesson: null
+        isSupportExtraPracticeLesson: null,
+        
       },
+      imageIcon:require('@/assets/images/base/warning.png'),
       rules: {
         realName: [
           { required: true, message: "请输入姓名", trigger: "blur" },
@@ -526,14 +528,36 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.atooltip.el-tooltip__popper[x-placement^="top"] .popper__arrow {
+  border-top-color: #ECF0F0;
+  color: #666666;
+}
+.atooltip.el-tooltip__popper[x-placement^="top"] .popper__arrow:after {
+  border-top-color: #ECF0F0;
+   color: #666666;
+}
+.atooltip {
+  background: #ECF0F0 !important;
+   color: #666666;
+}
 .diSpan {
   position: relative;
   .micon {
     position: absolute;
-    top:-3px;
+    top:12px;
     left: 64px;
   }
 }
+.course {
+  /deep/.el-form-item__label {
+    text-align: left !important;
+  }
+}
+
+// /deep/.el-tooltip__popper.is-dark {
+//   background-color: #ECF0F0!important;
+//   color: #666!important;
+// }
 .el-button--primary {
   background: #14928a;
   border-color: #14928a;

src/views/teamBuild/components/teamBaseInfo.vue

@@ -810,6 +810,7 @@ export default {
       justify-content: flex-start;
       flex-wrap: nowrap;
       overflow: auto;
+     
       .el-checkbox {
         line-height: 72px;
       }