1

src/components/schedul/vacationPlan-form.vue

@@ -16,8 +16,8 @@
           <div class="col-12 Sysuser_Date">
             <q-field filled>
                <template v-slot:control>
-                <el-date-picker v-model="date" value-format="yyyy-MM-dd" type="daterange"
-                   range-separator="至"  start-placeholder="开始日期"  end-placeholder="结束日期" >
+                <el-date-picker v-model="date" value-format="yyyy-MM-dd" type="daterange"  range-separator="至"
+                   start-placeholder="开始日期"  end-placeholder="结束日期">
                    </el-date-picker>       
               </template>
             </q-field>
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-   import {
+  import {
     setHolidayPlan,
   } from '../../api/scheduling/schedu'
   export default {
@@ -72,8 +72,8 @@
     created() {
       if (this.saveObj && this.saveObj.HolidayId > 0) {
         this.addMsg = this.saveObj
-        this.date[0]=this.saveObj.StartTime
-        this.date[1]=this.saveObj.EndTime
+        this.date[0] = this.saveObj.StartTime
+        this.date[1] = this.saveObj.EndTime
       }
     },
     methods: {
@@ -84,13 +84,22 @@
       },
       //保存菜单
       saveCourse() {
-        console.log(this.date)
-        this.addMsg.StartTime=this.date[0]
-        this.addMsg.EndTime=this.date[1]
-          if(this.addMsg.StartTime==""||this.addMsg.EndTime==""){
-              this.Success('请选择时间')
-              return
-          }
+
+        if (!this.date) {
+          this.date = ["", ""]
+        }
+        this.addMsg.StartTime = this.date[0]
+        this.addMsg.EndTime = this.date[1]
+        console.log(97, this.date, this.addMsg)
+        if (this.addMsg.StartTime == "" || this.addMsg.EndTime == "") {
+          this.$q.notify({
+            icon: "error",
+            color: "negative",
+            message: '请选择时间',
+            position: "top"
+          })
+          return
+        }
         setHolidayPlan(this.addMsg).then(res=>{
             if(res.Code===1){
                 this.Success(res.Message)
@@ -99,7 +108,7 @@
             }
         })
       },
-      
+
     }
   };
 

src/pages/classroom/courseInfo.vue

@@ -301,11 +301,9 @@
       if (this.$route.query.id) {
         this.id = this.$route.query.id;
       }
-      
     },
     mounted(){
-      this.getdata();
-        
+      this.getdata();   
     },
     methods: {
       getdata(){
@@ -351,8 +349,7 @@
         getVideoPlayUrl({strVid:url}).then(res=>{
             if(res.Code===1){
                this.initPlayer(res.Data.URL,res.Data.VideoImg,auth)
-            }
-           
+            }  
         })
       }
     },

src/pages/classroom/useRecord.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="col-3">
           <q-select @input="getClassRoomTimeList" standout="bg-primary text-white" option-value="RoomId"
-            option-label="RoomName" v-model="msg.ClassRoomId" :options="classroomopt" emit-value map-options
+            option-label="RoomName" v-model="msg.ClassRoomId" :options="classroomopt" emit-value map-options use-input clearable
             label="关联教室" @filter="filterFn">
             <template v-slot:no-option>
               <q-item>
@@ -78,10 +78,8 @@
         },
         tbodayData: [],
         schoolopt: [],
-        classroomopt: [{
-          RoomName: "不限",
-          RoomId: 0
-        }],
+        classroomopt: [],
+        AllClassroomOpt:[]
       };
     },
     created() {
@@ -109,10 +107,10 @@
       filterFn(val, update) {
         update(() => {
           if (val === '') {
-            this.classroomopt = JSON.parse(JSON.stringify(this.classroomopt))
+            this.classroomopt = JSON.parse(JSON.stringify(this.AllClassroomOpt))
           } else {
             const needle = val.toLowerCase();
-            this.classroomopt = this.classroomopt.filter(v => v.RoomName.toLowerCase().indexOf(needle) > -1);
+            this.classroomopt = this.AllClassroomOpt.filter(v => v.RoomName.toLowerCase().indexOf(needle) > -1);
           }
         })
       },
@@ -142,6 +140,7 @@
               RoomId: 0
             }
             this.classroomopt = [obj, ...res[0].RoomList]
+            this.AllClassroomOpt=[obj, ...res[0].RoomList]
           }
         }
 
@@ -159,6 +158,7 @@
             RoomId: 0
           }
           this.classroomopt = [obj, ...res[0].RoomList]
+          this.AllClassroomOpt=[obj, ...res[0].RoomList]
         }
         this.getClassRoomTimeList()
 
@@ -179,10 +179,6 @@
         this.msg.ClassRoomId = val.RoomId
         this.msg.SchoolId = val.schoolId
         this.getClassRoomTimeList();
-        this.$forceUpdate()
-      },
-      dateChoose(value, reason, details) {
-
       },
       //获取结束日期
       getEndTime(date) {

src/pages/scheduling/vacationPlan.vue

@@ -10,7 +10,7 @@
           <q-field filled>
              <template v-slot:control>
               <el-date-picker v-model="dateList" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
-                 range-separator="至"  start-placeholder="开始日期"  end-placeholder="结束日期">
+                 range-separator="至"  start-placeholder="开始日期"  end-placeholder="结束日期" >
                  </el-date-picker>       
             </template>
           </q-field>
@@ -145,12 +145,14 @@
     },
     methods: {
       getList() {
+        if(!this.dateList){
+          this.dateList=["",""]
+        }
         this.msg.StartTime = this.dateList[0]
         this.msg.EndTime = this.dateList[1]
         this.loading = true
         getHolidayPlanList(this.msg).then(res => {
           this.loading = false
-          console.log(185, res)
           if (res.Code === 1) {
             this.data = res.Data.PageData
             this.pageCount = res.Data.PageCount

src/pages/teacher/studentManager.vue

@@ -146,6 +146,12 @@
             label: '学员名称',
             field: 'GuestName',
             align: 'left',
+          },
+            {
+            name: 'Mobile',
+            label: '电话',
+            field: 'Mobile',
+            align: 'left'
           },
             {
             name: 'ClassName',
@@ -165,12 +171,7 @@
             field: 'TotalPlanNum',
             align: 'left'
           },
-          {
-            name: 'Mobile',
-            label: '电话',
-            field: 'Mobile',
-            align: 'left'
-          },
+        
            {
             name: 'IsRenewOrder',
             label: '是否是续课订单',