From d2452caef870ccf5933ef851c402622410cd6a0f Mon Sep 17 00:00:00 2001 From: jorgep Date: Mon, 28 Apr 2025 15:56:19 +0200 Subject: [PATCH] feat: refs #8388 update entry pre-accounting filter handling and enhance search info in localization files --- src/pages/Entry/EntryPreAccount.vue | 12 ++++++++---- src/pages/Entry/locale/en.yml | 2 +- src/pages/Entry/locale/es.yml | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue index 5e1cda395..5f4d36df0 100644 --- a/src/pages/Entry/EntryPreAccount.vue +++ b/src/pages/Entry/EntryPreAccount.vue @@ -19,7 +19,9 @@ import { useQuasar } from 'quasar'; import InvoiceInDescriptorProxy from '../InvoiceIn/Card/InvoiceInDescriptorProxy.vue'; import { useStateStore } from 'src/stores/useStateStore'; import { downloadFile } from 'src/composables/downloadFile'; +import { useRoute } from 'vue-router'; +const route = useRoute(); const { t } = useI18n(); const quasar = useQuasar(); const { notify } = useNotify(); @@ -215,13 +217,14 @@ const columns = computed(() => [ ]); onBeforeMount(async () => { + const filter = JSON.parse(route.query.entryPreaccountingFilter ?? '{}'); const { data } = await axios.get('EntryConfigs/findOne', { params: { filter: JSON.stringify({ fields: ['maxDays', 'defaultDays'] }) }, }); maxDays = data.maxDays; defaultDays = data.defaultDays; - daysAgo.value = arrayData.store.userParams.daysAgo || defaultDays; - isBooked.value = arrayData.store.userParams.isBooked || false; + daysAgo.value = filter.daysAgo || defaultDays; + isBooked.value = filter.isBooked || false; stateStore.leftDrawer = false; }); @@ -237,8 +240,9 @@ function filterByDaysAgo(val) { if (!val) val = defaultDays; else if (val > maxDays) val = maxDays; daysAgo.value = val; - arrayData.store.userParams.daysAgo = daysAgo.value; - table.value.reload(); + table.value.reload({ + userParams: { ...arrayData.store.userParams, daysAgo: daysAgo.value }, + }); } async function preAccount() { diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml index 51e2a62e5..09caefc34 100644 --- a/src/pages/Entry/locale/en.yml +++ b/src/pages/Entry/locale/en.yml @@ -138,7 +138,7 @@ entry: fiscalCode: Account type daysAgo: Max 365 days search: Search - searchInfo: You can search by supplier name or nickname + searchInfo: You can search by supplier name, nickname or tax number btn: Pre-account hasInvoice: This entry has already an invoice in success: It has been successfully pre-accounted diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml index 5b1c19dfa..f67e3c76d 100644 --- a/src/pages/Entry/locale/es.yml +++ b/src/pages/Entry/locale/es.yml @@ -89,7 +89,7 @@ entry: fiscalCode: Tipo de cuenta daysAgo: Máximo 365 días search: Buscar - searchInfo: Puedes buscar por nombre o alias de proveedor + searchInfo: Puedes buscar por nombre, alias o cif de proveedor btn: Precontabilizar hasInvoice: Esta entrada ya tiene una f. recibida success: Se ha precontabilizado correctamente