diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 7ae428e59..3fd83b2ab 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1801,8 +1801,9 @@ export default { if (firstMobilePMDate && numberOfDaysToFirstMobilePMDate <= pmMobileDays) { preSelectedMobileAppointment = firstMobilePMAppt; } else if ( - firstMobilePMDate && - numberOfDaysToFirstMobilePMDate >= noPMMobileDays + (firstMobilePMDate && + numberOfDaysToFirstMobilePMDate >= noPMMobileDays) || + pmMobileDays == 0 ) { preSelectedMobileAppointment = firstMobileAMAppt ? firstMobileAMAppt @@ -1811,10 +1812,12 @@ export default { (preSelectedMobileAppointment = firstMobilePMAppt); } - this.$refs.mobileFirstModal.setSelectedAppointment( - preSelectedMobileAppointment - ); - this.$refs.mobileFirstModal.openModal(); + if (preSelectedMobileAppointment) { + this.$refs.mobileFirstModal.setSelectedAppointment( + preSelectedMobileAppointment + ); + this.$refs.mobileFirstModal.openModal(); + } } } }