From aa3810a4c0bcb24c4a9411c639cb2005a239500f Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 18 Dec 2024 11:24:12 +0100 Subject: [PATCH] feat: refs #6564 add agency & ticket list --- src/pages/Ticket/TicketAdvance.vue | 36 +++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue index 9b6669acb..25401f1ad 100644 --- a/src/pages/Ticket/TicketAdvance.vue +++ b/src/pages/Ticket/TicketAdvance.vue @@ -78,6 +78,15 @@ const ticketColumns = computed(() => [ headerClass: 'horizontal-separator', hidden: true, }, + { + label: t('globals.agency'), + name: 'agency', + field: 'agency', + align: 'left', + sortable: true, + headerClass: 'horizontal-separator', + columnFilter: false, + }, { label: t('advanceTickets.preparation'), name: 'preparation', @@ -85,7 +94,6 @@ const ticketColumns = computed(() => [ align: 'left', sortable: true, headerClass: 'horizontal-separator', - columnFilter: false, }, { align: 'left', @@ -327,6 +335,22 @@ const handleCloseProgressDialog = () => { const handleCancelProgress = () => (cancelProgress.value = true); +const getMessage = (type) => { + const locale = + type === 'advance' ? 'advanceTitleSubtitle' : 'advanceWithoutNegativeSubtitle'; + + let message = t(`advanceTickets.${locale}`, { + selectedTickets: selectedTickets.value.length, + }); + + // message += ''; + return message; +}; + watch( () => vnTableRef.value.tableRef?.$el, ($el) => { @@ -402,10 +426,8 @@ watch( :disable="!selectedTickets.length" @click.stop=" openConfirmationModal( - t('advanceTickets.advanceTicketTitle'), - t(`advanceTickets.advanceTitleSubtitle`, { - selectedTickets: selectedTickets.length, - }), + t('advanceTickets.advanceTickets'), + getMessage('advance'), moveTicketsAdvance ) " @@ -421,9 +443,7 @@ watch( @click.stop=" openConfirmationModal( t('advanceTickets.advanceWithoutNegativeTitle'), - t(`advanceTickets.advanceWithoutNegativeSubtitle`, { - selectedTickets: selectedTickets.length, - }), + getMessage('split'), splitTickets ) "