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

src/components/teacher/changeClassForm.vue

@@ -244,7 +244,7 @@
                 <template v-slot:body-cell-TimeList="props">
                   <q-td auto-width :props="props">
                     <div v-for="(item, index) in props.row.TimeList" class="lessForm_Class">
-                      {{ index + 1 }}节课 {{ item.StartTime }} - {{item.EndTime}}
+                      {{ index + 1 }}节课 {{ item.StartTime }}-{{item.EndTime}}
                     </div>
                   </q-td>
                 </template>
@@ -262,7 +262,7 @@
                 <template v-slot:body-cell-TargetTimeList="props">
                   <q-td auto-width :props="props">
                     <div v-for="(item, index) in props.row.NewPlan.TimeList" class="lessForm_Class">
-                      {{ index + 1 }}节课 {{ item.StartTime }} - {{item.EndTime}}
+                      {{ index + 1 }}节课 {{ item.StartTime }}-{{item.EndTime}}
                     </div>
                     <q-popup-edit :validate="proteinRangeValidation" persistent v-model="props.row.NewPlan.TimeList"
                       title="变更时间" buttons label-set="确认" label-cancel="取消">

src/pages/stuMan/classRecord.vue

 <template>
   <div class="page-body MainPlan xg">
     <div class="col row wrap q-col-gutter-md">
-      <div class="col-2 flex">
+      <div class="col-2">
         <el-select
           v-model="msg.TeacherId"
           style="width: 100%"
@@ -188,17 +188,18 @@ export default {
       PageCount: 0,
       picker: {
         disabledDate: (time) => {
-          let endTime = this.msg.EndTime;
-          if (endTime) {
-            return time.getTime() >= new Date(endTime).getTime() - 8.64e6;
-          } else {
-            return time.getTime() >= Date.now() - 8.64e6;
-          }
+          if (this.msg.EndTime == null) {
+              return false;
+            } else {
+              let endTime = new Date(this.msg.EndTime);
+              return endTime.getTime() < time.getTime();
+            }
         },
       },
       pickerEnd: {
         disabledDate: (time) => {
-          return time.getTime() >= Date.now() - 8.64e6;
+          let startTime = new Date(this.msg.StartTime);
+          return startTime.getTime() >= time.getTime();
         },
       },
       today: "",
@@ -216,7 +217,7 @@ export default {
         ? "0" + (date.getMonth() + 1)
         : date.getMonth() + 1) +
       "-" +
-      (date.getDate() < 10 ? "0" + date.getDate() < 10 : date.getDate());
+      (date.getDate() < 10 ? "0" + date.getDate() : date.getDate());
     this.today = today;
     this.msg.StartTime = today;
     this.tabMsg.StartTime = today;