lex 2 anni fa
parent
commit
8650086855

+ 8 - 3
src/views/liveClassManager/createLiveClass.vue

@@ -314,9 +314,14 @@ export default {
   methods: {
     async onChangeSubject(val) {
       try {
-        // 判断声部,如果为-1则为乐理,显示普通
-
-        if (val == 31) {
+        // 判断声部,如果为MUSIC_THEORY则为乐理,显示普通
+        let subjectItem = {}
+        this.subjectList.forEach(item => {
+          if (val == item.id) {
+            subjectItem = item;
+          }
+        })
+        if (subjectItem.code !== 'MUSIC_THEORY') {
           this.form.useScene = "MUSIC"
         } else {
           this.form.useScene = "NORMAL"

+ 2 - 2
src/views/liveClassManager/liveClassTwo/components/courseAdjust.vue

@@ -33,7 +33,7 @@
           <template slot-scope="scope">
             <div>
               <el-button type="text" v-if="scope.row.id &&
-                !scope.row.isSettlement &&
+                !scope.row.isSettlement && scope.row.status != 'UNDERWAY' &&
                 $helpers.permission(
                   'courseSchedule/classStartDateAdjust/liveReset'
                 )
@@ -230,7 +230,7 @@ export default {
       }
     },
     isDisabled(row, index) {
-      if (row.isSettlement || !row.id) {
+      if (row.isSettlement || !row.id || row.status == 'UNDERWAY') {
         return false;
       } else {
         return true;

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

@@ -175,7 +175,7 @@
                 <el-button v-if="'/teamCourseListDetail'" type="text" @click="lookDetail(scope.row)">详情</el-button>
                 <el-button type="text" v-if="permission('courseSchedule/classStartDateAdjust?hight') &&
                   !scope.row.isLock &&
-                  !(scope.row.newCourseId > 0 && scope.row.newCourseId != scope.row.id)
+                  !(scope.row.newCourseId > 0 && scope.row.newCourseId != scope.row.id) && scope.row.status != 'UNDERWAY'
                   " @click="resetClass(scope.row)">调整</el-button>
 
                 <!-- <el-button
@@ -262,8 +262,8 @@
         </el-form-item>
         <el-form-item label="老师考勤" v-if="maskForm.status != 'NOT_START'">
           <div class="inputStyle" :class="maskForm.signInStatusEnum == 1 && maskForm.signOutStatusEnum == 1
-              ? 'green'
-              : 'red'
+            ? 'green'
+            : 'red'
             ">
             {{
               maskForm.signInStatusEnum == 1 && maskForm.signOutStatusEnum == 1