diff --git a/src/api/attendance.js b/src/api/attendance.js
index 627de43..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -142,3 +142,21 @@
   })
 }
 
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+

diff --git a/src/api/attendance.js b/src/api/attendance.js
index 627de43..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -142,3 +142,21 @@
   })
 }
 
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index bb73a0e..3965d01 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div v-if="showPage" class="app-container">
     <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" label-width="180px">
       <el-divider content-position="left">工作日设置</el-divider>
       <el-row>
@@ -68,18 +68,18 @@
       <el-row>
         <el-col :span="6" :offset="2" style="margin-top: 5px;">
           <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
           <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin2" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
@@ -97,7 +97,47 @@
 export default {
   name: 'AtdRules',
   data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
     return {
+      showPage: false,
       weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
       // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
       atdRulesForm: {
@@ -117,8 +157,8 @@
         workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
         breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
         breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
-        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
-        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+        delayBegin1: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
       }
     }
   },
@@ -154,6 +194,7 @@
           this.atdRulesForm.delayBegin1 = response.data.delayBegin1
           this.atdRulesForm.delayBegin2 = response.data.delayBegin2
         }
+        this.showPage = true
       })
     },
     // 放弃修改

diff --git a/src/api/attendance.js b/src/api/attendance.js
index 627de43..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -142,3 +142,21 @@
   })
 }
 
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index bb73a0e..3965d01 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div v-if="showPage" class="app-container">
     <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" label-width="180px">
       <el-divider content-position="left">工作日设置</el-divider>
       <el-row>
@@ -68,18 +68,18 @@
       <el-row>
         <el-col :span="6" :offset="2" style="margin-top: 5px;">
           <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
           <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin2" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
@@ -97,7 +97,47 @@
 export default {
   name: 'AtdRules',
   data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
     return {
+      showPage: false,
       weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
       // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
       atdRulesForm: {
@@ -117,8 +157,8 @@
         workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
         breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
         breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
-        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
-        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+        delayBegin1: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
       }
     }
   },
@@ -154,6 +194,7 @@
           this.atdRulesForm.delayBegin1 = response.data.delayBegin1
           this.atdRulesForm.delayBegin2 = response.data.delayBegin2
         }
+        this.showPage = true
       })
     },
     // 放弃修改
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 69f7ae6..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -6,7 +6,7 @@
         <el-row class="table-title">
           <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
           <el-col :span="12" :offset="6" class="edit_btns">
-            <el-button :disabled="remarksTypeList.length === 0" class="edit_btn" size="small" @click="add">添加备注</el-button>
+            <el-button :disabled="remarksTypeList.length === 0 || listLoading" class="edit_btn" size="small" @click="add">添加备注</el-button>
           </el-col>
         </el-row>
         <el-table v-loading="listLoading" :data="list" class="table" border>
@@ -47,7 +47,7 @@
                   v-model="remarksForm.beginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -57,7 +57,7 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -76,13 +76,13 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="默认截止日期为1年后"/>
+                  value-format="yyyy-MM-dd"
+                  placeholder="默认截止日期为一年后"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" label="其他原因" prop="other">
-            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入‘其他原因’" show-word-limit/>
           </el-form-item>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" prop="onBusiness">
             <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
@@ -90,7 +90,7 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -115,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -190,7 +189,6 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
@@ -199,13 +197,17 @@
   methods: {
     closeDialog() {
       this.list = []
-      this.$parent.fetchData(false)
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
     },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     initDialog: function(title = null, dialogFormVisible, row) {
@@ -229,7 +231,9 @@
       this.remarksForm.breastfeedBeginDate = ''
       this.remarksForm.other = ''
       this.remarksForm.onBusiness = ''
-
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -247,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,17 +259,30 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           debugger
-          console.log(this.remarksForm.personId)
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
             if (response.code === 200) {
               this.fetchData()
               this.fetchRemarksType()
               this.addShow = false
               this.$message.success('添加成功！')
-              // this.$parent.fetchData(false)
+              this.edited = true
             }
+            this.saveBtnDisabeld = false
           }).catch(err => {
             console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
@@ -292,6 +306,7 @@
             this.$message.success('删除成功')
             this.fetchData()
             this.fetchRemarksType()
+            this.edited = true
           }
         })
       })
@@ -305,6 +320,7 @@
         if (response.code === 200) {
           this.list = response.data
         }
+        this.listLoading = false
       })
     },
     // 获取可添加的备注类型列表

diff --git a/src/api/attendance.js b/src/api/attendance.js
index 627de43..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -142,3 +142,21 @@
   })
 }
 
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index bb73a0e..3965d01 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div v-if="showPage" class="app-container">
     <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" label-width="180px">
       <el-divider content-position="left">工作日设置</el-divider>
       <el-row>
@@ -68,18 +68,18 @@
       <el-row>
         <el-col :span="6" :offset="2" style="margin-top: 5px;">
           <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
           <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin2" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
@@ -97,7 +97,47 @@
 export default {
   name: 'AtdRules',
   data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
     return {
+      showPage: false,
       weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
       // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
       atdRulesForm: {
@@ -117,8 +157,8 @@
         workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
         breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
         breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
-        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
-        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+        delayBegin1: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
       }
     }
   },
@@ -154,6 +194,7 @@
           this.atdRulesForm.delayBegin1 = response.data.delayBegin1
           this.atdRulesForm.delayBegin2 = response.data.delayBegin2
         }
+        this.showPage = true
       })
     },
     // 放弃修改
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 69f7ae6..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -6,7 +6,7 @@
         <el-row class="table-title">
           <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
           <el-col :span="12" :offset="6" class="edit_btns">
-            <el-button :disabled="remarksTypeList.length === 0" class="edit_btn" size="small" @click="add">添加备注</el-button>
+            <el-button :disabled="remarksTypeList.length === 0 || listLoading" class="edit_btn" size="small" @click="add">添加备注</el-button>
           </el-col>
         </el-row>
         <el-table v-loading="listLoading" :data="list" class="table" border>
@@ -47,7 +47,7 @@
                   v-model="remarksForm.beginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -57,7 +57,7 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -76,13 +76,13 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="默认截止日期为1年后"/>
+                  value-format="yyyy-MM-dd"
+                  placeholder="默认截止日期为一年后"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" label="其他原因" prop="other">
-            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入‘其他原因’" show-word-limit/>
           </el-form-item>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" prop="onBusiness">
             <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
@@ -90,7 +90,7 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -115,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -190,7 +189,6 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
@@ -199,13 +197,17 @@
   methods: {
     closeDialog() {
       this.list = []
-      this.$parent.fetchData(false)
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
     },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     initDialog: function(title = null, dialogFormVisible, row) {
@@ -229,7 +231,9 @@
       this.remarksForm.breastfeedBeginDate = ''
       this.remarksForm.other = ''
       this.remarksForm.onBusiness = ''
-
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -247,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,17 +259,30 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           debugger
-          console.log(this.remarksForm.personId)
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
             if (response.code === 200) {
               this.fetchData()
               this.fetchRemarksType()
               this.addShow = false
               this.$message.success('添加成功！')
-              // this.$parent.fetchData(false)
+              this.edited = true
             }
+            this.saveBtnDisabeld = false
           }).catch(err => {
             console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
@@ -292,6 +306,7 @@
             this.$message.success('删除成功')
             this.fetchData()
             this.fetchRemarksType()
+            this.edited = true
           }
         })
       })
