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

src/components/course/classmate-form.vue

@@ -101,8 +101,6 @@
   }
 
   .MainPlan .plan_Tdiv {
-    /* min-width:126px;
-    white-space: nowrap; */
     text-overflow: ellipsis;
     overflow: hidden;
     word-break: break-all;

src/pages/sale/appointManagement.vue

@@ -47,14 +47,18 @@
         </div>
       </div>
     </div>
-
     <q-table :pagination="msg" :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>
+        <div class="col-2 q-table__title">我的约课</div>
         <q-space />
       </template>
+      <template v-slot:body-cell-ClassTime="props">
+        <q-td :props="props">
+          {{props.row.ClassTime}}-{{props.row.EndTime}}
+        </q-td>
+      </template>
       <template v-slot:body-cell-OrderId="props">
         <q-td :props="props">
           <template v-if="props.row.OrderId && props.row.OrderId>0">
@@ -147,7 +151,7 @@
   import appodetailForm from '../../components/schedul/appodetail-form'
   export default {
     meta: {
-      title: "约课管理"
+      title: "我的约课"
     },
     components: {
       yuekeForm,
@@ -185,16 +189,10 @@
           },
           {
             name: 'ClassTime',
-            label: '开始时间',
+            label: '约课时间',
             field: 'ClassTime',
             align: 'left'
           },
-          {
-            name: 'EndTime',
-            label: '结束时间',
-            field: 'EndTime',
-            align: 'left'
-          },
           {
             name: 'TeacherName',
             label: '老师',

src/pages/sale/reserveClass.vue

@@ -51,10 +51,24 @@
           </div>
         </q-td>
       </template>
+      <template v-slot:body-cell-ClassTime="props">
+        <q-td :props="props">
+          {{props.row.ClassTime}}-{{props.row.EndTime}}
+        </q-td>
+      </template>
+      <template v-slot:body-cell-CreateByName="props">
+        <q-td :props="props">
+          {{props.row.CreateByName}}<br />
+          {{props.row.CreateTimeStr}}
+        </q-td>
+      </template>
       <template v-slot:body-cell-JoinNum="props">
         <q-td auto-width :props="props" style="width:25%">
-          <span style="color:red;" :class="{'underLine':(props.row.VisitorList&&props.row.VisitorList.length>0)}">
+          <span style="color:red;cursor:pointer":class="{'underLine':(props.row.VisitorList&&props.row.VisitorList.length>0)}">
             {{props.row.JoinNum}}
+            <q-tooltip :offset="[10, 10]">
+              点击查看名单
+            </q-tooltip>
             <q-popup-proxy v-if="props.row.VisitorList&&props.row.VisitorList.length>0">
               <div style="min-width:360px;max-width:360px;">
                 <q-banner>
@@ -131,31 +145,26 @@
           },
           {
             name: 'ClassTime',
-            label: '开始时间',
+            label: '试听时间',
             align: 'left',
             field: 'ClassTime',
           },
-          {
-            name: 'EndTime',
-            label: '结束时间',
-            align: 'left',
-            field: 'EndTime',
-          },
+    
           {
             name: 'RoomName',
             label: '教室',
             align: 'left',
             field: 'RoomName',
           },
-          {
-            name: 'RoomNum',
-            label: '人数',
-            align: 'left',
-            field: 'RoomNum',
-          },
+          // {
+          //   name: 'RoomNum',
+          //   label: '人数',
+          //   align: 'left',
+          //   field: 'RoomNum',
+          // },
           {
             name: 'JoinNum',
-            label: '报名人数',
+            label: '试听人数',
             align: 'left',
             field: 'JoinNum',
           },
@@ -165,6 +174,12 @@
             align: 'left',
             field: 'ClassContent',
           },
+          {
+            name: 'CreateByName',
+            label: '创建人',
+            align: 'left',
+            field: 'CreateByName',
+          },
           {
             name: 'TeacherId',
             label: '操作',

src/pages/sale/visitorRegistrat.vue

@@ -13,10 +13,10 @@
         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>
+          <div class="col-2 q-table__title">客户资料信息</div>
           <q-space />
           <div class="page-option">
-            <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="添加访客" @click="editVisitor(null)" />
+            <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="添加客户" @click="editVisitor(null)" />
           </div>
         </template>
         <template v-slot:body-cell-VisitorStatus="props">
@@ -69,7 +69,7 @@
   import appointForm from '../../components/schedul/appoint-form'
   export default {
     meta: {
-      title: "访客登记"
+      title: "客户资料信息"
     },
     components: {
       schedulFanke,