2

src/api/scheduling/schedu.js

@@ -344,4 +344,15 @@ export function delHolidayPlan(data) {
     method: 'post',
     data: data
   })
+}
+/**
+ * 获取日期范围 所有排课计划列表
+ * @param {JSON参数} data 
+ */
+export function getToDayCoursePlanList(data) {
+  return request({
+    url: '/TeacherClass/GetToDayCoursePlanList',
+    method: 'post',
+    data: data
+  })
 }
\ No newline at end of file

src/components/schedul/reservelist.vue

@@ -39,6 +39,12 @@
           {{props.row.CreateTimeStr}}
         </q-td>
       </template>
+      <template v-slot:body-cell-Type="props">
+        <q-td :props="props">
+          <span v-if="props.row.ReserveType==0">正常试听</span>
+          <span v-if="props.row.ReserveType==1">跟班试听</span>
+        </q-td>
+      </template>
       <template v-slot:body-cell-JoinNum="props">
         <q-td auto-width :props="props">
           <span style="color:red;cursor:pointer"
@@ -72,7 +78,7 @@
                   <q-item-label>收支明细</q-item-label>
                 </q-item-section>
               </q-item>
-              <q-item clickable v-close-popup @click="editVisitor(props.row)">
+              <q-item clickable v-close-popup @click="editVisitor(props.row)"  v-if="props.row.ReserveType==0">
                 <q-item-section>
                   <q-item-label>修改</q-item-label>
                 </q-item-section>
@@ -176,6 +182,12 @@
             align: 'left',
             field: 'ClassContent',
           },