@@ -305,6 +320,7 @@
         if (response.code === 200) {
           this.list = response.data
         }
+        this.listLoading = false
       })
     },
     // 获取可添加的备注类型列表
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index af7d432..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -22,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -30,7 +30,7 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               style="width: 160px"
               placeholder="日期"/>
           </el-form-item>
@@ -83,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
 import EditRemarks from './editRemarks'
+import SyncAndGenerate from './syncAndGenerate'
 import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
 import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -125,7 +127,7 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
           width: 180,
           align: 'center'
@@ -199,33 +201,8 @@
       this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
     },
     syn() {
-    },
-    // 删除人员
-    del() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选访客吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          // delPerson(staffIds).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('删除成功')
-          //     this.fetchData()
-          //   }
-          // })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     batchExport() {
@@ -253,6 +230,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      console.log(this.listQuery.date)
       getReportList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)

diff --git a/src/api/attendance.js b/src/api/attendance.js
index 627de43..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -142,3 +142,21 @@
   })
 }
 
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index bb73a0e..3965d01 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div v-if="showPage" class="app-container">
     <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" label-width="180px">
       <el-divider content-position="left">工作日设置</el-divider>
       <el-row>
@@ -68,18 +68,18 @@
       <el-row>
         <el-col :span="6" :offset="2" style="margin-top: 5px;">
           <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
           <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin2" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
@@ -97,7 +97,47 @@
 export default {
   name: 'AtdRules',
   data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
     return {
+      showPage: false,
       weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
       // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
       atdRulesForm: {
@@ -117,8 +157,8 @@
         workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
         breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
         breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
-        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
-        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+        delayBegin1: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
       }
     }
   },
@@ -154,6 +194,7 @@
           this.atdRulesForm.delayBegin1 = response.data.delayBegin1
           this.atdRulesForm.delayBegin2 = response.data.delayBegin2
         }
+        this.showPage = true
       })
     },
     // 放弃修改
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 69f7ae6..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -6,7 +6,7 @@
         <el-row class="table-title">
           <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
           <el-col :span="12" :offset="6" class="edit_btns">
-            <el-button :disabled="remarksTypeList.length === 0" class="edit_btn" size="small" @click="add">添加备注</el-button>
+            <el-button :disabled="remarksTypeList.length === 0 || listLoading" class="edit_btn" size="small" @click="add">添加备注</el-button>
           </el-col>
         </el-row>
         <el-table v-loading="listLoading" :data="list" class="table" border>
@@ -47,7 +47,7 @@
                   v-model="remarksForm.beginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -57,7 +57,7 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -76,13 +76,13 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="默认截止日期为1年后"/>
+                  value-format="yyyy-MM-dd"
+                  placeholder="默认截止日期为一年后"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" label="其他原因" prop="other">
-            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入‘其他原因’" show-word-limit/>
           </el-form-item>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" prop="onBusiness">
             <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
@@ -90,7 +90,7 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -115,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -190,7 +189,6 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
@@ -199,13 +197,17 @@
   methods: {
     closeDialog() {
       this.list = []
-      this.$parent.fetchData(false)
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
     },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     initDialog: function(title = null, dialogFormVisible, row) {
@@ -229,7 +231,9 @@
       this.remarksForm.breastfeedBeginDate = ''
       this.remarksForm.other = ''
       this.remarksForm.onBusiness = ''
-
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -247,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,17 +259,30 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           debugger
-          console.log(this.remarksForm.personId)
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
             if (response.code === 200) {
               this.fetchData()
               this.fetchRemarksType()
               this.addShow = false
               this.$message.success('添加成功！')
-              // this.$parent.fetchData(false)
+              this.edited = true
             }
+            this.saveBtnDisabeld = false
           }).catch(err => {
             console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
@@ -292,6 +306,7 @@
             this.$message.success('删除成功')
             this.fetchData()
             this.fetchRemarksType()
+            this.edited = true
           }
         })
       })
@@ -305,6 +320,7 @@
         if (response.code === 200) {
           this.list = response.data
         }
+        this.listLoading = false
       })
     },
     // 获取可添加的备注类型列表
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index af7d432..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -22,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -30,7 +30,7 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               style="width: 160px"
               placeholder="日期"/>
           </el-form-item>
@@ -83,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
 import EditRemarks from './editRemarks'
+import SyncAndGenerate from './syncAndGenerate'
 import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
 import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -125,7 +127,7 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
           width: 180,
           align: 'center'
@@ -199,33 +201,8 @@
       this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
     },
     syn() {
-    },
-    // 删除人员
-    del() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选访客吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          // delPerson(staffIds).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('删除成功')
-          //     this.fetchData()
-          //   }
-          // })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     batchExport() {
@@ -253,6 +230,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      console.log(this.listQuery.date)
       getReportList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 49e2c29..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,6 +9,7 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
                 value-format="yyyy-MM"
@@ -37,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },

diff --git a/src/api/attendance.js b/src/api/attendance.js
index 627de43..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -142,3 +142,21 @@
   })
 }
 
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index bb73a0e..3965d01 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div v-if="showPage" class="app-container">
     <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" label-width="180px">
       <el-divider content-position="left">工作日设置</el-divider>
       <el-row>
@@ -68,18 +68,18 @@
       <el-row>
         <el-col :span="6" :offset="2" style="margin-top: 5px;">
           <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
           <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin2" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
@@ -97,7 +97,47 @@
 export default {
   name: 'AtdRules',
   data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
     return {
+      showPage: false,
       weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
       // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
       atdRulesForm: {
@@ -117,8 +157,8 @@
         workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
         breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
         breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
-        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
-        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+        delayBegin1: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
       }
     }
   },
@@ -154,6 +194,7 @@
           this.atdRulesForm.delayBegin1 = response.data.delayBegin1
           this.atdRulesForm.delayBegin2 = response.data.delayBegin2
         }
+        this.showPage = true
       })
     },
     // 放弃修改
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 69f7ae6..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -6,7 +6,7 @@
         <el-row class="table-title">
           <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
           <el-col :span="12" :offset="6" class="edit_btns">
-            <el-button :disabled="remarksTypeList.length === 0" class="edit_btn" size="small" @click="add">添加备注</el-button>
+            <el-button :disabled="remarksTypeList.length === 0 || listLoading" class="edit_btn" size="small" @click="add">添加备注</el-button>
           </el-col>
         </el-row>
         <el-table v-loading="listLoading" :data="list" class="table" border>
@@ -47,7 +47,7 @@
                   v-model="remarksForm.beginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -57,7 +57,7 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -76,13 +76,13 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="默认截止日期为1年后"/>
