修改

src/api/school/index.js

@@ -633,3 +633,14 @@ export function BatchUpdateClassPlan(data) {
     data
   });
 }
+
+/**
+ * 忽略上课调整
+ */
+export function IgnoreClassPlan(data) {
+  return request({
+    url: '/Class/IgnoreClassPlan',
+    method: 'post',
+    data
+  });
+}
\ No newline at end of file

src/components/course/classconflict-form.vue

@@ -28,7 +28,7 @@
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
         <q-table :pagination="showMsg" :loading="loading" no-data-label="暂无相关数据" selection="multiple" flat
           :selected.sync="selectedAll" class="sticky-column-table sticky-header-column-table" separator="none"
-          style="max-height: 450px" :data="dataList" :columns="columns" row-key="ClassPlanId" hide-bottom>
+          style="max-height: 400px" :data="dataList" :columns="columns" row-key="ClassPlanId" hide-bottom>
           <template v-slot:top="props">
             <div class="text-caption q-my-lg q-px-md text-grey-6 col">
               变更内容 注意：需要对变更的内容进行打钩
@@ -199,7 +199,7 @@
               <div style="display:flex;justify-content:flex-end;margin-bottom:20px;">
                 <q-btn @click="addStepOne(postMsg)" size="10px" round color="primary" icon="iconfont icon-img_haha" />
               </div>
-              <div class="row wrap" style="position:relative;" v-for="(subItem,subIndex) in postMsg.TimeList"
+              <div class="row wrap" style="position:relative;" v-for="(subItem,subIndex) in postMsg.PlanTimeList"
                 :key="subIndex">
                 <div class="col-4">
                   <q-input filled v-model="subItem.StartTime" class="col-6 q-pr-lg q-pb-lg" placeholder="开始时间"
@@ -248,7 +248,7 @@
       </q-card-section>
       <q-separator />
       <q-card-actions align="right" class="bg-white">
-        <q-btn label="忽略冲突" flat color="grey-10" style="font-weight:400 !important" @click="closeCourseForm" />
+        <q-btn label="忽略冲突" flat color="grey-10" style="font-weight:400 !important" @click="IgnoreClass" />
         <q-btn label="提交调整" color="accent q-px-md" style="font-weight:400 !important" :loading="saveLoading"
           @click="saveClass">
         </q-btn>
@@ -263,7 +263,8 @@
     getTeacherDropDownList,
     queryClassRoomList,
     UpdateClassPlanSingle,
-    BatchUpdateClassPlan
+    BatchUpdateClassPlan,
+    IgnoreClassPlan
   } from "../../api/school/index";
   export default {
     props: {
@@ -399,10 +400,17 @@
         }
         return tName;
       },
-      //关闭弹窗
-      closeCourseForm() {
-        this.$emit('close');
-        this.persistent = false;
+      //忽略上课调整
+      IgnoreClass() {
+        IgnoreClassPlan({
+          ClassId: this.ClassId
+        }).then(res => {
+          this.loading = false;
+          if (res.Code == 1) {
+            this.$emit('success');
+            this.$emit('close');
+          }
+        })
       },
       //获取冲突的数据列表
       getList() {