Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/course/makeup.vue

+<style>
+    .makeup .el-input__inner {
+      border: none !important;
+      background: transparent !important;
+    }
+</style>
 <template>
-  <div class="page-body">
+  <div class="page-body makeup">
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
@@ -35,7 +41,7 @@
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
         separator="none" :data="data" :columns="columns" row-key="name">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">补课管理</div>
@@ -66,12 +72,12 @@
                 <q-banner v-if="isShowEdit">
                   <div class="calenderDialog">
                     <div style="margin:10px 0 15px 0;">设置处理状态</div>
-                    <q-select standout="bg-primary text-white" option-value="Id" option-label="Name"
+                    <q-select standout="bg-primary text-white"  option-value="Id" option-label="Name"
                       v-model="statusMsg.MakeUpStatus" :options="statusList" emit-value map-options label="班级状态" />
-                    <q-card-actions align="right" class="bg-white">
-                      <q-btn label="取消" flat color="grey-10" @click="isShowEdit=false"
+                    <q-card-actions align="right" class="bg-white" style="margin-top:20px;">
+                      <q-btn label="取消" flat color="grey-10" size="sm" @click="isShowEdit=false"
                         style="font-weight:400 !important" />
-                      <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
+                      <q-btn label="确认" color="accent q-px-md" size="sm" style="font-weight:400 !important"
                         @click="setCheckStatus()" />
                     </q-card-actions>
                   </div>