+                  value-format="yyyy-MM-dd"
+                  placeholder="默认截止日期为一年后"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" label="其他原因" prop="other">
-            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入‘其他原因’" show-word-limit/>
           </el-form-item>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" prop="onBusiness">
             <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
@@ -90,7 +90,7 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -115,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -190,7 +189,6 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
@@ -199,13 +197,17 @@
   methods: {
     closeDialog() {
       this.list = []
-      this.$parent.fetchData(false)
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
     },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     initDialog: function(title = null, dialogFormVisible, row) {
@@ -229,7 +231,9 @@
       this.remarksForm.breastfeedBeginDate = ''
       this.remarksForm.other = ''
       this.remarksForm.onBusiness = ''
-
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -247,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,17 +259,30 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           debugger
-          console.log(this.remarksForm.personId)
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
             if (response.code === 200) {
               this.fetchData()
               this.fetchRemarksType()
               this.addShow = false
               this.$message.success('添加成功！')
-              // this.$parent.fetchData(false)
+              this.edited = true
             }
+            this.saveBtnDisabeld = false
           }).catch(err => {
             console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
@@ -292,6 +306,7 @@
             this.$message.success('删除成功')
             this.fetchData()
             this.fetchRemarksType()
+            this.edited = true
           }
         })
       })
@@ -305,6 +320,7 @@
         if (response.code === 200) {
           this.list = response.data
         }
+        this.listLoading = false
       })
     },
     // 获取可添加的备注类型列表
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index af7d432..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -22,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -30,7 +30,7 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               style="width: 160px"
               placeholder="日期"/>
           </el-form-item>
@@ -83,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
 import EditRemarks from './editRemarks'
+import SyncAndGenerate from './syncAndGenerate'
 import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
 import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -125,7 +127,7 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
           width: 180,
           align: 'center'
@@ -199,33 +201,8 @@
       this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
     },
     syn() {
-    },
-    // 删除人员
-    del() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选访客吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          // delPerson(staffIds).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('删除成功')
-          //     this.fetchData()
-          //   }
-          // })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     batchExport() {
@@ -253,6 +230,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      console.log(this.listQuery.date)
       getReportList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 49e2c29..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,6 +9,7 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
                 value-format="yyyy-MM"
@@ -37,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },
diff --git a/src/views/attendance/syncAndGenerate.vue b/src/views/attendance/syncAndGenerate.vue
new file mode 100644
index 0000000..8e5a7a8
--- /dev/null
+++ b/src/views/attendance/syncAndGenerate.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="重新获取识别记录" append-to-body>
+    <div class="block data-pick">
+      <el-row>
+        <p>选择起止日期</p>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="left"
+        />
+      </el-row>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { syncAndGenerate } from '@/api/attendance'
+import * as moment from 'moment'
+export default {
+  name: 'SyncAndGenerate',
+  data() {
+    return {
+      loading: false,
+      dialogFormVisible: false, // 对话框是否显示
+      beginDate: '',
+      form: {
+        beginDate: '',
+        endDate: ''
+      },
+      dateRange: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '昨天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(1, 'days')
+            // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(3, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一周',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(7, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }],
+        onPick: (time) => {
+          if (!time.maxDate) {
+            this.beginDate = time.minDate
+          }
+        },
+        disabledDate: (time) => {
+          const v = 24 * 60 * 60 * 1000
+          if (this.beginDate) {
+            if (time.getTime() < this.beginDate.getTime()) {
+              return time.getTime() < (this.beginDate.getTime() - (v * 7))
+            } else {
+              return time.getTime() > (((this.beginDate.getTime() + (v * 7)) > (Date.now() - v) ? (Date.now() - v) : this.beginDate.getTime() + (v * 7)))
+            }
+          }
+          return time.getTime() > Date.now() - v
+        }
+      }
+    }
+  },
+  watch: {
+    dateRange(val) {
+      if (val && val.length > 0) {
+        if (typeof val[0] !== 'string') {
+          val[0] = val[0].format('YYYY-MM-DD')
+        }
+        if (typeof val[1] !== 'string') {
+          val[1] = val[1].format('YYYY-MM-DD')
+        }
+        this.form.beginDate = val[0]
+        this.form.endDate = val[1]
+      } else {
+        this.form.beginDate = ''
+        this.form.endDate = ''
+        this.beginDate = ''
+      }
+    }
+  },
+  methods: {
+    initDialog(dialogFormVisible) {
+      this.dialogFormVisible = dialogFormVisible
+      this.dateRange = []
+    },
+    saveData() {
+      this.loading = true
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '数据处理中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      syncAndGenerate(this.form).then(res => {
+        console.log(res)
+        if (res.code === 200) {
+          this.loading = false
+          this.$message.success('获取成功')
+          this.dialogFormVisible = false
+          this.$emit('watchChild')
+        } else {
+          this.loading = false
+          // this.$message.error(res.error)
+        }
+      }).catch((res) => {
+        this.loading = false
+        // this.$message.error(res.error)
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+<style scoped>
+  .demonstration {
+    font-size: 14px;
+    color: #606266;
+  }
+  .data-pick {
+    display: table;
+    margin: 0 auto;
+  }
+</style>
+

diff --git a/src/api/attendance.js b/src/api/attendance.js
index 627de43..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -142,3 +142,21 @@
   })
 }
 
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index bb73a0e..3965d01 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div v-if="showPage" class="app-container">
     <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" label-width="180px">
       <el-divider content-position="left">工作日设置</el-divider>
       <el-row>
@@ -68,18 +68,18 @@
       <el-row>
         <el-col :span="6" :offset="2" style="margin-top: 5px;">
           <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
           <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin2" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
@@ -97,7 +97,47 @@
 export default {
   name: 'AtdRules',
   data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
     return {
+      showPage: false,
       weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
       // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
       atdRulesForm: {
@@ -117,8 +157,8 @@
         workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
         breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
         breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
-        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
-        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+        delayBegin1: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
       }
     }
   },
@@ -154,6 +194,7 @@
           this.atdRulesForm.delayBegin1 = response.data.delayBegin1
           this.atdRulesForm.delayBegin2 = response.data.delayBegin2
         }
+        this.showPage = true
       })
     },
     // 放弃修改
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 69f7ae6..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -6,7 +6,7 @@
         <el-row class="table-title">
           <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
           <el-col :span="12" :offset="6" class="edit_btns">
-            <el-button :disabled="remarksTypeList.length === 0" class="edit_btn" size="small" @click="add">添加备注</el-button>
+            <el-button :disabled="remarksTypeList.length === 0 || listLoading" class="edit_btn" size="small" @click="add">添加备注</el-button>
           </el-col>
         </el-row>
         <el-table v-loading="listLoading" :data="list" class="table" border>
@@ -47,7 +47,7 @@
                   v-model="remarksForm.beginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -57,7 +57,7 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -76,13 +76,13 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="默认截止日期为1年后"/>
