1

src/components/course/classconflict-form.vue

@@ -3,17 +3,21 @@
     width: 500px;
     text-align: center;
   }
+
   .classFlictTable tr td {
     height: 40px;
-    color:#000;
+    color: #000;
   }
+
   .classFlictTable tr th {
     height: 40px;
     background-color: rgb(238, 238, 239);
   }
-  .classConflitDialog{
-    width:400px;
+
+  .classConflitDialog {
+    width: 370px;
   }
+
 </style>
 <template>
   <q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale">
@@ -24,7 +28,7 @@
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
         <q-table :pagination="pMsg" :loading="loading" no-data-label="暂无相关数据" selection="multiple" flat
           :selected.sync="selected" class="sticky-column-table sticky-header-column-table" separator="none"
-          style="max-height: 500px" :data="dataList" :columns="columns" row-key="ClassPlanId" hide-bottom>
+          style="max-height: 450px" :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">
               变更内容 注意：需要对变更的内容进行打钩
@@ -42,6 +46,11 @@
               {{getTeacherName(props.row.TeacherId)}}
             </q-td>
           </template>
+          <template v-slot:body-cell-RoomName="props">
+            <q-td>
+              {{getClassRoomName(props.row.ClassRoomId)}}
+            </q-td>
+          </template>
 
           <template v-slot:body-cell-PlanTimeList="props">
             <q-td>
@@ -98,12 +107,12 @@
                       <div style="margin:10px 0 15px 0;">{{props.row.ClassDate}}课程安排</div>
                       <div class="row wrap">
                         <div class="col-6">
-                            <q-select filled stack-label option-value="TId" option-label="TeacherName"
-                                v-model="props.row.TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师"
-                                :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
+                          <q-select filled stack-label option-value="TId" option-label="TeacherName"
+                            v-model="props.row.TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师"
+                            :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
                         </div>
                         <div class="col-6">
-                        <q-select filled stack-label option-value="RoomId" option-label="RoomName"
+                          <q-select filled stack-label option-value="RoomId" option-label="RoomName"
                             v-model="props.row.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室"
                             :dense="false" class="col-6 q-pb-lg" emit-value map-options />
                         </div>
@@ -388,7 +397,6 @@
     methods: {
       //点击新增
       addStepOne(item) {
-          console.log(item,'item');
         var obj = {
           StartTime: "", //开始时间
           EndTime: "", //结束时间
@@ -424,6 +432,17 @@
         }
         return tName;
       },
+      getClassRoomName(ClassRoomId) {
+        let obj = {};
+        obj = this.ClassRoomList.find(item => {
+          return item.RoomId === ClassRoomId; //筛选出匹配数据
+        });
+        var tName = "";
+        if (obj) {
+          tName = obj.RoomName;
+        }
+        return tName;
+      },
       //关闭弹窗
       closeCourseForm() {
         this.$emit('close');