From df794391ec8d97852b5457b4434964ab72a23cc8 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 17 Feb 2025 23:08:57 +0100 Subject: [PATCH] feat: agency in ticketlist sort data --- .../Route/Agency/composables/getAgencies.js | 18 ++++++++++-------- src/pages/Ticket/TicketFilter.vue | 7 ++++++- src/pages/Ticket/TicketList.vue | 3 +++ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/pages/Route/Agency/composables/getAgencies.js b/src/pages/Route/Agency/composables/getAgencies.js index 850f87456..2462ec718 100644 --- a/src/pages/Route/Agency/composables/getAgencies.js +++ b/src/pages/Route/Agency/composables/getAgencies.js @@ -1,11 +1,11 @@ import axios from 'axios'; -import agency from 'src/router/modules/agency'; export async function getAgencies(formData, client, _filter = {}) { if (!formData.warehouseId || !formData.addressId || !formData.landed) return; - + const filter = { - ..._filter + order: ['name ASC'], + ..._filter, }; let defaultAgency = null; @@ -18,9 +18,11 @@ export async function getAgencies(formData, client, _filter = {}) { const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params }); - if(data && client) { - defaultAgency = data.find((agency) => agency.agencyModeFk === client.defaultAddress.agencyModeFk ); - }; - - return {options: data, agency: defaultAgency} + if (data && client) { + defaultAgency = data.find( + (agency) => agency.agencyModeFk === client.defaultAddress.agencyModeFk, + ); + } + + return { options: data, agency: defaultAgency }; } diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue index 254b89e60..722db879d 100644 --- a/src/pages/Ticket/TicketFilter.vue +++ b/src/pages/Ticket/TicketFilter.vue @@ -66,7 +66,12 @@ function validateDateRange(params) { " auto-load /> - + + + {{ `#${scope.opt?.id}` }} +