页面修改

src/components/schedul/audition-form.vue

@@ -191,7 +191,6 @@
       },
       //点击报入
       getStuInfo(item) {
-        console.log("item",item);
         if (item) {
           this.StuObj.ClassRoomId = item.ClassRoomId;
           this.StuObj.TeacherId = item.TeacherId;

src/components/schedul/reserve-form.vue

@@ -22,8 +22,8 @@
             </template>
           </q-input>
           <div class="Sysuser_Date col-6 q-pb-lg">
-            <q-field filled>
-                <template v-slot:control>
+            <q-field>
+              <template v-slot:control>
                 <el-time-select v-model="objOption.ClassTime" ref="ClassTime" style="width:50%" :picker-options="{
                     start: '09:00',
                     step: '00:15',
@@ -48,16 +48,14 @@
           <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
             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-pb-lg q-pr-lg" emit-value map-options />
 
           <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 />
         </div>
-        </div>
       </q-card-section>
       <q-separator />
       <q-card-actions align="right" class="bg-white">
@@ -96,7 +94,7 @@
           EndTime: "",
           ClassRoomId: "",
           ClassContent: '',
-          TrialLessonId:''
+          TrialLessonId: ''
         },
         saveLoading: false,
         TeacherList: [],
@@ -114,7 +112,7 @@
           Id: 4,
           Name: '留学类：打算去往日本留学（本科、硕士、语言学校、私塾等）'
         }],
-        TrialList:[] //试听课程下拉数据
+        TrialList: [] //试听课程下拉数据
       }
     },
     mounted() {
@@ -122,8 +120,8 @@
       var year = nowDay.getFullYear(); //年
       var month = nowDay.getMonth() + 1; //月
       var day = nowDay.getDate(); //日
-      if(month<10){
-        month='0'+month
+      if (month < 10) {
+        month = '0' + month
       }
       this.objOption.ClassDate = year + '-' + month + '-' + day;
       this.GetTeacherList();
@@ -132,7 +130,7 @@
       this.initObj()
     },
     methods: {
-      GetTrialDrop(){
+      GetTrialDrop() {
         GetTrialLessonList({}).then(res => {
           if (res.Code == 1) {
             this.TrialList = res.Data;
@@ -165,6 +163,7 @@
               this.objOption.EndTime = '';
               this.objOption.ClassRoomId = '';
               this.objOption.ClassContent = '';
+              this.objOption.TrialLessonId = "";
             }
           })
         }
@@ -208,8 +207,6 @@
           }
         })
       },
-
     }
   }
-
-</script>
+</script>
\ No newline at end of file

src/components/schedul/schedul-visit.vue

@@ -90,7 +90,6 @@
     background: #f0f2f5 !important;
     border: 0;
   }
-
 </style>
 <template>
   <div class="schedulVisit">
@@ -215,6 +214,7 @@
               <q-icon name="edit" color="primary" style="font-size:11px" class="q-mr-xs"></q-icon>
               <span style="font-size:12px;">到访</span>
             </q-btn>
+            <q-btn dense flat color="primary" label="添加试听" @click="CreateReserveclass(visitModel)"></q-btn>
           </q-td>
         </template>
         <template v-slot:body-cell-IsVisitStr="props">
@@ -289,11 +289,21 @@
     </studentRight-form>
     <student-audition v-if="isShowStuAudition" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
     </student-audition>
+    <!--试听课弹窗-->
+    <q-dialog persistent v-model="isShowReserveclass">
+      <q-card flat class="q-pa-md" style="width:800px">
+        <div class="text-h6">新增试听课</div>
+        <reserveclass-form :save-Obj="stuOption" @close="closeReserveForm" @success="closeReserveForm">
+        </reserveclass-form>
+      </q-card>
+    </q-dialog>
   </div>
 </template>
 <script>
   import studentRightForm from "../school/student/studentRight-form";
   import studentAudition from "../school/student/student-audition"
+
+  import reserveclassForm from '../school/student/reserveclass-form'
   import {
     getTodayVisitList
   } from "../../api/stuMan/index";
@@ -332,7 +342,8 @@
       schedulFanke,
       studentAddForm,
       studentRightForm,
