diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 70c4173..64e5640 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -267,6 +267,16 @@
     add() {
       this.resetForm()
       this.addShow = true
+      if(this.remarksTypeList.length === 1){
+        this.remarksForm.remarksType = this.remarksTypeList[0].id
+      } else {
+        for(var i=0; i<this.remarksTypeList.length;i++){
+          if(this.remarksTypeList[i].name === '旷工一天'){
+            this.remarksForm.remarksType = '5'
+            break
+          }
+        }
+      }
     },
     // 保存数据
     saveData: function() {

diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 70c4173..64e5640 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -267,6 +267,16 @@
     add() {
       this.resetForm()
       this.addShow = true
+      if(this.remarksTypeList.length === 1){
+        this.remarksForm.remarksType = this.remarksTypeList[0].id
+      } else {
+        for(var i=0; i<this.remarksTypeList.length;i++){
+          if(this.remarksTypeList[i].name === '旷工一天'){
+            this.remarksForm.remarksType = '5'
+            break
+          }
+        }
+      }
     },
     // 保存数据
     saveData: function() {
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 7a0baae..08e357c 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -15,6 +15,22 @@
                 value-format="yyyy-MM"
                 placeholder="必填"/>
             </el-form-item>
+            <el-form-item label="开始日期" prop="beginDate">
+              <el-date-picker
+                v-model="form.beginDate"
+                :picker-options="beginDateOptions"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="开始日期"/>
+            </el-form-item>
+            <el-form-item label="结束日期" prop="endDate">
+              <el-date-picker
+                v-model="form.endDate"
+                :picker-options="endDateOptions"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="开始日期"/>
+            </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-button type="primary" size="medium" style="width: 180px" @click="makeReport">生成报表</el-button>
@@ -32,12 +48,43 @@
 export default {
   name: 'MakeReport',
   data() {
+    const validateMonth = (value, callback) => {
+      if (this.form.beginDate === '' && this.form.endDate ==  '' && value === '') {
+        if (reg.test(value)) {
+          callback(new Error('请选择考勤月或起止日期'))
+        }
+      } else {
+        callback()
+      }
+    }
+    const validateBeginDate = (value, callback) => {
+      if (this.form.beginDate === '' && this.form.endDate ==  '' && value === '') {
+        if (reg.test(value)) {
+          callback(new Error('请选择考勤月或起止日期'))
+        }
+      } else {
+        callback()
+      }
+    }
+    const validateEndDate = (value, callback) => {
+      if (this.form.beginDate === '' && this.form.endDate ==  '' && value === '') {
+        if (reg.test(value)) {
+          callback(new Error('请选择考勤月或起止日期'))
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       form: {
-        month: ''
+        month: '',
+        beginDate: '',
+        endDate: ''
       },
       rules: {
-        month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+        month: [{ validator: 'validateMonth', trigger: ['blur', 'change'] }],
+        beginDate: [{ validator: 'validateBeginDate', trigger: ['blur', 'change'] }],
+        endDate: [{ validator: 'validateEndDate', trigger: ['blur', 'change'] }]
       },
       pickerOptions: {
         disabledDate: (time) => {