diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue index a9e9bc0fc..4174e4ae6 100644 --- a/src/components/ui/VnLinkPhone.vue +++ b/src/components/ui/VnLinkPhone.vue @@ -57,4 +57,5 @@ function handleClick() { {{ capitalize(type).replace('-', '') }} + {{ phoneNumber }} diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue index ee3791291..aa7342742 100644 --- a/src/components/ui/VnLv.vue +++ b/src/components/ui/VnLv.vue @@ -43,7 +43,7 @@ const val = computed(() => $props.value); {{ label }} -
+
{{ dash ? dashIfEmpty(value) : value }} diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue index 556f89b0e..e42380fa3 100644 --- a/src/pages/Entry/EntryList.vue +++ b/src/pages/Entry/EntryList.vue @@ -248,7 +248,7 @@ function getBadgeAttrs(row) { let timeDiff = today - timeTicket; - if (timeDiff > 0) return { color: 'info', 'text-color': 'black' }; + if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' }; switch (row.entryTypeCode) { case 'regularization': case 'life': @@ -273,7 +273,7 @@ function getBadgeAttrs(row) { default: break; } - if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' }; + if (timeDiff > 0) return { color: 'info', 'text-color': 'black' }; return { color: 'transparent' }; } diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue index 278b0b26f..c814d623e 100644 --- a/src/pages/Monitor/MonitorClients.vue +++ b/src/pages/Monitor/MonitorClients.vue @@ -1,13 +1,14 @@ diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue index 2679f7224..bdfcf3837 100644 --- a/src/pages/Monitor/MonitorOrders.vue +++ b/src/pages/Monitor/MonitorOrders.vue @@ -9,6 +9,7 @@ import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js'; import { toCurrency } from 'src/filters'; import { useVnConfirm } from 'composables/useVnConfirm'; import axios from 'axios'; +import useOpenURL from 'src/composables/useOpenURL'; const { t } = useI18n(); const { openConfirmationModal } = useVnConfirm(); @@ -108,8 +109,7 @@ const removeOrders = async () => { await table.value.reload(); }; -const openTab = (id) => - window.open(`#/order/${id}/summary`, '_blank', 'noopener, noreferrer'); +const openTab = (id) => useOpenURL(`#/order/${id}/summary`); diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue index 03d751595..b46eb5bfa 100644 --- a/src/pages/Monitor/Ticket/MonitorTickets.vue +++ b/src/pages/Monitor/Ticket/MonitorTickets.vue @@ -449,21 +449,19 @@ const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);