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

src/api/scheduling/schedu.js

@@ -178,7 +178,7 @@ export function DutyCheck(data) {
 
 /**
  * 值班打卡/值班交接
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function saveDutyCheck(data) {
   return request({
@@ -190,7 +190,7 @@ export function saveDutyCheck(data) {
 
 /**
  * 约课管理
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function GetReserveClassPage(data) {
   return request({
@@ -202,7 +202,7 @@ export function GetReserveClassPage(data) {
 
 /**
  * 设置约课信息
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function SetVisitorReserve(data) {
   return request({
@@ -213,9 +213,21 @@ export function SetVisitorReserve(data) {
 }
 
 
+/**
+ * 预约课程详情
+ * @param {JSON参数} data
+ */
+ export function GetVisitorReserveById(data) {
+  return request({
+    url: '/VisitorReserve/GetVisitorReserveById',
+    method: 'post',
+    data
+  });
+}
+
 /**
  * 设置约课开课信息
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function SetVisitorReserveClass(data) {
   return request({
@@ -226,7 +238,7 @@ export function SetVisitorReserveClass(data) {
 }
 /**
  * 新增留学需求
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function SetStudyAbroad(data) {
   return request({
@@ -238,7 +250,7 @@ export function SetStudyAbroad(data) {
 
 /**
  * 新增学员反馈信息
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function SetVisitorReserveFeedback(data) {
   return request({
@@ -249,7 +261,7 @@ export function SetVisitorReserveFeedback(data) {
 }
 /**
  * 约课管理
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function queryVisitorReservePage(data) {
   return request({
@@ -262,7 +274,7 @@ export function queryVisitorReservePage(data) {
 
 /**
  * 删除试听课程
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function RemoveReserveClass(data) {
   return request({
@@ -274,7 +286,7 @@ export function RemoveReserveClass(data) {
 
 /**
  * 保存修改听课程
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function SetReserveClass(data) {
   return request({
@@ -287,7 +299,7 @@ export function SetReserveClass(data) {
 
 /**
  * 获取约课班级详情
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function GetReserveClass(data) {
   return request({
@@ -299,7 +311,7 @@ export function GetReserveClass(data) {
 
 /**
  * 修改预约状态
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function setVisitorReserveStatus(data) {
   return request({
@@ -311,7 +323,7 @@ export function setVisitorReserveStatus(data) {
 
 /**
  * 删除约课数据
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function RemoveVisitorReserve(data) {
   return request({
@@ -323,7 +335,7 @@ export function RemoveVisitorReserve(data) {
 
 /**
  * 获取交接班次
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function GetHandoverShiftList() {
   return request({
@@ -335,7 +347,7 @@ export function GetHandoverShiftList() {
 
 /**
  * 获取节假日计划分页列表
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function getHolidayPlanList(data) {
   return request({
@@ -347,7 +359,7 @@ export function getHolidayPlanList(data) {
 
 /**
  * 获取节假日计划详情
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function getHolidayInfo(data) {
   return request({
@@ -359,7 +371,7 @@ export function getHolidayInfo(data) {
 
 /**
  * 新增节假日计划
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function setHolidayPlan(data) {
   return request({
@@ -371,7 +383,7 @@ export function setHolidayPlan(data) {
 
 /**
  * 删除节假日计划
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function delHolidayPlan(data) {
   return request({
@@ -382,7 +394,7 @@ export function delHolidayPlan(data) {
 }
 /**
  * 获取日期范围 所有排课计划列表
- * @param {JSON参数} data 
+ * @param {JSON参数} data
  */
 export function getToDayCoursePlanList(data) {
   return request({
@@ -390,4 +402,4 @@ export function getToDayCoursePlanList(data) {
     method: 'post',
     data: data
   })
-}
+}
\ No newline at end of file

src/components/schedul/reserve-form.vue

@@ -11,7 +11,8 @@
       </q-card-section>
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
         <div class="row wrap">
-          <q-input filled v-model="objOption.ClassDate" class="col-6 q-pr-lg q-pb-lg"
+          <q-input filled v-model="objOption.ClassDate" class=""
+          :class="[$q.platform.is.desktop?'col-6 q-pr-lg q-pb-lg':'col-12 q-pb-sm']"
             :rules="[val => !!val || '请选择预约日期']" ref="ClassDate" mask="date" label="预约日期">
             <template v-slot:append>
               <q-icon name="event" class="cursor-pointer">
@@ -21,8 +22,9 @@
               </q-icon>
             </template>
           </q-input>
-          <div class="Sysuser_Date col-6 q-pb-lg">
-            <q-field>
+          <div class="Sysuser_Date"
+          :class="[$q.platform.is.desktop?'col-6 q-pb-lg':'col-12 q-pb-sm']">
+            <q-field filled dense>
               <template v-slot:control>
                 <el-time-select v-model="objOption.ClassTime" ref="ClassTime" style="width:50%" :picker-options="{
                     start: '09:00',
@@ -42,19 +44,22 @@
             </q-field>
           </div>
           <q-select filled stack-label option-value="TId" option-label="TeacherName" v-model="objOption.TeacherId"
-            ref="TeacherId" :options="TeacherList" label="选择教师" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value
+            ref="TeacherId" :options="TeacherList" label="选择教师" :dense="false" class="col-6 q-pr-lg"
+            :class="[$q.platform.is.desktop?'q-pb-lg':'q-pb-sm']" emit-value
             map-options />
 
           <q-select filled stack-label option-value="RoomId" option-label="RoomName" v-model="objOption.ClassRoomId"
-            ref="ClassRoomId" :options="ClassRoomList" label="关联教室" :dense="false" class="col-6 q-pb-lg" emit-value
+            ref="ClassRoomId" :options="ClassRoomList" label="关联教室" :dense="false" class="col-6"
+            :class="[$q.platform.is.desktop?'q-pb-lg':'q-pb-sm']" emit-value
             map-options />
 
           <q-select filled stack-label option-value="Id" option-label="LessonName" v-model="objOption.TrialLessonId"
-            :options="TrialList" label="试听课程" :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
+            :options="TrialList" label="试听课程" :dense="false" class="col-6 q-pr-lg"
+            :class="[$q.platform.is.desktop?'q-pb-lg':'q-pb-sm']" emit-value map-options />
 
-          <q-select filled stack-label option-value="Name" option-label="Name" v-model="objOption.ClassContent"
+          <!-- <q-select filled stack-label option-value="Name" option-label="Name" v-model="objOption.ClassContent"
             ref="ClassContent" :options="ContentList" label="主讲内容" :dense="false" class="col-12 q-pb-lg" emit-value
-            map-options />
+            map-options /> -->
         </div>
       </q-card-section>
       <q-separator />
@@ -115,15 +120,23 @@
         TrialList: [] //试听课程下拉数据
       }
     },