+                  value-format="yyyy-MM-dd"
+                  placeholder="默认截止日期为一年后"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" label="其他原因" prop="other">
-            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入‘其他原因’" show-word-limit/>
           </el-form-item>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" prop="onBusiness">
             <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
@@ -90,7 +90,7 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -115,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -190,7 +189,6 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
@@ -199,13 +197,17 @@
   methods: {
     closeDialog() {
       this.list = []
-      this.$parent.fetchData(false)
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
     },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     initDialog: function(title = null, dialogFormVisible, row) {
@@ -229,7 +231,9 @@
       this.remarksForm.breastfeedBeginDate = ''
       this.remarksForm.other = ''
       this.remarksForm.onBusiness = ''
-
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -247,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,17 +259,30 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           debugger
-          console.log(this.remarksForm.personId)
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
             if (response.code === 200) {
               this.fetchData()
               this.fetchRemarksType()
               this.addShow = false
               this.$message.success('添加成功！')
-              // this.$parent.fetchData(false)
+              this.edited = true
             }
+            this.saveBtnDisabeld = false
           }).catch(err => {
             console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
@@ -292,6 +306,7 @@
             this.$message.success('删除成功')
             this.fetchData()
             this.fetchRemarksType()
+            this.edited = true
           }
         })
       })
@@ -305,6 +320,7 @@
         if (response.code === 200) {
           this.list = response.data
         }
+        this.listLoading = false
       })
     },
     // 获取可添加的备注类型列表
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index af7d432..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -22,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -30,7 +30,7 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               style="width: 160px"
               placeholder="日期"/>
           </el-form-item>
@@ -83,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
 import EditRemarks from './editRemarks'
+import SyncAndGenerate from './syncAndGenerate'
 import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
 import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -125,7 +127,7 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
           width: 180,
           align: 'center'
@@ -199,33 +201,8 @@
       this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
     },
     syn() {
-    },
-    // 删除人员
-    del() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选访客吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          // delPerson(staffIds).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('删除成功')
-          //     this.fetchData()
-          //   }
-          // })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     batchExport() {
@@ -253,6 +230,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      console.log(this.listQuery.date)
       getReportList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 49e2c29..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,6 +9,7 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
                 value-format="yyyy-MM"
@@ -37,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },
diff --git a/src/views/attendance/syncAndGenerate.vue b/src/views/attendance/syncAndGenerate.vue
new file mode 100644
index 0000000..8e5a7a8
--- /dev/null
+++ b/src/views/attendance/syncAndGenerate.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="重新获取识别记录" append-to-body>
+    <div class="block data-pick">
+      <el-row>
+        <p>选择起止日期</p>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="left"
+        />
+      </el-row>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { syncAndGenerate } from '@/api/attendance'
+import * as moment from 'moment'
+export default {
+  name: 'SyncAndGenerate',
+  data() {
+    return {
+      loading: false,
+      dialogFormVisible: false, // 对话框是否显示
+      beginDate: '',
+      form: {
+        beginDate: '',
+        endDate: ''
+      },
+      dateRange: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '昨天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(1, 'days')
+            // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(3, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一周',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(7, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }],
+        onPick: (time) => {
+          if (!time.maxDate) {
+            this.beginDate = time.minDate
+          }
+        },
+        disabledDate: (time) => {
+          const v = 24 * 60 * 60 * 1000
+          if (this.beginDate) {
+            if (time.getTime() < this.beginDate.getTime()) {
+              return time.getTime() < (this.beginDate.getTime() - (v * 7))
+            } else {
+              return time.getTime() > (((this.beginDate.getTime() + (v * 7)) > (Date.now() - v) ? (Date.now() - v) : this.beginDate.getTime() + (v * 7)))
+            }
+          }
+          return time.getTime() > Date.now() - v
+        }
+      }
+    }
+  },
+  watch: {
+    dateRange(val) {
+      if (val && val.length > 0) {
+        if (typeof val[0] !== 'string') {
+          val[0] = val[0].format('YYYY-MM-DD')
+        }
+        if (typeof val[1] !== 'string') {
+          val[1] = val[1].format('YYYY-MM-DD')
+        }
+        this.form.beginDate = val[0]
+        this.form.endDate = val[1]
+      } else {
+        this.form.beginDate = ''
+        this.form.endDate = ''
+        this.beginDate = ''
+      }
+    }
+  },
+  methods: {
+    initDialog(dialogFormVisible) {
+      this.dialogFormVisible = dialogFormVisible
+      this.dateRange = []
+    },
+    saveData() {
+      this.loading = true
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '数据处理中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      syncAndGenerate(this.form).then(res => {
+        console.log(res)
+        if (res.code === 200) {
+          this.loading = false
+          this.$message.success('获取成功')
+          this.dialogFormVisible = false
+          this.$emit('watchChild')
+        } else {
+          this.loading = false
+          // this.$message.error(res.error)
+        }
+      }).catch((res) => {
+        this.loading = false
+        // this.$message.error(res.error)
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+<style scoped>
+  .demonstration {
+    font-size: 14px;
+    color: #606266;
+  }
+  .data-pick {
+    display: table;
+    margin: 0 auto;
+  }
+</style>
+
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 3873793..875f90e 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -118,21 +118,21 @@
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="颁证单位" prop="certification">
-                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="备注" prop="remarks">
-                <el-input v-model.trim="personForm.remarks" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.remarks" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -217,7 +217,7 @@
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
@@ -250,7 +250,7 @@
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))

diff --git a/src/api/attendance.js b/src/api/attendance.js
index 627de43..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -142,3 +142,21 @@
   })
 }
 
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index bb73a0e..3965d01 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div v-if="showPage" class="app-container">
     <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" label-width="180px">
       <el-divider content-position="left">工作日设置</el-divider>
       <el-row>
@@ -68,18 +68,18 @@
       <el-row>
         <el-col :span="6" :offset="2" style="margin-top: 5px;">
           <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
           <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin2" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
@@ -97,7 +97,47 @@
 export default {
   name: 'AtdRules',
   data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
     return {
+      showPage: false,
       weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
       // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
       atdRulesForm: {
@@ -117,8 +157,8 @@
         workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
         breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
         breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
-        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
-        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+        delayBegin1: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
       }
     }
   },
@@ -154,6 +194,7 @@
           this.atdRulesForm.delayBegin1 = response.data.delayBegin1
           this.atdRulesForm.delayBegin2 = response.data.delayBegin2
         }
+        this.showPage = true
       })
     },
     // 放弃修改
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 69f7ae6..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -6,7 +6,7 @@
         <el-row class="table-title">
           <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
           <el-col :span="12" :offset="6" class="edit_btns">
-            <el-button :disabled="remarksTypeList.length === 0" class="edit_btn" size="small" @click="add">添加备注</el-button>
+            <el-button :disabled="remarksTypeList.length === 0 || listLoading" class="edit_btn" size="small" @click="add">添加备注</el-button>
           </el-col>
         </el-row>
         <el-table v-loading="listLoading" :data="list" class="table" border>