+          {
+            name: 'Type',
+            label: '类型',
+            align: 'left',
+            field: 'Type',
+          },
           {
             name: 'CreateByName',
             label: '创建人',

src/components/school/student/student-shiting.vue

@@ -18,15 +18,9 @@
         @click="isShowAdd = false"
       />
     </div> -->
-    <reserveclass-form
-      :saveObj="saveObj"
-      @close="closeReserveForm"
-      @success="closeReserveForm"
-      v-if="!saveObj.IsHaveCurseManager || userInfo.IsCourseConsultant == 1"
-    ></reserveclass-form>
-    <span v-else class="text-grey-4 q-mb-md"
-      >学员已推送课程顾问，只能进行查看</span
-    >
+    <reserveclass-form :saveObj="saveObj" @close="closeReserveForm" @success="closeReserveForm"
+      v-if="!saveObj.IsHaveCurseManager || userInfo.IsCourseConsultant == 1"></reserveclass-form>
+    <span v-else class="text-grey-4 q-mb-md">学员已推送课程顾问，只能进行查看</span>
     <div style="display:flex;flex:1;flex-direction: column;overflow:hidden;">
       <div class="TimeLineDiv">
         <q-timeline color="primary">
@@ -34,10 +28,14 @@
             <template v-slot:title>
               <div class="visit_Cont">
                 <div class="Log_Content">
+                 <q-chip color="primary" size="xs"  text-color="white" style="position:absolute;:top:0;right:0" v-if="tItem.ReserveType==1">
+                      跟班
+                    </q-chip>
                   <div>
                     预约时间：{{ tItem.ClassDateStr }} {{ tItem.ClassTime }}-{{
                       tItem.EndTime
                     }}
+                     
                   </div>
                   <div class="StuCom_Remark">
                     <div style="flex-shrink:0">主讲内容：</div>
@@ -49,11 +47,8 @@
                     <span class="StuCom_Left">教室</span>：{{ tItem.RoomName }}
                   </div>
                 </div>
-                <div
-                  @click="DeleteVisitorReserve(tItem.Id)"
-                  style="margin-top:10px;"
-                  class="visit_delete text-negative"
-                >
+                <div @click="DeleteVisitorReserve(tItem.Id)" style="margin-top:10px;"
+                  class="visit_delete text-negative">
                   删除
                 </div>
               </div>
@@ -69,110 +64,105 @@
       </div>
     </div>
     <div style="margin:20px 0;">
-      <q-pagination
-        class="full-width justify-end"
-        v-model="qMsg.pageIndex"
-        color="primary"
-        :max="page_Count"
-        input
-        @input="changePage"
-      />
+      <q-pagination class="full-width justify-end" v-model="qMsg.pageIndex" color="primary" :max="page_Count" input
+        @input="changePage" />
     </div>
   </div>
 </template>
 <script>
-import {
-  SetVisitorReserve,
-  queryVisitorReservePage,
-  RemoveVisitorReserve
-} from "../../../api/scheduling/schedu";
+  import {
+    SetVisitorReserve,
+    queryVisitorReservePage,
+    RemoveVisitorReserve
+  } from "../../../api/scheduling/schedu";
 
-import {
-  getTeacherDropDownList,
-  queryClassRoomList,
-  GetTrialLessonList
-} from "../../../api/school/index";
-import reserveclassForm from "./reserveclass-form";
-export default {
-  meta: {
-    title: ""
-  },
-  components: {
-    reserveclassForm
-  },
-  props: {
-    saveObj: {
-      type: Object,
-      default: null
-    }
-  },
-  data() {
-    return {
-      isShowAdd: false,
-      qMsg: {
-        pageIndex: 1,
-        pageSize: 12,
-        Visitor_Id: 0
-      },
-      dataList: [],
-      page_Count: 0,
-      userInfo: {}
-    };
-  },
-  created() {
-    if (this.saveObj) {
-      this.qMsg.Visitor_Id = this.saveObj.StuId;
-      this.userInfo = this.getLocalStorage();
-    }
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    //获取试听列表
-    getList() {
-      queryVisitorReservePage(this.qMsg).then(res => {
-        if (res.Code == 1) {
-          this.dataList = res.Data.PageData;
-          this.page_Count = res.Data.PageCount;
-        }
-      });
+  import {
+    getTeacherDropDownList,
+    queryClassRoomList,
+    GetTrialLessonList
+  } from "../../../api/school/index";
+  import reserveclassForm from "./reserveclass-form";
+  export default {
+    meta: {
+      title: ""
     },
-    changePage(val) {
-      this.qMsg.pageIndex = val;
-      this.getList();
+    components: {
+      reserveclassForm
     },
-    //删除试听
-    DeleteVisitorReserve(Id) {
-      let that = this;
-      this.$q
-        .dialog({
-          title: "提示信息",
-          message: "是否确定此试听信息删除？",
-          cancel: true,
-          persistent: true,
-          ok: "确定",
-          cancel: "取消"
-        })
-        .onOk(() => {
-          RemoveVisitorReserve({
-            Id: Id
-          }).then(res => {
-            that.$q.notify({
-              icon: "iconfont icon-chenggong",
-              timeout: 2000,
-              message: res.Message,
-              position: "top"
-            });
-            that.getList();
-          });
-        })
-        .onCancel(() => {});
+    props: {
+      saveObj: {
+        type: Object,
+        default: null
+      }
+    },
+    data() {
+      return {
+        isShowAdd: false,
+        qMsg: {
+          pageIndex: 1,
+          pageSize: 12,
+          Visitor_Id: 0
+        },
+        dataList: [],
+        page_Count: 0,
+        userInfo: {}
+      };
     },
-    closeReserveForm() {
-      this.isShowAdd = false;
+    created() {
+      if (this.saveObj) {
+        this.qMsg.Visitor_Id = this.saveObj.StuId;
+        this.userInfo = this.getLocalStorage();
+      }
+    },
+    mounted() {
       this.getList();
+    },
+    methods: {
+      //获取试听列表
+      getList() {
+        queryVisitorReservePage(this.qMsg).then(res => {
+          if (res.Code == 1) {
+            this.dataList = res.Data.PageData;
+            this.page_Count = res.Data.PageCount;
+          }
+        });
+      },
+      changePage(val) {
+        this.qMsg.pageIndex = val;
+        this.getList();
+      },
+      //删除试听
+      DeleteVisitorReserve(Id) {
+        let that = this;
+        this.$q
+          .dialog({
+            title: "提示信息",
+            message: "是否确定此试听信息删除？",
+            cancel: true,
+            persistent: true,
+            ok: "确定",
+            cancel: "取消"
+          })
+          .onOk(() => {
+            RemoveVisitorReserve({
+              Id: Id
+            }).then(res => {
+              that.$q.notify({
+                icon: "iconfont icon-chenggong",
+                timeout: 2000,
+                message: res.Message,
+                position: "top"
+              });
+              that.getList();
+            });
+          })
+          .onCancel(() => {});
+      },
+      closeReserveForm() {
+        this.isShowAdd = false;
+        this.getList();
+      }
     }
-  }
-};
+  };
+
 </script>