diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue index 79f41a26..0c8302cf 100644 --- a/src/apps/AppResidentActivitie/Add.vue +++ b/src/apps/AppResidentActivitie/Add.vue @@ -207,9 +207,9 @@ export default { if (this.showStartTime == true) { var nowTime = new Date().getTime() * 1 - var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1 + var beginTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1 - if (nowTime > historyTime) { + if (nowTime > beginTimes) { this.forms.beginTime = '' return this.$u.toast('开始时间应大于当前时间') } else { @@ -217,15 +217,18 @@ export default { } } if (this.showEndTime == true) { - var nowTime = new Date().getTime() * 1 + if (!this.forms.beginTime) { + return this.$u.toast('请先选择开始时间') + } + var beginTimes = new Date(this.forms.beginTime).getTime() * 1 - var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1 + var endTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1 - if (nowTime > historyTime) { - this.forms.endTime = '' - return this.$u.toast('结束时间应大于当前时间') - } else { + if (endTimes > beginTimes && endTimes != beginTimes) { this.forms.endTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00' + } else { + this.forms.endTime = '' + return this.$u.toast('结束时间应大于开始时间') } } },