@@ -47,7 +47,7 @@
                   v-model="remarksForm.beginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -57,7 +57,7 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -76,13 +76,13 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="默认截止日期为1年后"/>
+                  value-format="yyyy-MM-dd"
+                  placeholder="默认截止日期为一年后"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" label="其他原因" prop="other">
-            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入‘其他原因’" show-word-limit/>
           </el-form-item>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" prop="onBusiness">
             <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
@@ -90,7 +90,7 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -115,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -190,7 +189,6 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
@@ -199,13 +197,17 @@
   methods: {
     closeDialog() {
       this.list = []
-      this.$parent.fetchData(false)
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
     },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     initDialog: function(title = null, dialogFormVisible, row) {
@@ -229,7 +231,9 @@
       this.remarksForm.breastfeedBeginDate = ''
       this.remarksForm.other = ''
       this.remarksForm.onBusiness = ''
-
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -247,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,17 +259,30 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           debugger
-          console.log(this.remarksForm.personId)
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
             if (response.code === 200) {
               this.fetchData()
               this.fetchRemarksType()
               this.addShow = false
               this.$message.success('添加成功！')
-              // this.$parent.fetchData(false)
+              this.edited = true
             }
+            this.saveBtnDisabeld = false
           }).catch(err => {
             console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
@@ -292,6 +306,7 @@
             this.$message.success('删除成功')
             this.fetchData()
             this.fetchRemarksType()
+            this.edited = true
           }
         })
       })
@@ -305,6 +320,7 @@
         if (response.code === 200) {
           this.list = response.data
         }
+        this.listLoading = false
       })
     },
     // 获取可添加的备注类型列表
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index af7d432..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -22,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -30,7 +30,7 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               style="width: 160px"
               placeholder="日期"/>
           </el-form-item>
@@ -83,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
 import EditRemarks from './editRemarks'
+import SyncAndGenerate from './syncAndGenerate'
 import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
 import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -125,7 +127,7 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
           width: 180,
           align: 'center'
@@ -199,33 +201,8 @@
       this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
     },
     syn() {
-    },
-    // 删除人员
-    del() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选访客吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          // delPerson(staffIds).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('删除成功')
-          //     this.fetchData()
-          //   }
-          // })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     batchExport() {
@@ -253,6 +230,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      console.log(this.listQuery.date)
       getReportList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 49e2c29..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,6 +9,7 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
                 value-format="yyyy-MM"
