瀏覽代碼

修改老师管理权限

lex-xin 4 年之前
父節點
當前提交
e75e33863b

+ 23 - 2
src/views/teacherManager/teacherDetail/components/calendarList.vue

@@ -9,7 +9,28 @@
             {{scope.data.day.substring(8)}}
           </p>
           <div>
-            <span v-for="(item,index) in newList"
+            <template v-for="(item) in newList">
+              <span class='newDot'
+                  :key="item.id"
+                  v-if="item.classDate.substring(0,10) === scope.data.day&&item.groupType==='PRACTICE'">
+                网
+              </span>
+            </template>
+            <template v-for="(item) in vipList">
+              <span class='vipDot'
+                  :key="item.id"
+                  v-if="item.classDate.substring(0,10) === scope.data.day&&item.groupType==='VIP'">
+                vip
+              </span>
+            </template>
+            <template v-for="(item) in teamList">
+              <span class='teamDot'
+                  :key="item.id"
+                  v-if="item.classDate.substring(0,10) === scope.data.day&&item.groupType==='MUSIC'">
+                乐
+              </span>
+            </template>
+            <!-- <span v-for="(item,index) in newList"
                   class='newDot'
                   :key="item.id"
                   v-if="item.classDate.substring(0,10) === scope.data.day&&item.groupType==='PRACTICE'">
@@ -26,7 +47,7 @@
                   :key="item.id"
                   v-if="item.classDate.substring(0,10) === scope.data.day&&item.groupType==='MUSIC'">
-            </span>
+            </span> -->
 
           </div>
         </div>

+ 1 - 1
src/views/teacherManager/teacherDetail/components/courseInfo.vue

@@ -21,7 +21,7 @@
         <el-button type="danger" native-type="submit">搜索</el-button>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="resetCourses" v-permission="'courseSchedule/classGroupTeacherAdjust'">课程移交</el-button>
+        <el-button type="primary" @click="resetCourses" v-permission="'courseSchedule/classGroupTeacherAdjust/batch'">课程移交</el-button>
       </el-form-item>
     </save-form>
     <div class="tableWrap">

+ 2 - 2
src/views/teacherManager/teacherDetail/components/courseInfo1.vue

@@ -9,8 +9,8 @@
           v-model.trim="searchList.search"
         ></el-input>
       </el-form-item>
-      <el-form-item label="课程状态">
-        <el-select v-model.trim="searchList.status" clearable>
+      <el-form-item >
+        <el-select v-model.trim="searchList.status" clearable placeholder="请选择课程状态">
           <el-option
             v-for="(item, index) in vipGroupStatus"
             :key="index"

+ 2 - 2
src/views/teacherManager/teacherDetail/components/outCourseList.vue

@@ -9,8 +9,8 @@
           v-model.trim="searchList.search"
         ></el-input>
       </el-form-item>
-      <el-form-item label="课程状态">
-        <el-select v-model.trim="searchList.status" clearable>
+      <el-form-item>
+        <el-select v-model.trim="searchList.status" clearable placeholder="请选择课程状态">
           <el-option
             v-for="(item, index) in commGroupStatus"
             :key="index"

+ 2 - 1
src/views/teacherManager/teacherDetail/components/resetComponent.vue

@@ -24,6 +24,7 @@
                            label="声部"></el-table-column>
           <el-table-column align="center"
                            prop="name"
+                           width="200px"
                            label="课程名称"></el-table-column>
           <el-table-column align="center"
                            width="150px"
@@ -94,7 +95,7 @@
                          type="text"
                          @click="resetClass(scope.row)">调整</el-button>
               <el-button type="text"
-                         v-if="!scope.row.isSettlement && permission('courseSchedule/practiceCourseAdjust')&&scope.row.groupType==='PRACTICE'"
+                         v-if="!scope.row.isSettlement && permission('courseSchedule/classStartDateAdjust')&&scope.row.groupType==='PRACTICE'"
                          @click="resetClass(scope.row)">调整</el-button>
               <el-button type="text"
                          v-if="scope.row.groupType==='PRACTICE'&&scope.row.status == 'NOT_START'&&(scope.row.practiceGroup && scope.row.practiceGroup['type']!='TRIAL')&& permission('courseSchedule/practiceCourseTeacherAdjust')"

+ 3 - 3
src/views/teacherManager/teacherDetail/components/serveStudentList.vue

@@ -2,7 +2,7 @@
   <div class='courseInfo'>
     <div class="newBand"
          @click="resetCourses"
-         v-permission="'studentManage/batchUpdateAdviser'">学员移交</div>
+         v-permission="'studentManage/batchUpdateAdviser/batch'">学员移交</div>
     <div class="tableWrap tableMargin">
       <!-- <h4>试听课</h4> -->
       <el-table :data='tableList'
@@ -26,7 +26,7 @@
             <div>
               <el-button type="text"
                          v-permission="'studentManage/batchUpdateAdviser'"
-                         @click="resetCourse(scope.row)">操作</el-button>
+                         @click="resetCourse(scope.row)">学员移交</el-button>
             </div>
           </template>
 
@@ -143,7 +143,7 @@ export default {
     },
     resetCourses () {
       if (this.chioseList.length <= 0) {
-        this.$message.error('请至少选择一个乐团')
+        this.$message.error('请至少选择一个学员')
         return
       }
       this.isMultiple = true

+ 3 - 4
src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -125,10 +125,9 @@
         <el-table-column label="操作">
           <template slot-scope="scope"
                     v-if="scope.row.courseScheduleType != 'VIP' && !scope.row.settlementTime">
-            <el-button v-if="scope.row.courseScheduleType != 'DEMO'"
-                       v-permission="{child: 'courseSchedule/updateTeacherCoursesSalary', parent: 'settlement/updateTeacherCoursesSalary'}"
-                       @click="onUpdate(scope.row)"
-                       type="text">课酬调整</el-button>
+            <auth auths="courseSchedule/updateTeacherCoursesSalary/settlement" v-if="scope.row.courseScheduleType != 'DEMO'">
+              <el-button @click="onUpdate(scope.row)" type="text">课酬调整</el-button>
+            </auth>
           </template>
         </el-table-column>
       </el-table>

+ 2 - 2
src/views/teacherManager/teacherDetail/components/teacherNetwork.vue

@@ -3,7 +3,7 @@
   <div class>
     <div class="newBand"
          @click="resetCourses"
-         v-permission="'courseSchedule/batchPracticeGroupTeacherAdjust?t=819'">课程移交</div>
+         v-permission="'courseSchedule/batchPracticeGroupTeacherAdjust/batch'">课程移交</div>
     <div class="m-core">
       <div class="tableWrap">
         <el-table style="width: 100%"
@@ -69,7 +69,7 @@
               <div>
                 <el-button type="text"
                            v-if="(scope.row.totalClassTimes-scope.row.currentClassTimes)>0"
-                           v-permission="'courseSchedule/batchPracticeGroupTeacherAdjust?t=819'"
+                           v-permission="'courseSchedule/batchPracticeGroupTeacherAdjust/single'"
                            @click="resetCourse(scope.row)">课程移交</el-button>
               </div>
             </template>