-      studentAudition
+      studentAudition,
+      reserveclassForm
     },
     computed: {
       ...mapGetters(["userInfo"])
@@ -636,7 +647,8 @@
         showTodayVist: [],
         trialList: [],
         shwoTrialList: [],
-        stuOption:null
+        stuOption: null,
+        isShowReserveclass: false, //是否显示试听课弹窗
       };
     },
     watch: {
@@ -670,6 +682,14 @@
       this.initDutyTrialLessonList();
     },
     methods: {
+      //添加试听
+      CreateReserveclass(item) {
+        this.isShowReserveclass = true;
+      },
+      //关闭试听弹窗
+      closeReserveForm() {
+        this.isShowReserveclass = false;
+      },
       //点击学生姓名弹出
       getStuRight(obj) {
         if (obj) {
@@ -681,7 +701,7 @@
         this.isShowStuRight = true;
       },
       //点击预约到访的姓名
-      getStuAudition(obj){
+      getStuAudition(obj) {
         if (obj) {
           this.stuOption = obj;
         } else {
@@ -690,7 +710,6 @@
         this.isShowStuAudition = true;
       },
       addFinishHandler(m, t) {
-        console.log(m, t);
         if (m && m.StuId) {
           if (t == 1) {
             this.visitModel = m;
@@ -713,7 +732,6 @@
           StuId: m.StuId,
           VisitTime: d.getHours() + ":" + d.getMinutes()
         };
-        console.log("进来了呀", msg);
         saveStudentVisit(msg).then(r => {
           this.visitModel = null
           if (r.Data) {
@@ -783,7 +801,7 @@
         this.getVisitoryPage();
         this.closeStuForm();
       },
-      closeStuForm(){
+      closeStuForm() {
         this.isShowStuRight = false;
         this.isShowStuAudition = false;
       },
@@ -927,9 +945,7 @@
       }
     }
   };
-
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-
-</style>
+</style>
\ No newline at end of file

src/components/school/student/reserveclass-form.vue

@@ -14,7 +14,7 @@
       <q-field filled class="q-pb-lg q-pr-lg" dense>
          <template v-slot:control>
           <el-date-picker v-model="addMsg.ClassDate" ref="ClassDate" :rules="[val => !!val || '请选择预约日期']"
-            style="width:225px" size="mini"  type="date" placeholder="预约日期" value-format="yyyy-MM-dd">
+            style="width:225px" size="mini" type="date" placeholder="预约日期" value-format="yyyy-MM-dd">
           </el-date-picker>
         </template>
       </q-field>
@@ -53,9 +53,9 @@
         ref="ClassRoomId" :options="ClassRoomList" label="关联教室" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
       <q-select filled stack-label option-value="Id" dense option-label="LessonName" v-model="addMsg.TrialLessonId"
         :options="TrialList" label="试听课程" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
-
     </div>
     <div class="row wrap justify-end q-pr-lg" style="margin-bottom:10px;">
+      <q-btn label="关闭" flat color="accent q-mb-lg" size="md" style="margin-right:10px;" @click="closeClassForm" />
       <q-btn label="保存" color="accent q-mb-lg" size="md" @click="saveAppointForm()" />
     </div>
     <audition-form v-if="isShowTeacher" @close="closeAuditForm" @getchildInfo="getchildInfo"></audition-form>
@@ -126,6 +126,10 @@
       }
     },
     methods: {
+      //关闭窗口
+      closeClassForm() {
+        this.$emit("success");
+      },
       //选择主讲内容赋值选择教师
       getTeacherChoose(content) {
         var TList = [];
@@ -257,7 +261,7 @@
           this.addMsg.ClassTime = obj.ClassTime;
           this.addMsg.EndTime = obj.EndTime;
           this.addMsg.ClassContent = obj.ClassContent;
-          this.addMsg.TrialLessonId=obj.TrialLessonId;
+          this.addMsg.TrialLessonId = obj.TrialLessonId;
         }
       },
     }

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

 <style>
-  .Student_Date .el-input__inner {
-    background: transparent !important;
-    border: 0 !important;
-    padding-right: 0 !important;
-  }
+
 </style>
 <template>
   <div>