@@ -37,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },
diff --git a/src/views/attendance/syncAndGenerate.vue b/src/views/attendance/syncAndGenerate.vue
new file mode 100644
index 0000000..8e5a7a8
--- /dev/null
+++ b/src/views/attendance/syncAndGenerate.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="重新获取识别记录" append-to-body>
+    <div class="block data-pick">
+      <el-row>
+        <p>选择起止日期</p>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="left"
+        />
+      </el-row>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { syncAndGenerate } from '@/api/attendance'
+import * as moment from 'moment'
+export default {
+  name: 'SyncAndGenerate',
+  data() {
+    return {
+      loading: false,
+      dialogFormVisible: false, // 对话框是否显示
+      beginDate: '',
+      form: {
+        beginDate: '',
+        endDate: ''
+      },
+      dateRange: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '昨天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(1, 'days')
+            // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(3, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一周',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(7, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }],
+        onPick: (time) => {
+          if (!time.maxDate) {
+            this.beginDate = time.minDate
+          }
+        },
+        disabledDate: (time) => {
+          const v = 24 * 60 * 60 * 1000
+          if (this.beginDate) {
+            if (time.getTime() < this.beginDate.getTime()) {
+              return time.getTime() < (this.beginDate.getTime() - (v * 7))
+            } else {
+              return time.getTime() > (((this.beginDate.getTime() + (v * 7)) > (Date.now() - v) ? (Date.now() - v) : this.beginDate.getTime() + (v * 7)))
+            }
+          }
+          return time.getTime() > Date.now() - v
+        }
+      }
+    }
+  },
+  watch: {
+    dateRange(val) {
+      if (val && val.length > 0) {
+        if (typeof val[0] !== 'string') {
+          val[0] = val[0].format('YYYY-MM-DD')
+        }
+        if (typeof val[1] !== 'string') {
+          val[1] = val[1].format('YYYY-MM-DD')
+        }
+        this.form.beginDate = val[0]
+        this.form.endDate = val[1]
+      } else {
+        this.form.beginDate = ''
+        this.form.endDate = ''
+        this.beginDate = ''
+      }
+    }
+  },
+  methods: {
+    initDialog(dialogFormVisible) {
+      this.dialogFormVisible = dialogFormVisible
+      this.dateRange = []
+    },
+    saveData() {
+      this.loading = true
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '数据处理中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      syncAndGenerate(this.form).then(res => {
+        console.log(res)
+        if (res.code === 200) {
+          this.loading = false
+          this.$message.success('获取成功')
+          this.dialogFormVisible = false
+          this.$emit('watchChild')
+        } else {
+          this.loading = false
+          // this.$message.error(res.error)
+        }
+      }).catch((res) => {
+        this.loading = false
+        // this.$message.error(res.error)
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+<style scoped>
+  .demonstration {
+    font-size: 14px;
+    color: #606266;
+  }
+  .data-pick {
+    display: table;
+    margin: 0 auto;
+  }
+</style>
+
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 3873793..875f90e 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -118,21 +118,21 @@
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="颁证单位" prop="certification">
-                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="备注" prop="remarks">
-                <el-input v-model.trim="personForm.remarks" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.remarks" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -217,7 +217,7 @@
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
@@ -250,7 +250,7 @@
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 1228fed..e78b02b 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -120,21 +120,21 @@
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="颁证单位" prop="certification">
-                  <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="住址" prop="address">
-                  <el-input v-model.trim="personForm.ext.address" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.ext.address" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="备注" prop="remarks">
-                  <el-input v-model.trim="personForm.remarks" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.remarks" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -228,12 +228,13 @@
           if (!Number(value)) {
             callback(new Error('请输入0-20之间的数字'))
           } else {
-            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+            var min = this.personForm.ext.annualLeave !== '' ? this.personForm.ext.annualLeave : 0
+            if (parseFloat(value) < parseFloat(min) || parseFloat(value) > 20) {
               callback(new Error('请输入0-20之间且不小于剩余年假天数的值'))
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
@@ -260,12 +261,13 @@
           if (!Number(value)) {
             callback(new Error('请输入数字'))
           } else {
-            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+            var max = this.personForm.ext.initAnnualLeave !== '' ? this.personForm.ext.initAnnualLeave : 20
+            if (parseFloat(value) < 0 || parseFloat(value) > parseFloat(max)) {
               callback(new Error('请输入0-20之间且不大于年假天数的值'))
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))

diff --git a/src/api/attendance.js b/src/api/attendance.js
index 627de43..f0df672 100644
--- a/src/api/attendance.js
+++ b/src/api/attendance.js
@@ -142,3 +142,21 @@
   })
 }
 
+export function syncAndGenerate(params) {
+  return request({
+    url: 'sync/syncAndGenerate',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+export function initAnnualLeave() {
+  return request({
+    url: 'report/initAnnualLeave',
+    method: 'get'
+  })
+}
+
diff --git a/src/views/attendance/atdRules.vue b/src/views/attendance/atdRules.vue
index bb73a0e..3965d01 100644
--- a/src/views/attendance/atdRules.vue
+++ b/src/views/attendance/atdRules.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div v-if="showPage" class="app-container">
     <el-form ref="dataForm" :rules="rules" :model="atdRulesForm" label-width="180px">
       <el-divider content-position="left">工作日设置</el-divider>
       <el-row>
@@ -68,18 +68,18 @@
       <el-row>
         <el-col :span="6" :offset="2" style="margin-top: 5px;">
           <el-form-item label="迟到宽容时长（分钟）" prop="delayBegin1">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin1" :max="atdRulesForm.delayBegin2" min="0" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长在此时间范围之内不视为迟到</span></el-col>
+        <el-col :span="8" style="margin-top: 15px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为迟到</span></el-col>
       </el-row>
       <el-row>
         <el-col :span="6" :offset="2">
           <el-form-item label="严重迟到时长（分钟）" prop="delayBegin2">
-            <el-input v-model.number.trim="atdRulesForm.delayBegin2" style="width: 220px" type="number" placeholder="必填"/>
+            <el-input v-model.number.trim="atdRulesForm.delayBegin2" :min="atdRulesForm.delayBegin1" style="width: 220px" type="number" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过此时间范围则将视为旷工</span></el-col>
+        <el-col :span="8" style="margin-top: 12px;margin-left: 100px"><span> 说明：晚到时长超过xx分钟将视为旷工</span></el-col>
       </el-row>
       <el-row>
         <el-col :offset="8" style="margin-top: 20px;">
@@ -97,7 +97,47 @@
 export default {
   name: 'AtdRules',
   data() {
+    const valiDelay1 = (rule, value, callback) => {
+      if (value !== '') {
+        if (parseInt(value) < 0) {
+          callback(new Error('不能小于0'))
+        } else {
+          if (this.atdRulesForm.delayBegin2 !== '' && parseInt(value) > parseInt(this.atdRulesForm.delayBegin2)) {
+            callback(new Error('不能大于严重迟到时长'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('迟到宽容时长不能为空'))
+      }
+    }
+    const valiDelay2 = (rule, value, callback) => {
+      if (value !== '') {
+        if (this.atdRulesForm.delayBegin1 !== '' && parseInt(value) < parseInt(this.atdRulesForm.delayBegin1)) {
+          callback(new Error('不能小于迟到宽容时长'))
+        } else {
+          if (this.atdRulesForm.workTimeBegin !== '' && this.atdRulesForm.breakTimeBegin !== '') {
+            debugger
+            var time1 = new Date('2020-01-01 ' + this.atdRulesForm.workTimeBegin)
+            var time2 = new Date('2020-01-01 ' + this.atdRulesForm.breakTimeBegin)
+            var diff = time2.getTime() - time1.getTime() // 时间差的毫秒数
+            var minutes = Math.floor(diff / (60 * 1000))// 计算相差分钟数
+            if (parseInt(value) > parseInt(minutes)) {
+              callback(new Error('不能大于上午上班时长'))
+            } else {
+              callback()
+            }
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback(new Error('严重迟到时长不能为空'))
+      }
+    }
     return {
+      showPage: false,
       weeks: [{ label: '星期一', value: '1' }, { label: '星期二', value: '2' }, { label: '星期三', value: '3' }, { label: '星期四', value: '4' }, { label: '星期五', value: '5' }, { label: '星期六', value: '6' }, { label: '星期日', value: '7' }],
       // weeks: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
       atdRulesForm: {
@@ -117,8 +157,8 @@
         workTimeEnd: [{ type: 'string', required: true, message: '下班时间必填', trigger: ['blur', 'change'] }],
         breakTimeBegin: [{ required: true, message: '休息开始时间必填', trigger: ['blur', 'change'] }],
         breakTimeEnd: [{ required: true, message: '休息结束时间必填', trigger: ['blur', 'change'] }],
-        delayBegin1: [{ type: 'number', required: true, message: '迟到宽容时长必填', trigger: 'blur' }],
-        delayBegin2: [{ type: 'number', required: true, message: '严重迟到时长必填', trigger: 'blur' }]
+        delayBegin1: [{ validator: valiDelay1, type: 'number', required: true, trigger: 'blur', multiLine: false }],
+        delayBegin2: [{ validator: valiDelay2, type: 'number', required: true, trigger: 'blur' }]
       }
     }
   },
@@ -154,6 +194,7 @@
           this.atdRulesForm.delayBegin1 = response.data.delayBegin1
           this.atdRulesForm.delayBegin2 = response.data.delayBegin2
         }
+        this.showPage = true
       })
     },
     // 放弃修改
diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue
index 69f7ae6..c474ee1 100644
--- a/src/views/attendance/editRemarks.vue
+++ b/src/views/attendance/editRemarks.vue
@@ -6,7 +6,7 @@
         <el-row class="table-title">
           <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
           <el-col :span="12" :offset="6" class="edit_btns">
-            <el-button :disabled="remarksTypeList.length === 0" class="edit_btn" size="small" @click="add">添加备注</el-button>
+            <el-button :disabled="remarksTypeList.length === 0 || listLoading" class="edit_btn" size="small" @click="add">添加备注</el-button>
           </el-col>
         </el-row>
         <el-table v-loading="listLoading" :data="list" class="table" border>
@@ -47,7 +47,7 @@
                   v-model="remarksForm.beginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -57,7 +57,7 @@
                   v-model="remarksForm.endDate"
                   :picker-options="endDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="开始日期"/>
               </el-form-item>
             </el-col>
@@ -76,13 +76,13 @@
                   v-model="remarksForm.breastfeedBeginDate"
                   :picker-options="beginDateOptions"
                   type="date"
-                  format="yyyy-MM-dd"
-                  placeholder="默认截止日期为1年后"/>
+                  value-format="yyyy-MM-dd"
+                  placeholder="默认截止日期为一年后"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" label="其他原因" prop="other">
-            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入对‘其他原因’的说明" show-word-limit/>
+            <el-input v-model="remarksForm.other" :maxlength="200" type="textarea" placeholder="请输入‘其他原因’" show-word-limit/>
           </el-form-item>
           <el-form-item v-if="remarksForm.remarks === '其他原因'" prop="onBusiness">
             <el-radio v-model="remarksForm.onBusiness" label="1">因公</el-radio>
@@ -90,7 +90,7 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="saveData">保存</el-button>
+          <el-button :disabled="saveBtnDisabeld" type="primary" @click="saveData">保存</el-button>
           <el-button @click="resetForm">重置</el-button>
         </div>
       </div>
@@ -115,18 +115,17 @@
             value.indexOf('生育假') !== -1) {
             callback(new Error('请在“备注信息”下拉框里选择请假类型'))
           } else {
-            if (value.indexOf('因公') !== -1 || value.indexOf('因私') !== -1) {
-              callback(new Error('不能含有“因公”、“因私”字样，在下方选择即可'))
-            } else {
-              callback()
-            }
+            callback()
           }
         }
       } else {
-        callback(new Error('请输入其他原因'))
+        callback(new Error('其他原因不能为空'))
       }
     }
     return {
+      listLoading: true,
+      saveBtnDisabeld: false,
+      edited: false,
       curDate: '',
       beginDateOptions: {
         disabledDate: this.disabledBeginDate
@@ -190,7 +189,6 @@
         { name: '其他原因', value: '12' }],
       breastfeedTypeList: [{ name: '上午晚到', value: '1' }, { name: '下午早走', value: '2' }],
       list: [],
-      listLoading: false,
       breastfeedTypeDisabled: false
     }
   },
@@ -199,13 +197,17 @@
   methods: {
     closeDialog() {
       this.list = []
-      this.$parent.fetchData(false)
+      this.listLoading = true
+      if (this.edited) {
+        this.edited = false
+        this.$parent.fetchData(true)
+      }
     },
     disabledBeginDate(time) {
       return time.getTime() > new Date(this.curDate)
     },
     disabledEndDate(time) {
-      return time.getTime() < new Date(this.curDate)
+      return time.getTime() < new Date(this.curDate + ' 00:00:00')
     },
     // 初始化对话框
     initDialog: function(title = null, dialogFormVisible, row) {
@@ -229,7 +231,9 @@
       this.remarksForm.breastfeedBeginDate = ''
       this.remarksForm.other = ''
       this.remarksForm.onBusiness = ''
-
+      this.remarksForm.beginDate = this.curDate
+      this.remarksForm.endDate = this.curDate
+      this.remarksForm.breastfeedBeginDate = this.curDate
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -247,9 +251,6 @@
     },
     add() {
       this.resetForm()
-      this.remarksForm.beginDate = this.curDate
-      this.remarksForm.endDate = this.curDate
-      this.remarksForm.breastfeedBeginDate = this.curDate
       this.addShow = true
     },
     // 保存数据
@@ -258,17 +259,30 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           debugger
-          console.log(this.remarksForm.personId)
+          this.saveBtnDisabeld = true
+          // 如果备注为哺乳假，则需要特别处理
+          if (this.remarksForm.remarks === '请假-哺乳假') {
+            this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType
+            this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate
+          }
+          // 如果备注了其他原因
+          if (this.remarksForm.remarks === '其他原因') {
+            var v = '(私)'
+            if (this.remarksForm.onBusiness === '1') v = '(公)'
+            this.remarksForm.remarks = v + this.remarksForm.other
+          }
           addRemarks(this.remarksForm).then(response => {
             if (response.code === 200) {
               this.fetchData()
               this.fetchRemarksType()
               this.addShow = false
               this.$message.success('添加成功！')
-              // this.$parent.fetchData(false)
+              this.edited = true
             }
+            this.saveBtnDisabeld = false
           }).catch(err => {
             console.log(err)
+            this.saveBtnDisabeld = false
           })
         }
       })
