Browse Source

提交测试

1
mo 4 years ago
parent
commit
d1741ef634
1 changed files with 20 additions and 13 deletions
  1. 20 13
      src/views/accompanyManager/accompanys.vue

+ 20 - 13
src/views/accompanyManager/accompanys.vue

@@ -569,7 +569,10 @@
     </el-dialog>
     </el-dialog>
 
 
     <el-dialog title="点名表" width="700px" :visible.sync="rollCall.status">
     <el-dialog title="点名表" width="700px" :visible.sync="rollCall.status">
-      <el-table :data="rollCall.gridData">
+      <el-table
+        :data="rollCall.gridData"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+      >
         <el-table-column
         <el-table-column
           align="center"
           align="center"
           property="userName"
           property="userName"
@@ -930,9 +933,9 @@ export default {
       return {
       return {
         firstDayOfWeek: 1,
         firstDayOfWeek: 1,
         disabledDate(time) {
         disabledDate(time) {
-          if (self.expireForm.tempCoursesExpireDate) {
+          if (self.tableList[self.tableList.length -1].classDate) {
             return (
             return (
-              new Date(self.expireForm.tempCoursesExpireDate).getTime() >
+              new Date(self.tableList[self.tableList.length -1].classDate).getTime() >=
               time.getTime()
               time.getTime()
             );
             );
           } else {
           } else {
@@ -942,22 +945,19 @@ export default {
         },
         },
       };
       };
     },
     },
-    startBigin(){
+    startBigin() {
       let timer;
       let timer;
-        if(this.tableList[0]?.classDate){
-           timer = this.tableList[0]?.classDate
-        }
+      if (this.tableList[0]?.classDate) {
+        timer = this.tableList[0]?.classDate;
+      }
       return {
       return {
         firstDayOfWeek: 1,
         firstDayOfWeek: 1,
         disabledDate(time) {
         disabledDate(time) {
           // 该时间不可调整到课程组第一节课程开始时间之后
           // 该时间不可调整到课程组第一节课程开始时间之后
           if (timer) {
           if (timer) {
-            return (
-              new Date(timer).getTime() <
-              time.getTime()
-            );
+            return new Date(timer).getTime() < time.getTime();
           } else {
           } else {
-            return time.getTime() >= Date.now()
+            return time.getTime() >= Date.now();
             //开始时间不选时,结束时间最大值小于等于当天
             //开始时间不选时,结束时间最大值小于等于当天
           }
           }
         },
         },
@@ -974,8 +974,15 @@ export default {
             if (res.code == 200) {
             if (res.code == 200) {
               this.$message.success("有效期修改成功");
               this.$message.success("有效期修改成功");
               this.$router.push({
               this.$router.push({
-                query: merge(this.$route.query, { coursesStartDate: this.expireForm.coursesStartDate,coursesExpireDate:this.expireForm.coursesExpireDate }),
+                query: merge(this.$route.query, {
+                  coursesStartDate: this.expireForm.coursesStartDate,
+                  coursesExpireDate: this.expireForm.coursesExpireDate,
+                }),
               });
               });
+              this.timers =
+                this.expireForm.coursesStartDate+
+                "至" +
+                this.expireForm.coursesExpireDate;
               this.expireVisible = false;
               this.expireVisible = false;
               this.getCourseGroup();
               this.getCourseGroup();
               this.getList();
               this.getList();