修改

src/components/course/classconflict-form.vue

@@ -37,7 +37,7 @@
             </div>
             <q-space />
             <div class="page-option">
-              <q-btn color="accent" size="sm" class="q-mr-md" @click="isShowClassForm=true" label="全部重排" />
+              <q-btn color="accent" size="sm" class="q-mr-md" @click="rePaiAll" label="全部重排" />
               <q-select filled stack-label style="display:inline-block;width:150px;" option-value="Id"
                 option-label="Name" v-model="postMsg.ChangeType" :options="changeTypeList" label="变更类型" :dense="false"
                 class="col-6" emit-value map-options />
@@ -365,6 +365,11 @@
       this.getList();
     },
     methods: {
+      //点击全部重排
+      rePaiAll(){
+        console.log('进入');
+        this.$emit('getzk');
+      },
       //点击新增上课时间段
       addStepOne(item) {
         var obj = {
@@ -467,10 +472,6 @@
         })
       },
 
-      //关闭弹窗
-      closeClassSaveForm() {
-        this.isShowClassForm = false;
-      },
       //刷新页面
       refreshPage() {
         this.isShowClassForm = false;

src/pages/course/classManage.vue

@@ -70,7 +70,7 @@
         @success="refreshPage">
       </othercourseForm>
       <classconflict-form :ClassId="ClassId" v-if="isShowConflict" @close="closeClassConflictForm"
-        @success="refreshPage"></classconflict-form>
+        @getzk="getzk" @success="refreshPage"></classconflict-form>
     </div>
   </div>
 </template>
@@ -238,6 +238,12 @@
         this.isShowConflict = true;
         this.ClassId = ClassId;
       },
+      //点击全部重排
+      getzk(){
+        console.log('进入2');
+        this.isShowConflict = false;
+        this.isShowClassForm = true;
+      },
       //删除班级
       removeClass(item, status) {
         let delMsg = {