@@ -292,6 +306,7 @@
             this.$message.success('删除成功')
             this.fetchData()
             this.fetchRemarksType()
+            this.edited = true
           }
         })
       })
@@ -305,6 +320,7 @@
         if (response.code === 200) {
           this.list = response.data
         }
+        this.listLoading = false
       })
     },
     // 获取可添加的备注类型列表
diff --git a/src/views/attendance/listReport.vue b/src/views/attendance/listReport.vue
index af7d432..0142700 100644
--- a/src/views/attendance/listReport.vue
+++ b/src/views/attendance/listReport.vue
@@ -22,7 +22,7 @@
             <el-date-picker
               v-model="listQuery.month"
               type="month"
-              format="yyyy-MM"
+              value-format="yyyy-MM"
               style="width: 160px"
               placeholder="考勤月"/>
           </el-form-item>
@@ -30,7 +30,7 @@
             <el-date-picker
               v-model="listQuery.date"
               type="date"
-              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               style="width: 160px"
               placeholder="日期"/>
           </el-form-item>
@@ -83,17 +83,19 @@
         @current-change="handleCurrentChange"/>
     </div>
     <edit-remarks ref="editRemarks" @watchChild="fetchData"/>
+    <sync-and-generate ref="syncAndGenerate" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
 import EditRemarks from './editRemarks'
