lex 2 år sedan
förälder
incheckning
6e31de5875

+ 36 - 3
src/views/levelManager/model/grade-operation.vue

@@ -59,6 +59,7 @@
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="请选择考级开始日期"
+          :picker-options="startBigin()"
         ></el-date-picker>
       </el-form-item>
       <el-form-item
@@ -71,6 +72,12 @@
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="请选择考级结束日期"
+          :picker-options="beginDate()"
+          @change="
+            () => {
+              forms.endTime = null;
+            }
+          "
         ></el-date-picker>
       </el-form-item>
       <el-form-item
@@ -95,6 +102,7 @@
 <script>
 import { getTimes } from "@/utils";
 import { degreeSave, degreeUpdate } from "../levelManageApi";
+import dayjs from "dayjs";
 export default {
   name: "grade-operation",
   data() {
@@ -115,6 +123,29 @@ export default {
     this.$store.dispatch("setBranchs");
   },
   methods: {
+    startBigin() {
+      let timer = dayjs().format("YYYY-MM-DD");
+      return {
+        firstDayOfWeek: 1,
+        disabledDate(time) {
+          return dayjs(timer).valueOf() > dayjs(time).valueOf();
+        }
+      };
+    },
+    beginDate() {
+      const startTime = this.forms.startTime;
+      return {
+        firstDayOfWeek: 1,
+        disabledDate(time) {
+          if (startTime) {
+            return (
+              new Date(startTime).getTime() >=
+              time.getTime() + 24 * 60 * 60 * 1000
+            );
+          }
+        }
+      };
+    },
     onClose() {
       this.$refs.elForm && this.$refs.elForm.resetFields();
       this.operationVisible = false;
@@ -126,7 +157,7 @@ export default {
 
         const forms = this.forms;
         const params = {
-          name: forms.name,
+          ...forms,
           organIds: forms.organIds ? forms.organIds.join(",") : ""
         };
 
@@ -150,10 +181,12 @@ export default {
         this.forms = {
           id: row.id,
           name: row.name,
-          organIds: row.organIds ? row.organIds.split(",") : [],
+          organIds: row.organIds
+            ? row.organIds.split(",").map(value => Number(value))
+            : [],
           startTime: row.startTime,
           endTime: row.endTime,
-          registrationTime: row.registerationsTime
+          registrationTime: row.registrationTime
         };
       }
       this.operationVisible = true;

+ 4 - 1
src/views/levelManager/model/information-operation.vue

@@ -183,8 +183,11 @@ export default {
         this.forms.coverImage = row.coverImage;
         this.status = row.status;
         this.forms.id = row.id;
-        this.organIds = row.organIds ? row.organIds.split(",") : [];
+        this.forms.organIds = row.organIds
+          ? row.organIds.split(",").map(value => Number(value))
+          : [];
       }
+      console.log(this.forms, "this.forms");
       this.operationVisible = true;
     }
   }