From 9d6c29ddafecbbebc77c305cc9b356a1e3b33f90 Mon Sep 17 00:00:00 2001 From: jtubau Date: Thu, 27 Feb 2025 10:47:24 +0100 Subject: [PATCH] refactor: refs #8616 integrate summary dialog and update navigation in Agency and Vehicle components --- src/pages/Route/Agency/AgencyList.vue | 6 +++++- src/pages/Route/Agency/Card/AgencySummary.vue | 7 ++++--- src/pages/Route/Card/RouteSummary.vue | 4 ++-- src/pages/Route/Vehicle/Card/VehicleSummary.vue | 17 +++++++++++------ src/pages/Route/Vehicle/VehicleList.vue | 1 + 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue index 26849a593..c4aec6cbb 100644 --- a/src/pages/Route/Agency/AgencyList.vue +++ b/src/pages/Route/Agency/AgencyList.vue @@ -2,10 +2,13 @@ import { computed } from 'vue'; import { useRouter } from 'vue-router'; import { useI18n } from 'vue-i18n'; +import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import VnTable from 'components/VnTable/VnTable.vue'; import VnSection from 'src/components/common/VnSection.vue'; +import AgencySummary from 'pages/Route/Agency/Card/AgencySummary.vue'; const { t } = useI18n(); +const { viewSummary } = useSummaryDialog(); const router = useRouter(); const dataKey = 'AgencyList'; function navigate(id) { @@ -60,7 +63,8 @@ const columns = computed(() => [ { title: t('Client ticket list'), icon: 'preview', - action: (row) => navigate(row.id), + action: (row) => viewSummary(row?.id, AgencySummary), + isPrimary: true, }, ], }, diff --git a/src/pages/Route/Agency/Card/AgencySummary.vue b/src/pages/Route/Agency/Card/AgencySummary.vue index 71a6d1066..c74e5df7d 100644 --- a/src/pages/Route/Agency/Card/AgencySummary.vue +++ b/src/pages/Route/Agency/Card/AgencySummary.vue @@ -7,19 +7,20 @@ import CardSummary from 'components/ui/CardSummary.vue'; import VnLv from 'components/ui/VnLv.vue'; import VnTitle from 'src/components/common/VnTitle.vue'; +const route = useRoute(); const $props = defineProps({ id: { type: Number, default: 0 } }); const { t } = useI18n(); -const entityId = computed(() => $props.id || useRoute().params.id); +const entityId = computed(() => $props.id || route.params.id);