新增

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_9jvzm3idarn.css');
+@import url('//at.alicdn.com/t/font_2077629_v5y4jdrtlx.css');
 
 html,
 body,

src/api/scheduling/schedu.js

@@ -159,3 +159,16 @@ export function saveDutyCheck(data) {
     data
   })
 }
+
+/**
+ * 约课管理
+ * @param {JSON参数} data 
+ */
+export function GetReserveClassPage(data) {
+  return request({
+    url: '/VisitorReserve/GetReserveClassPage',
+    method: 'post',
+    data
+  })
+}
+

src/components/schedul/appoint-form.vue

@@ -24,11 +24,11 @@
         <div style="margin-bottom:20px;">
           <div class="Appoint_Line"></div>预约申请
         </div>
-        <q-input filled v-model="addMsg.date" class="col-6 q-pb-lg" mask="date" label="日期">
+        <q-input filled v-model="addMsg.ClassDate" class="col-6 q-pb-lg" mask="date" label="预约日期">
           <template v-slot:append>
             <q-icon name="event" class="cursor-pointer">
               <q-popup-proxy ref="qDateProxy1" transition-show="scale" transition-hide="scale">
-                <q-date v-model="addMsg.date" @input="() => $refs.qDateProxy1.hide()" />
+                <q-date v-model="addMsg.ClassDate" @input="() => $refs.qDateProxy1.hide()" />
               </q-popup-proxy>
             </q-icon>
           </template>
@@ -36,28 +36,28 @@
         <div class="Sysuser_Date">
           <q-field filled class="q-pb-lg">
               <template v-slot:control>
-              <el-time-select v-model="addMsg.time" style="width:100%" :picker-options="{
+              <el-time-select v-model="addMsg.ClassTime" style="width:100%" :picker-options="{
                     start: '00:00',
                     step: '00:15',
                     end: '23:59'
-                }" placeholder="选择时间">
+                }" placeholder="预约时间">
               </el-time-select>
             </template>
           </q-field>
         </div>
-        <q-input v-model="addMsg.content" class="q-pb-lg" filled type="textarea" placeholder="主讲内容" />
+        <q-input v-model="addMsg.ClassContent" class="q-pb-lg" filled type="textarea" placeholder="主讲内容" />
         <div style="display:flex;align-items:center;">
           <q-select filled stack-label option-value="TId" style="width:90%" option-label="TeacherName"
-            v-model="addMsg.teacher" ref="Teacher_Id" :options="TeacherList" label="教师团队" :dense="false"
+            v-model="addMsg.TeacherId" ref="TeacherId" :options="TeacherList" label="教师团队" :dense="false"
             class="col-6 q-pb-lg" emit-value map-options multiple />
           <div style="margin:-20px 0 0 9px" @click="isShowTeacher=true">选择</div>
         </div>
         <q-select filled stack-label option-value="RoomId" option-label="RoomName" v-model="addMsg.ClassRoomId"
           ref="ClassRoomId" :options="ClassRoomList" label="关联教室" :dense="false" class="col-6 q-pb-lg" emit-value
           map-options />
-        <q-select filled stack-label option-value="Id" option-label="Name" v-model="addMsg.customer" ref="customer"
+        <!-- <q-select filled stack-label option-value="Id" option-label="Name" v-model="addMsg.Visitor_Id" ref="customer"
           :options="customerList" label="客户" :dense="false" class="col-6 q-pb-lg" emit-value map-options />
-        <q-input v-model="addMsg.remark" class="q-pb-lg" filled type="textarea" placeholder="备注" />
+        <q-input v-model="addMsg.remark" class="q-pb-lg" filled type="textarea" placeholder="备注" /> -->
       </div>
       <q-card-actions align="right" class="bg-white">
         <q-btn label="取消" flat color="grey-10" size="sm" style="font-weight:400 !important" @click="closeAppointForm" />
@@ -105,13 +105,6 @@
         },
         TeacherList: [], //教师
         ClassRoomList: [], //教室
-        customerList: [{
-          Name: '张三',
-          Id: 1
-        }, {
-          Name: '李四',
-          Id: 2
-        }],
         saveAppointLoading: false,
         isShowTeacher: false, //显示选择框
       }
@@ -136,6 +129,11 @@
         getTeacherDropDownList({}).then(res => {
           if (res.Code == 1) {
             this.TeacherList = res.Data;
+             var obj = {
+              TeacherName: '请选择',
+              TId: 0
+            }
+            this.TeacherList.unshift(obj);
           }
         });
       },
@@ -154,7 +152,10 @@
       },
       //保存
       saveAppointForm() {
-
+        if(this.saveObj){
+          this.addMsg.Visitor_Id = this.saveObj.Id;
+        }
+        console.log(this.addMsg,'addMsg');
       }
     }
   }

src/pages/sale/appointManagement.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 />
+            <!-- <div class="page-option">
+              <q-btn color="accent" size="sm" class="q-mr-md" label="试听预约" />
+            </div> -->
+          </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>
+  import {
+    GetReserveClassPage
+  } from '../../api/scheduling/schedu'
+  export default {
+    meta: {
+      title: "约课管理"
+    },
+    components: {
+    },
+    data() {
+      return {
+        msg: {
+          pageIndex:1,
+          pageSize:10
+        },
+        dataList: [],
+        loading: false,
+        PageCount: 0,
+        columns: [{
+            name: 'CateName',
+            label: '老师',
+            field: 'CateName',
+            align: 'left'
+          },
+          {
+            name: 'CourseCount',
+            label: '时间',
+            align: 'left',
+            field: row => row.CourseCount
+          },
+          {
+            name: 'Status',
+            label: '日期',
+            align: 'left',
+            field: row => row.Status
+          },
+          {
+            name: 'UpdateByName',
+            label: '教室',
+            align: 'left',
+            field: row => row.UpdateByName
+          },
+          {
+            name: 'UpdateTimeStr',
+            label: '人数',
+            align: 'left',
+            field: row => row.UpdateTimeStr
+          },
+          {
+            name: 'ClassContent',
+            label: '主讲内容',
+            align: 'left',
+            field: row => row.ClassContent
+          },
+          {
+            name: 'CateId',
+            label: '操作',
+            field: 'CateId'
+          }
+        ],
+      }
+    },
+
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      //重新查询
+      resetSearch() {
+        this.msg.pageIndex = 1;
+        this.getList();
+      },
+      changePage(val) {
+        this.msg.pageIndex = val;
+        this.getList()
+      },
+      //获取课程系列分页列表
+      getList() {
+        GetReserveClassPage(this.msg).then(res => {
+          console.log(res,'数据');
+          if(res.Data==1){
+            this.dataList = res.Data.PageData;
+            this.PageCount = res.Data.PageCount;
+          }
+        })
+      }
+    }
+  }
+
+</script>
+<style lang="sass">
+  @import url('~assets/css/table.sass')
+
+</style>
\ No newline at end of file

src/router/routes.js

@@ -655,6 +655,11 @@ const routes = [{
     component: () =>
       import("pages/sale/visitorRegistrat.vue")
   },
+  {
+    path: "/sale/appointManagement", //销售 约课管理
+    component: () =>
+      import("pages/sale/appointManagement.vue")
+  },
   {
     path: "/course/teacherHours", //教学奖励 教师课时统计
     component: () =>