Browse Source

12/01 18:30 合课提交测试

11
mo 4 years ago
parent
commit
e31eea47cd

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-00f3cf2b.3c808aff.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-1f637224.a966b2bb.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-4f58d716.27e88a94.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.b97c976b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-00f3cf2b.3687ff39.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-133dc84e.c58c64bf.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1f637224.5ce4497c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-4f58d716.d7243999.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-769ad4e8.369c4a91.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-c2c1ed4e.d434d817.js


+ 1 - 0
src/views/teamDetail/components/modals/classList-item.vue

@@ -30,6 +30,7 @@
       </el-select>
       <el-button type="text"  @click="lookStudentList" :disabled="!item.classId" class="studentTitle">学员列表>></el-button>
     </el-form-item>
+    
     <div class="infomsg">
       <div class="left">
         剩余课时:

+ 2 - 2
src/views/teamDetail/teamCourseList.vue

@@ -253,9 +253,9 @@
                 </el-button>
                 <el-button type="text"
                            @click="addCompound(scope.row)"
-                           v-if="(scope.row.groupType=='MUSIC'&&scope.row.type!='MUSIC_NETWORK'&&scope.row.type!='HIGH_ONLINE'&&scope.row.status=='NOT_START'&&!isAddCom(scope.row))">添加合班</el-button>
+                           v-if="(scope.row.groupType=='MUSIC'&&scope.row.type!='MUSIC_NETWORK'&&scope.row.type!='HIGH_ONLINE'&&scope.row.status=='NOT_START'&&!isAddCom(scope.row)&&permission('courseSchedule/courseMerge'))">添加合班</el-button>
                 <el-button type="text"
-                           v-if="isAddCom(scope.row)"
+                           v-if="isAddCom(scope.row)&&permission('courseSchedule/courseMerge')"
                            @click="cancleCompound(scope.row)">取消合班</el-button>
                 <el-button type="text"
                            v-if="

Some files were not shown because too many files changed in this diff