diff --git a/src/views/modules/custom/evaluateinfo.vue b/src/views/modules/custom/evaluateinfo.vue index 6a20d146..205ffc3f 100644 --- a/src/views/modules/custom/evaluateinfo.vue +++ b/src/views/modules/custom/evaluateinfo.vue @@ -119,17 +119,17 @@ export default { optionList: [], pickerBeginDateBefore: { disabledDate: (time) => { - let beginDateVal = this.dataForm.startTime + let beginDateVal = this.dataForm.endTime if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } } }, pickerBeginDateAfter: { disabledDate: (time) => { - let EndDateVal = this.dataForm.endTime + let EndDateVal = this.dataForm.startTime if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } } diff --git a/src/views/modules/custom/evaluateofficercount.vue b/src/views/modules/custom/evaluateofficercount.vue index bf995f4d..acf3c97f 100644 --- a/src/views/modules/custom/evaluateofficercount.vue +++ b/src/views/modules/custom/evaluateofficercount.vue @@ -100,17 +100,17 @@ export default { }, pickerBeginDateBefore: { disabledDate: (time) => { - let beginDateVal = this.dataForm.startTime + let beginDateVal = this.dataForm.endTime if (beginDateVal) { - return time.getTime() > new Date(beginDateVal).getTime() + return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() } } }, pickerBeginDateAfter: { disabledDate: (time) => { - let EndDateVal = this.dataForm.endTime + let EndDateVal = this.dataForm.startTime if (EndDateVal) { - return time.getTime() < new Date(EndDateVal).getTime() + return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() } } } diff --git a/src/views/modules/sys/params-add-or-update.vue b/src/views/modules/sys/params-add-or-update.vue index 6c30877c..95878ea9 100644 --- a/src/views/modules/sys/params-add-or-update.vue +++ b/src/views/modules/sys/params-add-or-update.vue @@ -3,7 +3,7 @@ diff --git a/src/views/modules/sys/resource-add-or-update.vue b/src/views/modules/sys/resource-add-or-update.vue index e1cc3b8c..aae89dd0 100644 --- a/src/views/modules/sys/resource-add-or-update.vue +++ b/src/views/modules/sys/resource-add-or-update.vue @@ -28,6 +28,7 @@ diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue index 15a7b17c..e2c14600 100644 --- a/src/views/modules/sys/role-add-or-update.vue +++ b/src/views/modules/sys/role-add-or-update.vue @@ -11,6 +11,8 @@ @@ -26,6 +28,8 @@ diff --git a/src/views/modules/user/partymembers.vue b/src/views/modules/user/partymembers.vue index 9c47cb40..7ef53402 100755 --- a/src/views/modules/user/partymembers.vue +++ b/src/views/modules/user/partymembers.vue @@ -334,10 +334,39 @@ export default { .catch(() => { }) // this.getStreetList() this.getRegistOptions() + this.initTime() // this.getPostOptions() this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/app-user/partymembers/importExcel?token=${Cookies.get('token')}` }, methods: { + initTime () { + const end = new Date() + const start = new Date() + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30) + this.time = [start, end] + let year = start.getFullYear() + let month = start.getMonth() + 1 + if (month < 10) { + month = '0' + month + } + let date = start.getDate() + if (date < 10) { + date = '0' + date + } + let startDate = year + '-' + month + '-' + date + let yearend = end.getFullYear() + let monthend = end.getMonth() + 1 + if (monthend < 10) { + monthend = '0' + monthend + } + let dateend = end.getDate() + if (dateend < 10) { + dateend = '0' + dateend + } + let endDate = yearend + '-' + monthend + '-' + dateend + this.dataForm.startTime = startDate + this.dataForm.endTime = endDate + }, btKeyUpRealName (e) { e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~!#¥%……&*()={}|《》?:“”【】、;‘’,。、]/g, '') this.dataForm.realName = e.target.value