Merge branch '03/08netWorkReset' into online

src/views/accompanyManager/accompanys.vue

@@ -301,7 +301,7 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="上课日期" prop="date" v-if="courseType != 'TRIAL'">
+        <el-form-item label="上课日期" prop="date">
           <el-date-picker
             v-model.trim="maskForm.date"
             type="date"
@@ -310,8 +310,8 @@
             placeholder="选择日期"
           ></el-date-picker>
         </el-form-item>
-        <!-- 试听课 -->
-        <el-form-item label="上课日期" prop="date" v-else>
+        <!-- 试听课  v-if="courseType != 'TRIAL'"-->
+        <!-- <el-form-item label="上课日期" prop="date" v-else>
           <el-date-picker
             v-model.trim="maskForm.date"
             style="width: 200px !important"
@@ -320,7 +320,7 @@
             :picker-options="bigin"
             placeholder="选择日期"
           ></el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           label="开始时间"
           prop="startTime"
@@ -926,7 +926,23 @@ export default {
     },
     beginDate() {
       let self = this;
-
+      return {
+        firstDayOfWeek: 1,
+        disabledDate(time) {
+          if (self.tableList[self.tableList.length -1].classDate) {
+            return (
+              new Date(self.tableList[self.tableList.length -1].classDate).getTime() >=
+              time.getTime()
+            );
+          } else {
+            return time.getTime() >= Date.now();
+            //开始时间不选时，结束时间最大值小于等于当天
+          }
+        },
+      };
+    },
+     resetDate() {
+      let self = this;
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
@@ -1083,23 +1099,6 @@ export default {
           });
         }
       });
-      // if (!this.startTime) {
-      //   this.$message.error("请填写修改时间");
-      //   return;
-      // }
-      // let obj = {
-      //   startClassTime: dayjs(this.maskForm.date + ' ' + this.startTime).format('YYYY-MM-DD HH:mm:ss'),
-      //   id: this.maskForm.id,
-      //   classDate: this.maskForm.date,
-      //   groupType: 'PRACTICE'
-      // };
-      // resetCourse(obj).then(res => {
-      //   if (res.code == 200) {
-      //     this.$message.success("修改成功");
-      //     this.courseVisible = false;
-      //     this.getList();
-      //   }
-      // });
     },
     resetClass(row) {
       /**
@@ -1182,11 +1181,15 @@ export default {
           // if (self.leftForm.courseStart) {
           // let date = new Date(self.leftForm.courseStart.replace(/-/, "/"));
           // coursesExpireDate
-          let date = new Date(this.coursesExpireDate.replace(/-/, "/"));
-
+          let dayjs = this.$helpers.dayjs;
+          let nowDate =   dayjs(new Date()).valueOf()
+          let coursesStartDate = dayjs(this.expireForm.coursesStartDate).valueOf()
+          let coursesExpireDate =  dayjs(this.expireForm.coursesExpireDate).valueOf()
+         let startTime =
+          coursesStartDate - nowDate >0?coursesStartDate:nowDate
           return (
-            time.getTime() > date.getTime() ||
-            time.getTime() + 86400000 <= new Date().getTime()
+            time.getTime() <startTime||
+            time.getTime()>coursesExpireDate
           );
           // }
           // return;