页面修改

src/pages/course/classManage.vue

@@ -8,7 +8,7 @@
     border: 1px solid #2961FE;
     border-radius: 50%;
     cursor: pointer;
-    color:#2961FE;
+    color: #2961FE;
   }
 
   .OCourseTable {
@@ -35,8 +35,8 @@
             label="班级名称" @clear="getClassList" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.ClassNo"
-            label="班号" @clear="getClassList" maxlength="20" />
+          <q-input @change="getClassList" clearable standout="bg-primary text-white" v-model="msg.ClassNo" label="班号"
+            @clear="getClassList" maxlength="20" />
         </div>
         <div class="col-3">
           <q-select @input="getClassList" standout="bg-primary text-white" option-value="Id" option-label="Name"
@@ -78,14 +78,14 @@
             <div style="display: flex;align-items: center;">
               <q-avatar size="md" style="background:#d4dfff;color:#2961FE;font-weight:bold;" v-if="props.row.ClassName">
                 {{GetFirst(props.row.ClassName)}}</q-avatar>
-                <div >
-                  <span style="color:#2961FE;margin-left:10px;cursor:pointer;" @click="getClassInfo(props.row)"
+              <div>
+                <span style="color:#2961FE;margin-left:10px;cursor:pointer;" @click="getClassInfo(props.row)"
                   title="点击查看详情">{{props.row.ClassName}}</span>
-                  <div style="margin-left: 10px;">{{props.row.ClassNo}}</div>
-    
-                </div>
+                <div style="margin-left: 10px;">{{props.row.ClassNo}}</div>
+
+              </div>
             </div>
-         
+
           </q-td>
         </template>
         <template v-slot:body-cell-OtherCourseName="props">
@@ -105,7 +105,8 @@
                           <th>课程名称</th>
                           <th>课时数</th>
                         </tr>
-                        <tr v-for="(sItem,sIndex) in props.row.OtherCourseList" style="border-bottom:1px dashed #d1d1d1;">
+                        <tr v-for="(sItem,sIndex) in props.row.OtherCourseList"
+                          style="border-bottom:1px dashed #d1d1d1;">
                           <td>{{sItem.CourseName}}</td>
                           <td>{{sItem.ClassHours}}</td>
                         </tr>
@@ -216,7 +217,8 @@
           </q-td>
         </template>
       </q-table>
-      <class-form v-if="isShowClassForm" :save-obj="classObjOption" @close="closeClassSaveForm" @getClassFlict="getClassFlict" @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,7 +226,7 @@
       <othercourseForm v-if="IsShowOtherCourse" :seting-obj="classObjOption" @close="closeClassSaveForm"
         @success="refreshPage">
       </othercourseForm>
-      <classconflict-form :ClassId="ClassId" v-if="isShowConflict" @close="closeClassSaveForm"
+      <classconflict-form :ClassId="ClassId" v-if="isShowConflict" @close="closeClassConflictForm"
         @success="refreshPage"></classconflict-form>
     </div>
   </div>
@@ -340,7 +342,7 @@
           TeacherName: '', //带班老师
           CourseName: '', //学习课程
           School_Id: -1, //关联校区
-          ClassNo:'',//班号
+          ClassNo: '', //班号
         },
         //班级状态
         classStatusList: [],
@@ -357,13 +359,12 @@
         isShowClassInfo: false, //是否显示课程信息
         IsShowOtherCourse: false, //是否显示其他课程
         isShowConflict: false, //是否显示上课计划冲突
-
-        ClassId:53
+        ClassId: 0, //传入到冲突表单参数
       }
     },
     created() {
       if (this.$route.query && this.$route.query.ClassName) {
-        this.msg.ClassName = decodeURI(this.$route.query.ClassName) 
+        this.msg.ClassName = decodeURI(this.$route.query.ClassName)
       }
       this.getClassStatus();
       this.getSchool();
@@ -372,13 +373,14 @@
       this.getClassList();
     },
     methods: {
+      closeClassConflictForm() {
+        this.isShowConflict = false;
+      },
       //显示冲突切换弹窗
-      getClassFlict(ClassId){
-        this.isShowClassForm=false;
-        this.isShowConflict=true;
+      getClassFlict(ClassId) {
+        this.isShowClassForm = false;
+        this.isShowConflict = true;
         this.ClassId = ClassId;
-        console.log('进入');
-        console.log(ClassId,'ClassId');
       },
       //删除班级
       removeClass(item, status) {
@@ -533,8 +535,7 @@
         this.isShowClassInfo = false;
         //关闭关联其他课程弹窗
         this.IsShowOtherCourse = false;
-        //关闭课程冲突
-        this.isShowConflict = false;
+
       },
       GetFirst(val) {
         if (val) {
@@ -560,16 +561,16 @@
         this.classObjOption = obj;
         this.isShowClassInfo = true;
       },
-      gomonthLessonCost(row){
+      gomonthLessonCost(row) {
         let ClassName = encodeURI(row.ClassName)
-        this.OpenNewUrl('/course/monthLessonCost' , {
+        this.OpenNewUrl('/course/monthLessonCost', {
           ClassId: row.ClassId,
           ClassName: ClassName,
         });
       },
       //跳转到课程大纲
-      goChapter(CouseId){
-        this.OpenNewUrl('/course/chapter' , {
+      goChapter(CouseId) {
+        this.OpenNewUrl('/course/chapter', {
           CourseId: CouseId
         });
       }