diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 08e357c..9c4b9d3 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!--查询结果Table显示-->
     <div>
-      <el-divider content-position="left" >请选择考勤月</el-divider>
+      <el-divider content-position="left" >请选择生成报表的考勤月或起止日期</el-divider>
       <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
         <el-row style="margin-top: 60px">
           <el-col :span="8">
@@ -13,8 +13,10 @@
                 type="month"
                 format="yyyy-MM"
                 value-format="yyyy-MM"
-                placeholder="必填"/>
+                placeholder="考勤月"/>
             </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="开始日期" prop="beginDate">
               <el-date-picker
                 v-model="form.beginDate"
@@ -23,16 +25,20 @@
                 value-format="yyyy-MM-dd"
                 placeholder="开始日期"/>
             </el-form-item>
-            <el-form-item label="结束日期" prop="endDate">
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="- 截止日期" prop="endDate">
               <el-date-picker
                 v-model="form.endDate"
                 :picker-options="endDateOptions"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="开始日期"/>
+                placeholder="截止日期"/>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+        </el-row>
+        <el-row style="margin-top: 20px;">
+          <el-col :offset="17" :span="5">
             <el-button type="primary" size="medium" style="width: 180px" @click="makeReport">生成报表</el-button>
           </el-col>
         </el-row>
@@ -48,43 +54,58 @@
 export default {
   name: 'MakeReport',
   data() {
-    const validateMonth = (value, callback) => {
+    const validateMonth = (rule, value, callback) => {
       if (this.form.beginDate === '' && this.form.endDate ==  '' && value === '') {
-        if (reg.test(value)) {
           callback(new Error('请选择考勤月或起止日期'))
-        }
       } else {
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
         callback()
       }
     }
-    const validateBeginDate = (value, callback) => {
-      if (this.form.beginDate === '' && this.form.endDate ==  '' && value === '') {
-        if (reg.test(value)) {
-          callback(new Error('请选择考勤月或起止日期'))
-        }
+    const validateBeginDate = (rule, value, callback) => {
+      if (this.form.month === '' && this.form.endDate ==  '' && value === '') {
+        callback(new Error('请选择考勤月或起止日期'))
       } else {
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
         callback()
       }
     }
-    const validateEndDate = (value, callback) => {
-      if (this.form.beginDate === '' && this.form.endDate ==  '' && value === '') {
-        if (reg.test(value)) {
+    const validateEndDate = (rule, value, callback) => {
+      if (this.form.beginDate === '' && this.form.month ==  '' && value === '') {
           callback(new Error('请选择考勤月或起止日期'))
-        }
       } else {
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
         callback()
       }
     }
     return {
+      beginDateOptions: {
+        disabledDate: (time) => {
+          if( this.form.endDate !== '' ) return time.getTime() > this.form.endDate
+          else return false
+        }
+      },
+      endDateOptions: {
+        disabledDate: (time) => {
+          if( this.form.beginDate !== '' ) return (time.getTime() < this.form.beginDate || time.getTime() > Date.now())
+          else return time.getTime() > Date.now()
+        }
+      },
       form: {
         month: '',
         beginDate: '',
         endDate: ''
       },
       rules: {
-        month: [{ validator: 'validateMonth', trigger: ['blur', 'change'] }],
-        beginDate: [{ validator: 'validateBeginDate', trigger: ['blur', 'change'] }],
-        endDate: [{ validator: 'validateEndDate', trigger: ['blur', 'change'] }]
+        month: [{ validator: validateMonth, trigger: ['blur', 'change'] }],
+        beginDate: [{ validator: validateBeginDate, trigger: ['blur', 'change'] }],
+        endDate: [{ validator: validateEndDate, trigger: ['blur', 'change'] }]
       },
       pickerOptions: {
         disabledDate: (time) => {