-    mounted() {
-      let nowDay = new Date();
-      var year = nowDay.getFullYear(); //年
-      var month = nowDay.getMonth() + 1; //月
-      var day = nowDay.getDate(); //日
-      if (month < 10) {
-        month = '0' + month
+    watch: {
+      saveObj:{
+        handler(n){
+          this.initObj()
+        },
+        deep: true
       }
-      this.objOption.ClassDate = year + '-' + month + '-' + day;
+    },
+    mounted() {
+      // let nowDay = new Date();
+      // var year = nowDay.getFullYear(); //年
+      // var month = nowDay.getMonth() + 1; //月
+      // var day = nowDay.getDate(); //日
+      // if (month < 10) {
+      //   month = '0' + month
+      // }
+      // this.objOption.ClassDate = year + '-' + month + '-' + day;
       this.GetTeacherList();
       this.getClassRoomList();
       this.GetTrialDrop();
@@ -139,11 +152,13 @@
       },
       //初始化表单
       initObj() {
+        this.objOption.ClassDate = this.saveObj.ReservationDate
         if (this.saveObj && this.saveObj.ReserveClassId > 0) {
           GetReserveClass({
             ReserveClassId: this.saveObj.ReserveClassId
           }).then(res => {
             if (res.Code == 1) {
+
               this.objOption.ReserveClassId = res.Data.ReserveClassId;
               this.objOption.TeacherId = res.Data.TeacherId;
               this.objOption.ClassDate = res.Data.ClassDateStr;
@@ -257,4 +272,4 @@
       },
     }
   }
-</script>
+</script>
\ No newline at end of file

src/components/schedul/reservestudentlist.vue

 <template>
-  <div class="page-content">
-    <q-table :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat
+  <div class="page-content"
+  :class="[$q.platform.is.desktop?'':'']">
+    <q-table v-if="$q.platform.is.desktop" :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat
       class="sticky-column-table sticky-right-column-table" separator="none" :data="data" :columns="columns"
       :visible-columns="visibleColumns" row-key="name">
       <template v-slot:top>
-        <div class="col-2 q-table__title">试听开课管理</div>
+        <div class="q-table__title"
+        :class="[$q.platform.is.desktop?'col-2':'col-12']">试听开课管理</div>
         <q-space />
-       
+
       </template>
       <template v-slot:body-cell-ReservationDate="props">
         <q-td>
@@ -20,7 +22,7 @@
           <div style="min-width: 150px;word-break: break-word;white-space: normal;">
             {{ props.row.ClassDateStr }} {{ props.row.ClassTime }}
                     <template v-if="props.row.ClassDateStr&&props.row.ClassDateStr.length>0">-</template>
-                    {{ props.row.EndTime }} 
+                    {{ props.row.EndTime }}
           </div>
         </q-td>
       </template>
@@ -38,7 +40,40 @@
       <template v-slot:bottom>
       </template>
     </q-table>
-    <reserveForm v-if="isShowReserve" :save-obj="reserveObj" @close="closeReserveForm" @success="refreshPage">
+    <template v-if="$q.platform.is.mobile">
+      <q-card
+        class="light-shadow q-pa-md bg-grey-1 rounded-borders q-mb-md"
+        flat
+        v-for="(x, index) in data"
+        :key="index"
+      >
+        <div class="row justify-between">
+          <div>学生：<span class="text-blue-5">{{x.StuName}}</span></div>
+          <div>试听日期：<span class="text-blue-5">{{timeFormatSeconds(x.ReservationDate)}}</span></div>
+        </div>
+        <div class="bg-white q-pa-sm q-mt-sm" style="border-radius: 8px;">
+          <div>
+            <span class="text-grey-6">试听需求：</span><span v-html="">{{x.Demand}}</span>
+          </div>
+        </div>
+        <div class=" q-pa-sm border-radius q-mt-sm" v-if="x.ClassDateStr||x.TeacherName||x.LessonName||x.RoomName">
+          <div class="row justify-between" v-if="x.ClassDateStr||x.TeacherName">
+            <span v-if="x.ClassDateStr">预约时间：<span class="text-blue-5">{{x.ClassDateStr}}</span></span>
+            <span v-if="x.TeacherName">主讲老师：<span class="text-blue-5">{{x.TeacherName}}</span></span>
+          </div>
+          <div class="row justify-between" v-if="x.LessonName||x.RoomName">
+            <span v-if="x.LessonName">课程名称：<span class="text-blue-5">{{x.LessonName}}</span></span>
+            <span v-if="x.RoomName">教室：<span class="text-blue-5">{{x.RoomName}}</span></span>
+          </div>
+        </div>
+        <div class="row justify-end">
+          <q-btn  label="修改" color="primary" flat @click="editVisitor(x)"/>
+          <q-btn  label="删除" color="red-6" flat @click="DeleteVisitorReserve(x.Id)"/>
+        </div>
+      </q-card>
+    </template>
+
+    <reserveForm v-if="isShowReserve" :saveObj="reserveObj" @close="closeReserveForm" @success="refreshPage">
     </reserveForm>
   </div>
 </template>
@@ -74,6 +109,7 @@
             label: '学生名称',
             align: 'left',
             field: 'StuName',
+            required: true,
           },
           {
             name: 'ReservationDate',
@@ -166,17 +202,13 @@
       if (seconds < 10) seconds = '0' + seconds;
       timeStr+= ' ' + hours + ':' + min + ':' + seconds;
     }
-   
+
     timeStr=year + '-' + month + '-' + day +timeStr;
 return timeStr;
 },
       //编辑试听
       editVisitor(obj) {
-        if (obj) {
-          this.reserveObj = obj
-        } else {
-          this.reserveObj = null
-        }
+        this.reserveObj = obj
         this.isShowReserve = true;
       },
       //关闭弹窗
@@ -186,8 +218,8 @@ return timeStr;
       refreshPage() {
         this.$emit('success');
       },
-    
-    
+
+
            //删除试听
            DeleteVisitorReserve(Id) {
         let that = this;
@@ -221,4 +253,4 @@ return timeStr;
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-</style>
+</style>
\ No newline at end of file

src/components/school/student/transfer-order.vue

@@ -196,6 +196,13 @@ export default {
       selectedCourseList: [],//多选课程
     };
   },
+  watch:{
+    mode:{
+      handler(n){
+        this.selectedCourseList=[]
+      }
+    }
+  },
   mounted() {
     let nowDay = new Date();
     var year = nowDay.getFullYear(); //年

src/components/school/student/transfer-order/yueke.vue

@@ -53,7 +53,7 @@
     -->
     <q-table
       :pagination="msg"
-      selection="multiple"
+      :selection="mode==2?'multiple':'single'"
       :selected.sync="selection"
       no-data-label="暂无相关数据"
       flat

src/pages/h5page/statusPrompt.vue

+<template>
+	<div class="pay-OuterFrame">
+        <div class="popup-box">
+            <div class="popup-title">
+                <div style="margin-top: 230px;">
+                    <img style="width:80px;height:80px;" src="../../assets/images/da_gou.png" />
+                </div>
+                <div style="font-size: 18px;margin-top: 15px;">{{isSuccessTitle}}</div>
+            </div>
+
+        </div>
+
+	</div>
+</template>
+<script>
+	export default {
+    props:["isSuccess","isSuccessTitle"],
+		components: {
+
+		},
+		data() {
+			return {
+
+            }
+		},
+		computed: {
+		},
+    mounted(){
+
+    },
+		methods: {
+
+    }
+	}
+</script>
+
+<style lang="scss" scoped>
+    .popup-box{
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: #ffffff;
+        z-index: 3;
+    }
+    .popup-title{
+        padding: 400rpx 0;
+        text-align: center;
+    }
+    .popup-title text{
+        display: block;
+        margin-top: 30rpx;
+        font-size: 35rpx;
+    }
+</style>

src/pages/sale/reserveClassStudent.vue

@@ -6,10 +6,13 @@
 </style>
 <template>
   <div class="page-body">
-    <div class="page-search row items-center">
-      <div class="col row wrap q-mr-lg q-col-gutter-md">
-        <div class="col-3">
-          <div class="col-4 Sysuser_Date">
+    <div class="page-search"
+    :class="[$q.platform.is.desktop?'row items-center':'']">
+      <div class="col row wrap  q-col-gutter-md"
+      :class="[$q.platform.is.desktop?'q-mr-lg':'']">
+        <div
+        :class="[$q.platform.is.desktop?'col-3':'col-12']">
+          <div class="Sysuser_Date">
             <q-field filled>
               <template v-slot:control>
                 <el-date-picker v-model="msg.StartClassDate" value-format="yyyy-MM-dd" type="date" placeholder="开始时间"
@@ -38,6 +41,21 @@
       </div>
     </div>
     <reservelist :data="dataList" :authObj="authObj" :loading="loading" @success="refreshPage"></reservelist>
+
+    <q-card
+    class="light-shadow q-pa-md bg-white rounded-borders q-mb-md"
+    v-if="msg.pageCount > 0"
+    flat
+  >
+    <q-pagination v-if="$q.platform.is.mobile"
+      class="full-width justify-end"
+      v-model="msg.pageIndex"
+      color="primary"
+      :max="msg.pageCount"
+      :input="true"
+      @update:model-value="changePageHandler"
+    />
+  </q-card>
     <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount" :input="true"
       @input="changePage" />
   </div>
@@ -89,7 +107,7 @@
       var month = nowDay.getMonth() + 1; //月
       var day = nowDay.getDate(); //日
        this.msg.StartClassDate = year + '-' + month + '-' + day
- 
+
       if (this.$route.query) {
         if (this.$route.query.StartClassDate) {
           this.msg.StartClassDate = this.$route.query.StartClassDate;
@@ -100,12 +118,16 @@
         if (this.$route.query.TeacherId) {
           this.msg.TeacherId = Number(this.$route.query.TeacherId);
         }
-      }  
+      }
       // this.GetTeacherList();
       // this.getClassRoomList();
       this.getList()
     },
     methods: {
+      changePageHandler(n) {
+        this.msg.pageIndex = n;
+        this.getList();
+      },
       //重新查询
       resetSearch() {
         this.msg.pageIndex = 1;
@@ -153,4 +175,4 @@
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-</style>
+</style>
\ No newline at end of file