diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index d62422ea7..09fe68970 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -684,6 +684,7 @@ export default { return monthToAdd; }, async showAnotherMonth() { + if (!this.months) return; this.isLoading = true; let monthToShow; let monthStartDateNum = 0; diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index b8809d3de..de55c14ee 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -357,10 +357,15 @@ export default { mounted() { this.$nextTick(() => { const selectableDatesData = this.selectableDatesData; - - // if no date selected on load, then use first available date - if (!this.selectedDate && selectableDatesData?.days?.length > 0) { - this.selectedDate = selectableDatesData.days[0].date; + // if no date selected on load + if (!this.selectedDate) { + if (selectableDatesData?.days?.length > 0) { + this.selectedDate = selectableDatesData.days[0].date; + } else { + setTimeout(() => { + this.$refs.datePicker.showAnotherMonth(); + }, 50); + } } }); },