+import SyncAndGenerate from './syncAndGenerate'
 import { getDeptList, getReportList, batchExportReport } from '@/api/attendance'
 import { downloadFile } from '@/utils/downloadUtils'
 
 export default {
   name: 'ListReport',
-  components: { EditRemarks },
+  components: { EditRemarks, SyncAndGenerate },
   data() {
     return {
       listQuery: {
@@ -125,7 +127,7 @@
           align: 'center'
         },
         {
-          text: '原始识别记录',
+          text: '识别记录',
           value: 'time',
           width: 180,
           align: 'center'
@@ -199,33 +201,8 @@
       this.$refs.editRemarks.initDialog(null, this.dialogFormVisible, row)
     },
     syn() {
-    },
-    // 删除人员
-    del() {
-      if (this.checkSelection()) {
-        const staffIds = []
-        this.multipleSelection.forEach(function(value, index) {
-          staffIds.push(value.id)
-        })
-        this.$confirm(
-          '确定要删除所选访客吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          // delPerson(staffIds).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('删除成功')
-          //     this.fetchData()
-          //   }
-          // })
-        })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      this.dialogFormVisible = true
+      this.$refs.syncAndGenerate.initDialog(this.dialogFormVisible)
     },
     // 批量导出
     batchExport() {
@@ -253,6 +230,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      console.log(this.listQuery.date)
       getReportList(this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
diff --git a/src/views/attendance/makeReport.vue b/src/views/attendance/makeReport.vue
index 49e2c29..5f423d1 100644
--- a/src/views/attendance/makeReport.vue
+++ b/src/views/attendance/makeReport.vue
@@ -9,6 +9,7 @@
             <el-form-item label="考勤月" prop="month">
               <el-date-picker
                 v-model="form.month"
+                :picker-options="pickerOptions"
                 type="month"
                 format="yyyy-MM"
                 value-format="yyyy-MM"
@@ -37,6 +38,12 @@
       },
       rules: {
         month: [{ required: true, message: '请选择考勤月', trigger: ['blur', 'change'] }]
+      },
+      pickerOptions: {
+        disabledDate: (time) => {
+          // const v = 24 * 60 * 60 * 1000 * 30
+          return time.getTime() > Date.now()
+        }
       }
     }
   },
diff --git a/src/views/attendance/syncAndGenerate.vue b/src/views/attendance/syncAndGenerate.vue
new file mode 100644
index 0000000..8e5a7a8
--- /dev/null
+++ b/src/views/attendance/syncAndGenerate.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog v-loading="loading" :visible.sync="dialogFormVisible" title="重新获取识别记录" append-to-body>
+    <div class="block data-pick">
+      <el-row>
+        <p>选择起止日期</p>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          size="small"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="left"
+        />
+      </el-row>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">确定</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { syncAndGenerate } from '@/api/attendance'
+import * as moment from 'moment'
+export default {
+  name: 'SyncAndGenerate',
+  data() {
+    return {
+      loading: false,
+      dialogFormVisible: false, // 对话框是否显示
+      beginDate: '',
+      form: {
+        beginDate: '',
+        endDate: ''
+      },
+      dateRange: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '昨天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(1, 'days')
+            // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三天',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(3, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一周',
+          onClick(picker) {
+            const end = moment().subtract(1, 'days')
+            const start = moment().subtract(7, 'days')
+            picker.$emit('pick', [start, end])
+          }
+        }],
+        onPick: (time) => {
+          if (!time.maxDate) {
+            this.beginDate = time.minDate
+          }
+        },
+        disabledDate: (time) => {
+          const v = 24 * 60 * 60 * 1000
+          if (this.beginDate) {
+            if (time.getTime() < this.beginDate.getTime()) {
+              return time.getTime() < (this.beginDate.getTime() - (v * 7))
+            } else {
+              return time.getTime() > (((this.beginDate.getTime() + (v * 7)) > (Date.now() - v) ? (Date.now() - v) : this.beginDate.getTime() + (v * 7)))
+            }
+          }
+          return time.getTime() > Date.now() - v
+        }
+      }
+    }
+  },
+  watch: {
+    dateRange(val) {
+      if (val && val.length > 0) {
+        if (typeof val[0] !== 'string') {
+          val[0] = val[0].format('YYYY-MM-DD')
+        }
+        if (typeof val[1] !== 'string') {
+          val[1] = val[1].format('YYYY-MM-DD')
+        }
+        this.form.beginDate = val[0]
+        this.form.endDate = val[1]
+      } else {
+        this.form.beginDate = ''
+        this.form.endDate = ''
+        this.beginDate = ''
+      }
+    }
+  },
+  methods: {
+    initDialog(dialogFormVisible) {
+      this.dialogFormVisible = dialogFormVisible
+      this.dateRange = []
+    },
+    saveData() {
+      this.loading = true
+      // 全屏加载动画
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: '数据处理中,请稍后...',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // })
+      syncAndGenerate(this.form).then(res => {
+        console.log(res)
+        if (res.code === 200) {
+          this.loading = false
+          this.$message.success('获取成功')
+          this.dialogFormVisible = false
+          this.$emit('watchChild')
+        } else {
+          this.loading = false
+          // this.$message.error(res.error)
+        }
+      }).catch((res) => {
+        this.loading = false
+        // this.$message.error(res.error)
+      })
+    },
+    cancel() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+<style scoped>
+  .demonstration {
+    font-size: 14px;
+    color: #606266;
+  }
+  .data-pick {
+    display: table;
+    margin: 0 auto;
+  }
+</style>
+
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 3873793..875f90e 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -118,21 +118,21 @@
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="颁证单位" prop="certification">
-                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.ext.address" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="22">
               <el-form-item label="备注" prop="remarks">
-                <el-input v-model.trim="personForm.remarks" type="text" placeholder="必填"/>
+                <el-input v-model.trim="personForm.remarks" type="text" placeholder="非必填"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -217,7 +217,7 @@
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
@@ -250,7 +250,7 @@
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 1228fed..e78b02b 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -120,21 +120,21 @@
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="颁证单位" prop="certification">
-                  <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.ext.certificationUnit" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="住址" prop="address">
-                  <el-input v-model.trim="personForm.ext.address" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.ext.address" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="22">
                 <el-form-item label="备注" prop="remarks">
-                  <el-input v-model.trim="personForm.remarks" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.remarks" type="text" placeholder="非必填"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -228,12 +228,13 @@
           if (!Number(value)) {
             callback(new Error('请输入0-20之间的数字'))
           } else {
-            if (value < (this.personForm.ext.annualLeave ? this.personForm.ext.annualLeave : 0) || value > 20) {
+            var min = this.personForm.ext.annualLeave !== '' ? this.personForm.ext.annualLeave : 0
+            if (parseFloat(value) < parseFloat(min) || parseFloat(value) > 20) {
               callback(new Error('请输入0-20之间且不小于剩余年假天数的值'))
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
@@ -260,12 +261,13 @@
           if (!Number(value)) {
             callback(new Error('请输入数字'))
           } else {
-            if (value < 0 || value > (this.personForm.ext.initAnnualLeave ? this.personForm.ext.initAnnualLeave : 20)) {
+            var max = this.personForm.ext.initAnnualLeave !== '' ? this.personForm.ext.initAnnualLeave : 20
+            if (parseFloat(value) < 0 || parseFloat(value) > parseFloat(max)) {
               callback(new Error('请输入0-20之间且不大于年假天数的值'))
             } else {
               if (value.indexOf('.') !== -1) {
                 if (value.split('.')[1].length > 1) {
-                  callback(new Error('只能是一位小数，如5.0或5.5'))
+                  callback(new Error('最多一位小数'))
                 } else {
                   if (value.split('.')[1] !== '0' && value.split('.')[1] !== '5') {
                     callback(new Error('只能是整数或整数加减0.5的值'))
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 36b8901..65cfd72 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -31,6 +31,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="attendanceEnable" class="edit_btn" size="small" @click="initAnnualLeave">初始化剩余年假</el-button>
           <!--批量导入-->
           <el-upload
             :limit="1"
@@ -91,6 +92,7 @@
 // import { isIE } from '@/utils/browser'
 import { downloadFile } from '@/utils/downloadUtils'
 import { attendanceEnable } from '@/main.js'
+import { initAnnualLeave } from '@/api/attendance'
 
 export default {
   name: 'ListStaff',
@@ -116,7 +118,9 @@
       dutyList: [], // 职务列表
       listLoading: false, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      filename: 'personAtdTemp.xlsx'
+      filename: 'personAtdTemp.xlsx',
+      attendanceEnable: attendanceEnable,
+      fileList: []
     }
   },
   mounted() {
@@ -249,23 +253,11 @@
         this.$message.error('至少选中一项')
       }
     },
-    registerIris(row) {
-      // const token = getToken()
-      // const id = row.id
-      // const idCardNo = row.idCardNo
-      // const baseUrl = getProject().register_url
-      // if (isIE()) {
-      //   const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
-      //   window.open(url, '_blank')
-      // } else {
-      //   const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo
-      //   window.location.href = url
-      // }
-      this.$router.push({
-        path: '/addIris',
-        query: {
-          personId: row.id,
-          idCardNo: row.idCardNo
+    initAnnualLeave() {
+      initAnnualLeave().then(response => {
+        if (response.code === 200) {
+          this.$message.success('重置成功')
+          this.fetchData()
         }
       })
     },