diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index d9527c1ac..83ce2f9b2 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -27,7 +27,7 @@ class="u-item-width-daterange" value-format="yyyy-MM-dd" placeholder="开始日期" - :picker-options="pickerOptions" + :picker-options="pickerOptionsStart" > @@ -38,7 +38,7 @@ value-format="yyyy-MM-dd" class="u-item-width-daterange u-data-tag" placeholder="结束日期" - :picker-options="pickerOptions" + :picker-options="pickerOptionsEnd" > @@ -426,12 +426,31 @@ export default { startPickerTime: '', endPickerTime: '' }, - changeRecordShow: false,pickerOptions: { - disabledDate: time => { - //设置选择今天以及今天以前的日期 - return time.getTime() > Date.now() - 8.64e6; - } - }, + pickerOptionsStart: { + disabledDate: time => { + let dateVal = this.form.birthdayEnd + if (dateVal) { + return time.getTime() > new Date(dateVal).getTime(); + }else { + return time.getTime() > Date.now() - 8.64e6; + } + } + }, + pickerOptionsEnd: { + disabledDate: time => { + let dateVal = this.form.birthdayStart + if (dateVal) { + if(time.getTime() < new Date(dateVal).getTime()){ + return time.getTime(); + }else { + return time.getTime() > Date.now() - 8.64e6; + } + }else { + return time.getTime() > Date.now() - 8.64e6; + } + } + }, + } }, computed: {