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

src/components/schedul/reservelist.vue

@@ -39,7 +39,7 @@
           {{props.row.CreateTimeStr}}
         </q-td>
       </template>
-      <template v-slot:body-cell-Type="props">
+      <template v-slot:body-cell-ReserveType="props">
         <q-td :props="props">
           <span v-if="props.row.ReserveType==0">正常试听</span>
           <span v-if="props.row.ReserveType==1">跟班试听</span>
@@ -183,10 +183,10 @@
             field: 'ClassContent',
           },
           {
-            name: 'Type',
+            name: 'ReserveType',
             label: '类型',
             align: 'left',
-            field: 'Type',
+            field: 'ReserveType',
           },
           {
             name: 'CreateByName',
@@ -202,7 +202,7 @@
         ],
         //表格可见列
         visibleColumns: [
-          'TeacherName', 'ClassDateStr', 'ClassTime', 'RoomName', 'LessonName', 'JoinNum', 'OrderCount', 'ConversionRates', 'ClassContent', 
+          'TeacherName', 'ClassDateStr', 'ClassTime', 'RoomName', 'LessonName', 'JoinNum', 'OrderCount', 'ConversionRates', 'ClassContent', "ReserveType",
           'CreateByName','TeacherId'
         ], //可见列
         reserveObj: {},