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

src/pages/sale/reserveClass.vue

 <template>
-    <div class="page-body">
-        <q-table :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
-          separator="none" :data="dataList" :columns="columns" row-key="name">
-          <template v-slot:top="props">
-            <div class="col-2 q-table__title">约课班级管理</div>
-            <q-space />
-  
-          </template>
-          <template v-slot:body-cell-Id="props">
-            <q-td :props="props">
-              <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="报入" />
-            </q-td>
-          </template>
-          <template v-slot:bottom>
-            <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
-              :input="true" @input="changePage" />
-          </template>
-        </q-table>
-    </div>
+  <div class="page-body">
+    <q-table :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
+      separator="none" :data="dataList" :columns="columns" row-key="name">
+      <template v-slot:top="props">
+        <div class="col-2 q-table__title">试听课管理</div>
+        <q-space />
+
+      </template>
+      <template v-slot:body-cell-Id="props">
+        <q-td :props="props">
+          <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="报入" />
+        </q-td>
+      </template>
+      <template v-slot:bottom>
+        <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount"
+          :input="true" @input="changePage" />
+      </template>
+    </q-table>
+  </div>
 </template>
 
 <script>
@@ -26,54 +26,64 @@
   } from '../../api/scheduling/schedu'
   export default {
     meta: {
-      title: "约课班级管理"
-    },
-    components: {
+      title: "试听课管理"
     },
+    components: {},
     data() {
       return {
         msg: {
-          pageIndex:1,
-          pageSize:10
+          pageIndex: 1,
+          pageSize: 10,
+          rowsPerPage: 10,
+          StartClassDate:"",//开始时间
+          EndClassDate:"",//结束时间
+          TeacherId:"",//教师编号
+          ClassRoomId:"",//教室编号
         },
         dataList: [],
         loading: false,
         PageCount: 0,
         columns: [{
-            name: 'CateName',
+            name: 'TeacherName',
             label: '老师',
-            field: 'CateName',
+            field: 'TeacherName',
             align: 'left'
           },
           {
-            name: 'CourseCount',
-            label: '时间',
+            name: 'ClassDateStr',
+            label: '日期',
             align: 'left',
-            field: row => row.CourseCount
+            field: 'ClassDateStr',
           },
           {
-            name: 'Status',
-            label: '日期',
+            name: 'ClassTime',
+            label: '上课时间',
             align: 'left',
-            field: row => row.Status
+            field: 'ClassTime',
           },
           {
-            name: 'UpdateByName',
+            name: 'RoomName',
             label: '教室',
             align: 'left',
-            field: row => row.UpdateByName
+            field: 'RoomName',
           },
           {
-            name: 'UpdateTimeStr',
+            name: 'RoomNum',
             label: '人数',
             align: 'left',
-            field: row => row.UpdateTimeStr
+            field: 'RoomNum',
+          },
+          {
+            name: 'JoinNum',
+            label: '报名人数',
+            align: 'left',
+            field: 'JoinNum',
           },
           {
             name: 'ClassContent',
             label: '主讲内容',
             align: 'left',
-            field: row => row.ClassContent
+            field: 'ClassContent',
           },
           {
             name: 'CateId',
@@ -83,7 +93,6 @@
         ],
       }
     },
-
     mounted() {
       this.getList()
     },
@@ -100,8 +109,8 @@
       //获取课程系列分页列表
       getList() {
         GetReserveClassPage(this.msg).then(res => {
-          console.log(res,'数据');
-          if(res.Data==1){
+          console.log(res, '数据');
+          if (res.Code == 1) {
             this.dataList = res.Data.PageData;
             this.PageCount = res.Data.PageCount;
           }
@@ -114,4 +123,4 @@
 <style lang="sass">
   @import url('~assets/css/table.sass')
 
-</style>
+</style>
\ No newline at end of file