Revert "11"

This reverts commit 937e54e953430c2603d91509202a61a98195d30e.

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

@@ -20,9 +20,9 @@
       <div class="newBand"
            @click="newClass"
            v-permission="'classGroup/create'">新建班级</div>
-      <!-- <div class="newBand"
+      <div class="newBand"
            @click="arrangeStart"
-           v-permission="'courseSchedule/batchAddCourseSchedule'">批量排课</div> -->
+           v-permission="'courseSchedule/batchAddCourseSchedule'">批量排课</div>
       <!-- <div class="newBand">删除排课</div> -->
       <!-- <p class="expectMsg">基础技能班参考数量: 线上:XX/线下:XX</p> -->
     </div>

src/views/teamBuild/teamSeting/index.vue

@@ -7,7 +7,7 @@
                         :content="name">
         </el-page-header>
       </h2>
-      <!-- <div class="stepbox">
+      <div class="stepbox">
         <span class='stepspan'
               @click="activeIndex=0">
           <div class="step1 sptep"
@@ -18,6 +18,17 @@
                alt=""
                class="arrow">
         </span>
+        <!-- <span class='stepspan  stepspan2'
+              @click="activeIndex=1">
+          <div class="step2 sptep"
+               :class="activeIndex >= 1?'activestep':''">
+            老师设置
+          </div>
+          <img :src="activeIndex >= 1?stepImgs.nol:stepImgs.active"
+               alt=""
+               class="
+               arrow">
+        </span> -->
         <span class='stepspan  stepspan2'
               @click="activeIndex=2">
           <div class="step2 sptep"
@@ -29,13 +40,34 @@
                class="
                arrow">
         </span>
-      </div>-->
+        <!-- <span class='stepspan  stepspan2'
+              @click="activeIndex=3">
+          <div class="step2 sptep"
+               :class="activeIndex >= 3?'activestep':''">
+            基础技能班
+          </div>
+          <img :src="activeIndex >= 3?stepImgs.nol:stepImgs.active"
+               alt=""
+               class="
+               arrow">
+        </span> -->
+        <span class='stepspan  stepspan2'
+              v-permission="'/teamSetting/salarySet'"
+              @click="activeIndex=4">
+          <div class="step2 sptep"
+               :class="activeIndex >= 4?'activestep':''">
+            课酬
+          </div>
+          <img :src="activeIndex >= 4?stepImgs.nol:stepImgs.active"
+               alt=""
+               class="
+               arrow">
+        </span>
+      </div>
     </div>
-    <classSeting :teamid='id'
-                 :isSetSalary='isSetSalary'
-                 @gotoNav='gotoNav' />
+
     <!-- 下面显示的内容 -->
-    <!-- <div class="stepcontent">
+    <div class="stepcontent">
       <div v-if='activeIndex==0'>
         <classSeting :teamid='id'
                      :isSetSalary='isSetSalary'
@@ -47,6 +79,7 @@
                        @gotoNav='gotoNav' />
       </div>
       <div v-if='activeIndex==2'>
+        <!-- <coursePlan :teamid='id' /> -->
         <div class="m-container">
           <lookCourse :isSetSalary='isSetSalary'
                       @gotoNav='gotoNav' />
@@ -62,7 +95,7 @@
         <salarySet :teamid='id'
                    :isSetSalary='isSetSalary' />
       </div>
-    </div> -->
+    </div>
   </div>
 </template>
 <script>

src/views/teamDetail/components/resetClass.vue

@@ -430,7 +430,7 @@
                             @change="(val)=>{changeStartClassTime(item)}"
                             :picker-options="{
                                start: '04:30',
-                               step: '00:15',
+                               step: '00:05',
                                end: '23:55'
             }"></el-time-select>
             <span>结束时间</span>
@@ -438,7 +438,7 @@
                             v-model.trim="item.endClassTime"
                             :picker-options="{
                               start: '04:30',
-                              step: '00:15',
+                              step: '00:05',
                               end: '23:55',
                               minTime:item.startClassTime
             }"></el-time-select>