节假日日期校验

i18n/locale/zh-CN.js

@@ -752,8 +752,8 @@ export default {
         holidayId: "节假日编号",
         holidayName: "节假日名称",
         holidayTimeslot: "节假日时间段",
-        holidayStart: "节假日开始时间",
-        holidayEnd: "节假日结束时间",
+        holidayStart: "节假日开始日期",
+        holidayEnd: "节假日结束日期",
         creationTime: "创建时间",
         creatorUserId: '创建人',
         id: '',

pages/basicData/calendar/holiday/add.vue

@@ -3,12 +3,12 @@
     <Row>
       <Col :span="24">
         <FormItem :label="l('holidayId')" prop="holidayId">
-          <Input v-model="entity.holidayId" style="width: 90%"></Input>
+          <Input v-model="entity.holidayId" placeholder="请填写节假日编号" style="width: 90%"></Input>
         </FormItem>
       </Col>
       <Col :span="24">
         <FormItem :label="l('holidayName')" prop="holidayName">
-          <Input v-model="entity.holidayName" style="width: 90%"></Input>
+          <Input v-model="entity.holidayName" placeholder="请填写节假日名称" style="width: 90%"></Input>
         </FormItem>
       </Col>
       <!-- <Col :span="24">
@@ -24,12 +24,12 @@
       </Col> -->
       <Col :span="24">
         <FormItem :label="l('holidayStart')" prop="holidayStart">
-          <DatePicker type="date" v-model="entity.holidayStart"></DatePicker>
+          <DatePicker type="date" placeholder="请选择开始日期" v-model="entity.holidayStart"></DatePicker>
         </FormItem>
       </Col>
       <Col :span="24">
         <FormItem :label="l('holidayEnd')" prop="holidayEnd">
-          <DatePicker type="date" v-model="entity.holidayEnd"></DatePicker>
+          <DatePicker type="date" placeholder="请选择结束日期" v-model="entity.holidayEnd"></DatePicker>
         </FormItem>
       </Col>
     </Row>
@@ -90,13 +90,13 @@ export default {
       this.$refs.form.validate(v => {
         if (v) {
           this.disabled = true;
-          var data = this.$u.clone(this.entity)
-          // let startime = this.entity.holidayTimeslot[0]
-          // let endtime = this.entity.holidayTimeslot[1]
-          // console.log(startime)
-          // console.log(endtime)
-          // data.holidayStart = startime.slice(0,10)
-          // data.holidayEnd = endtime.slice(0,10)
+          let startime = this.entity.holidayStart
+          let endtime = this.entity.holidayEnd
+          if(startime.getTime() > endtime.getTime()){
+                alert("结束时间不能大于开始时间！");
+                this.disabled = false;
+                return;
+          }else{
           Api.create(this.entity)
             .then(r => {
               this.disabled = false;
@@ -112,6 +112,7 @@ export default {
               this.$Message.error("保存失败");
               console.warn(err);
             });
+          }
         }
       });
     },

pages/basicData/calendar/holiday/edit.vue

@@ -39,6 +39,18 @@ export default {
       rules: {
         holidayId: [{ required: true, message: '请填写节假日编号', trigger: 'blur' }],
         holidayName: [{ required: true, message: '请填写节假日名称', trigger: 'blur' }],
+        holidayStart: [{
+          required: true,
+          type: "date",
+          message: "请选择开始时间",
+          trigger: "change"
+        }],
+        holidayEnd: [{
+          required: true,
+          type: "date",
+          message: "请选择结束时间",
+          trigger: "change"
+        }],
       }
     }
   },
@@ -56,6 +68,13 @@ export default {
       this.$refs.form.validate((v) => {
         if (v) {
           this.disabled = true
+          let startime = this.entity.holidayStart
+          let endtime = this.entity.holidayEnd
+          if(startime.getTime() > endtime.getTime()){
+                alert("结束时间不能大于开始时间！");
+                this.disabled = false;
+                return;
+          }else{
           Api.update(this.entity)
             .then((r) => {
               this.disabled = false
@@ -71,6 +90,7 @@ export default {
               this.$Message.error('保存失败')
               console.warn(err)
             })
+          }
         }
       })
     },