修改

src/components/course/class-form.vue

@@ -644,9 +644,7 @@
                       position: 'top'
                     })
                     if(res.Data){
-                      this.OpenNewUrl('../../course/classConflict',{
-                          // ClassId:this.statusMsg.ClassId
-                      })
+                      this.$emit('getClassFlict',this.objOption.ClassId);
                     }
                     this.$emit("success")
                     this.closeCourseForm()

src/pages/course/classManage.vue

@@ -216,7 +216,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" @close="closeClassSaveForm" @getClassFlict="getClassFlict" @success="refreshPage">
       </class-form>
       <classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClassSaveForm"
         @success="refreshPage">
@@ -224,6 +224,8 @@
       <othercourseForm v-if="IsShowOtherCourse" :seting-obj="classObjOption" @close="closeClassSaveForm"
         @success="refreshPage">
       </othercourseForm>
+      <classconflict-form :ClassId="ClassId" v-if="isShowConflict" @close="closeClassSaveForm"
+        @success="refreshPage"></classconflict-form>
     </div>
   </div>
 </template>
@@ -242,6 +244,7 @@
   import classForm from '../../components/course/class-form';
   import classinfoForm from '../../components/course/classinfo-form';
   import othercourseForm from '../../components/course/othercourse-form';
+  import classconflictForm from '../../components/course/classconflict-form';
   export default {
     meta: {
       title: "班级管理"
@@ -249,7 +252,8 @@
     components: {
       classForm,
       classinfoForm,
-      othercourseForm
+      othercourseForm,
+      classconflictForm
     },
     data() {
       return {
@@ -352,6 +356,9 @@
         isShowClassForm: false, //是否显示新增修改弹窗
         isShowClassInfo: false, //是否显示课程信息
         IsShowOtherCourse: false, //是否显示其他课程
+        isShowConflict: false, //是否显示上课计划冲突
+
+        ClassId:53
       }
     },
     created() {
@@ -365,6 +372,14 @@
       this.getClassList();
     },
     methods: {
+      //显示冲突切换弹窗
+      getClassFlict(ClassId){
+        this.isShowClassForm=false;
+        this.isShowConflict=true;
+        this.ClassId = ClassId;
+        console.log('进入');
+        console.log(ClassId,'ClassId');
+      },
       //删除班级
       removeClass(item, status) {
         let delMsg = {
@@ -518,6 +533,8 @@
         this.isShowClassInfo = false;
         //关闭关联其他课程弹窗
         this.IsShowOtherCourse = false;
+        //关闭课程冲突
+        this.isShowConflict = false;
       },
       GetFirst(val) {
         if (val) {

src/router/routes.js

@@ -927,11 +927,6 @@ const routes = [{
     component: () =>
       import("pages/course/jobinfo.vue")
   },
-  {
-    path: "/course/classConflict", //上课计划冲突
-    component: () =>
-      import("pages/course/classConflict.vue")
-  },
   {
     path: "/studyAbroad/studyabroad", //留学
     component: () =>