页面修改

src/pages/course/classConflict.vue

@@ -45,7 +45,7 @@
         :selected.sync="selected" class="sticky-column-table" separator="none" :data="dataList" :columns="columns"
         row-key="ClassPlanId" hide-bottom>
         <template v-slot:top="props">
-          <div class="col-2 q-table__title">上课计划冲突调整</div>
+          <div class="col-2 q-table__title">上课计划冲突调整 【{{msg.ClassName}}（{{msg.ClassNo}}）】</div>
           <q-space />
           <div class="page-option">
             <q-btn color="accent" size="sm" class="q-mr-md" @click="isShowClassForm=true" label="全部重排" />
@@ -80,7 +80,9 @@
                     <tr v-for="(subItem,subIndex) in props.row.PlanRepeatList" :key="subIndex">
                       <td>{{subItem.ClassName}}</td>
                       <td>{{subItem.ClassDate}}</td>
-                      <td :class="{'resStyle':props.row.TeacherId==subItem.TeacherId}">{{subItem.TeacherName}}</td>
+                      <td><span :class="{'resStyle':props.row.TeacherId==subItem.TeacherId}">
+                          {{subItem.TeacherName}}</span>
+                      </td>
                       <td>
                         <span
                           :class="{'resStyle':props.row.ClassRoomId==subItem.ClassRoomId}">{{subItem.RoomName}}</span>
@@ -165,7 +167,8 @@
                     <q-card-actions align="right" class="bg-white">
                       <q-btn label="取消" flat color="grey-10" @click="isShowEdit=false"
                         style="font-weight:400 !important" />
-                      <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" :loading="saveLoading" @click="saveSteps" />
+                      <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" :loading="saveLoading"
+                        @click="saveSteps" />
                     </q-card-actions>
                   </div>
                 </q-banner>
@@ -177,7 +180,8 @@
     </div>
     <class-form v-if="isShowClassForm" :save-obj="msg" @close="closeClassSaveForm" @success="refreshPage">
     </class-form>
-    <classcon-form v-if="isShowConForm" :save-obj="selectObj" @close="closeClassSaveForm" @success="refreshPage"></classcon-form>
+    <classcon-form v-if="isShowConForm" :save-obj="selectObj" @close="closeClassSaveForm" @success="refreshPage">
+    </classcon-form>
   </div>
 </template>
 <script>
@@ -202,11 +206,6 @@
     data() {
       return {
         columns: [{
-            name: "ClassName",
-            label: "班级",
-            field: "ClassName",
-            align: "left"
-          },{
             name: "ClassDate",
             label: "日期",
             field: "ClassDate",
@@ -243,7 +242,9 @@
           rowsPerPage: 1000,
         },
         msg: {
-          ClassId: 53
+          ClassId: 53,
+          ClassName:"",
+          ClassNo:"",
         },
         isShowEdit: false,
         //单行修改参数
@@ -267,14 +268,14 @@
         TeacherList: [], //老师下拉数据
         ClassRoomList: [], //教室下拉数据
         saveLoading: false,
-        isShowClassForm:false,
-        isShowConForm:false,
-        
+        isShowClassForm: false,
+        isShowConForm: false,
+
         //选中传入对象
-        selectObj:{
-          ClassId:53,
-          ChangeType:1,
-          selected:[]
+        selectObj: {
+          ClassId: 53,
+          ChangeType: 1,
+          selected: []
         }
       };
     },
@@ -294,7 +295,9 @@
         GetRepeatClassPlan(this.msg).then(res => {
           this.loading = false;
           if (res.Code == 1) {
-            this.dataList = res.Data;
+            this.dataList = res.Data.RepeatList;
+            this.msg.ClassNo=res.Data.ClassNo;
+            this.msg.ClassName=res.Data.ClassName;
             this.selected = [];
           }
         })
@@ -389,21 +392,21 @@
         this.getList();
       },
       //点击修改教师 老师 时段
-      getCommonEdit(type){
-        if(this.selected.length==0){
+      getCommonEdit(type) {
+        if (this.selected.length == 0) {
           this.$q.notify({
             type: 'negative',
             position: "top",
             message: `请勾选需要修改的数据！`
           })
           return
-        }else{
-          this.selectObj.selected=[];
+        } else {
+          this.selectObj.selected = [];
           this.selectObj.ChangeType = type;
-          this.selected.forEach(x=>{
+          this.selected.forEach(x => {
             this.selectObj.selected.push(x.ClassPlanId);
           })
-          this.isShowConForm=true;
+          this.isShowConForm = true;
         }
       }
     }