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 += '
';
+ // for (const ticket of selectedTickets.value) {
+ // message += `- ${ticket.futureId} << ${ticket.id}
`;
+ // }
+ // 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
)
"
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index 6d5c7726e..2be1369a9 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -126,6 +126,7 @@ onMounted(async () => await getItemPackingTypes());
v-model="params.scopeDays"
:label="t('Days onward')"
is-outlined
+ :step="0"
/>