1

src/components/course/classconflict-form.vue

@@ -82,16 +82,15 @@
       </q-card-section>
       <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" separator="none" :data="dataList" :columns="columns"
+          :selected.sync="selected" class="sticky-column-table" separator="none" style="max-height: 500px" :data="dataList" :columns="columns"
           row-key="ClassPlanId" hide-bottom>
           <template v-slot:top="props">
             <q-space />
             <div class="page-option">
               <q-btn color="accent" size="sm" class="q-mr-md" @click="isShowClassForm=true" label="全部重排" />
-              <q-select filled stack-label option-value="Id" option-label="Name" v-model="msg.ChangeType"
+              <q-select filled stack-label style="display:inline-block;width:150px;" option-value="Id" option-label="Name" v-model="msg.ChangeType"
                 :options="changeTypeList" label="变更类型" :dense="false" class="col-6" emit-value map-options
                 @input="changeTypeResult" />
-
             </div>
           </template>
           <template v-slot:body-cell-PlanTimeList="props">
@@ -145,6 +144,14 @@
             </q-td>
           </template>
         </q-table>
+        <div class="row wrap">
+          <div class="col-6">
+            <q-select filled stack-label option-value="TId" option-label="TeacherName" v-model="TeacherId"
+              ref="Teacher_Id" :options="TeacherList" label="关联教师" :dense="false" class="col-6 q-pr-lg q-pb-lg"
+              emit-value map-options />
+          </div>
+        </div>
+
       </q-card-section>
       <q-separator />
       <q-card-actions align="right" class="bg-white">
@@ -269,7 +276,9 @@
           ChangeType: 1,
           selected: []
         },
-        saveClassLoading: false
+        saveClassLoading: false,
+        TeacherId: 0,
+        ClassRoomId: 0
       }
     },
     created() {
@@ -285,7 +294,9 @@
       this.getList();
     },
     methods: {
+      changeTypeResult(){
 
+      },
       //关闭弹窗
       closeCourseForm() {
         this.$emit('close');