diff --git a/src/components/DatePickerAdv/elDate7DayPicker.vue b/src/components/DatePickerAdv/elDate7DayPicker.vue index 38b6064a..7533dfae 100644 --- a/src/components/DatePickerAdv/elDate7DayPicker.vue +++ b/src/components/DatePickerAdv/elDate7DayPicker.vue @@ -7,7 +7,6 @@ type="datetimerange" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss" - start-placeholder="开始日期" end-placeholder="结束日期" ref="timeRangePicker" @@ -33,20 +32,23 @@ export default { data() { return { dateRange: this.value, - pickerMinDate: null, + pickerMinDate: null, + maxDay:7 * 24 * 3600 * 1000, pickerOptions: { onPick: ({ maxDate, minDate }) => { this.pickerMinDate = new Date(minDate).getTime(); }, disabledDate: time => { - if (this.pickerMinDate) { - const day1 = 7 * 24 * 3600 * 1000; - let maxTime = this.pickerMinDate + day1; - let minTime = this.pickerMinDate - day1; - return time.getTime() > maxTime || time.getTime() < minTime; - }else{ - return time.getTime() > Date.now() - } + // if (this.pickerMinDate) { + // // const day = 7 * 24 * 3600 * 1000; + // // const day6 = 6 * 24 * 3600 * 1000; + // let maxTime = this.pickerMinDate + this.maxDay; + // let minTime = this.pickerMinDate - this.maxDay; + // return time.getTime() > maxTime || time.getTime() < minTime; + // }else{ + // return time.getTime() > Date.now() + // } + return false; } }, } @@ -66,9 +68,21 @@ export default { dateChange(value) { if(this.dateRange&&this.dateRange.length==2){ - this.dateRange[0]=timeFormat(this.dateRange[0]); - this.dateRange[1]=timeFormat(this.dateRange[1]); + const startTime=new Date(this.dateRange[0]); + const endTime=new Date(this.dateRange[1]); + + if( endTime.getTime() > dayjs(startTime.getTime()).add(6, 'day') ){ + this.$message.error("选择不能不超过7天!"); + this.dateRange=null; + return + } + // this.dateRange[0]=timeFormat(this.dateRange[0]); + // this.dateRange[1]=timeFormat(this.dateRange[1]); + + }else{ + } + this.$emit("input", this.dateRange); this.$emit('dateTimeChange', this.dateRange) }, diff --git a/src/components/DatePickerAdv/elDateAdvPicker.vue b/src/components/DatePickerAdv/elDateAdvPicker.vue index b0b46c19..2132661d 100644 --- a/src/components/DatePickerAdv/elDateAdvPicker.vue +++ b/src/components/DatePickerAdv/elDateAdvPicker.vue @@ -2,6 +2,7 @@