|
@@ -250,6 +250,7 @@
|
|
|
@cancel="isShowDatePicker2 = false"
|
|
|
@close="isShowDatePicker2 = false"
|
|
|
:minDate="minDate2"
|
|
|
+ :maxDate="maxDate2"
|
|
|
:formatter="formatter"
|
|
|
:style="{ width: '100%' }"
|
|
|
/>
|
|
@@ -340,6 +341,7 @@ export default {
|
|
|
datePickerValue3: new Date().getTime(),
|
|
|
minDate: new Date().getTime(),
|
|
|
minDate2: null,
|
|
|
+ maxDate2: null,
|
|
|
datePickerValue: new Date().getTime(),
|
|
|
isShowDatePicker: false,
|
|
|
datePickerValue2: new Date().getTime(),
|
|
@@ -438,10 +440,21 @@ export default {
|
|
|
return this.$tips(`请先选择${this.typeVal}开始时间`)
|
|
|
}
|
|
|
this.minDate2 = Number(new Date(this.date))
|
|
|
+ this.maxDate2 = Number(this.getEndOfDayTimestamp(this.minDate2))
|
|
|
this.$nextTick(() => {
|
|
|
this.isShowDatePicker2 = true
|
|
|
})
|
|
|
},
|
|
|
+ getEndOfDayTimestamp(timestamp) {
|
|
|
+ // 创建一个日期对象
|
|
|
+ const date = new Date(timestamp)
|
|
|
+
|
|
|
+ // 设置为当天的 23:59:59
|
|
|
+ date.setHours(23, 59, 59, 999)
|
|
|
+
|
|
|
+ // 返回时间戳
|
|
|
+ return date.getTime()
|
|
|
+ },
|
|
|
// 赋值预约改约结束时间
|
|
|
confirmDate2(e) {
|
|
|
this.isShowDatePicker2 = false
|