修改

src/components/course/changestatus-form.vue

@@ -140,6 +140,16 @@
 
               });
             }
+            if(ClassStatus==2 && res.Data){
+              this.$q.notify({
+                icon: 'iconfont icon-chenggong',
+                color: 'accent',
+                timeout: 2000,
+                message: '数据保存成功！但存在上课冲突数据,请调整。',
+                position: 'top'
+              })
+              this.$emit('getClassFlict', this.statusMsg.ClassId);
+            }
           } else {
             this.$q.notify({
               icon: 'iconfont icon-chenggong',

src/components/course/class-form.vue

@@ -633,6 +633,7 @@
                   ClassId: res.Data.ClassId,
                   PlanList: res.Data.ClassPlanList,
                 }
+                var NewClassId = res.Data.ClassId;
                 batchSaveClassPlan(newMsg).then(res => {
                   this.saveCourseLoading = false
                   if (res.Code == 1) {
@@ -644,7 +645,7 @@
                         message: '数据保存成功！但存在上课冲突数据,请调整。',
                         position: 'top'
                       })
-                      this.$emit('getClassFlict', this.objOption.ClassId);
+                      this.$emit('getClassFlict', NewClassId);
                     } else {
                       this.$q.notify({
                         icon: 'iconfont icon-chenggong',

src/components/course/classlist.vue

@@ -191,7 +191,7 @@
         </q-td>
       </template>
     </q-table>
-    <class-form v-if="isShowClassForm" :save-obj="classObjOption" @close="closeClassSaveForm" @success="refreshPage">
+    <class-form v-if="isShowClassForm" :save-obj="classObjOption" @getClassFlict="getClassFlict" @close="closeClassSaveForm" @success="refreshPage">
     </class-form>
     <classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClassSaveForm"
       @success="refreshPage">
@@ -199,10 +199,13 @@
     <othercourseForm v-if="IsShowOtherCourse" :seting-obj="classObjOption" @close="closeClassSaveForm"
       @success="refreshPage">
     </othercourseForm>
-    <changestatusForm v-if="isShowStatusChange" :seting-obj="classObjOption" @close="closeClassSaveForm"
+    <changestatusForm v-if="isShowStatusChange" :seting-obj="classObjOption" @getClassFlict="getClassFlict" @close="closeClassSaveForm"
       @success="refreshPage"></changestatusForm>
     <change-class-form v-if="isShowTiaoke" :seting-obj="classObjOption" @close="closeClassSaveForm"
       @success="refreshPage"></change-class-form>
+    <classconflict-form :ClassId="ClassId" v-if="isShowConflict" @close="closeClassConflictForm"
+      @success="refreshPage"></classconflict-form>
+
   </div>
 
 </template>
@@ -219,6 +222,8 @@
   import othercourseForm from '../../components/course/othercourse-form';
   import changestatusForm from '../../components/course/changestatus-form'
   import changeClassForm from '../../components/teacher/changeClassForm.vue'
+  import classconflictForm from '../../components/course/classconflict-form';
+
   export default {
     meta: {
       title: "班级列表"
@@ -238,7 +243,8 @@
       classinfoForm,
       othercourseForm,
       changestatusForm,
-      changeClassForm
+      changeClassForm,
+      classconflictForm
     },
     data() {
       return {
@@ -340,6 +346,8 @@
           isShowStudentMenu: false, //显示未完成学员名单
           isShowApply: false //显示调课申请
         },
+        isShowConflict:false,
+        ClassId:0
       }
     },
     created() {
@@ -349,6 +357,18 @@
 
     },
     methods: {
+      //关闭、
+      closeClassConflictForm(){
+        this.isShowConflict=false;
+      },
+      //显示冲突切换弹窗
+      getClassFlict(ClassId) {
+        this.isShowClassForm = false;
+        this.isShowStatusChange = false;
+        this.isShowConflict = true;
+        this.ClassId = ClassId;
+      },
+
       //初始化权限信息
       initAuth() {
         if (this.authObj) {