diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index 4fd511631..ab4e2e0da 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -117,14 +117,17 @@ async function search(evt) { isLoading.value = true; const filter = { ...userParams.value, ...$props.modelValue }; store.userParamsChanged = true; - const { params: newParams } = await arrayData.addFilter({ - params: filter, - }); - userParams.value = newParams; + try { + const { params: newParams } = await arrayData.addFilter({ + params: filter, + }); + userParams.value = newParams; - if (!$props.showAll && !Object.values(filter).length) store.data = []; + if (!$props.showAll && !Object.values(filter).length) store.data = []; + } finally { + isLoading.value = false; + } - isLoading.value = false; emit('search'); } diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 937140029..fae22b06d 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -251,6 +251,7 @@ globals: privileges: Privileges ldap: LDAP samba: Samba + serial: Serial created: Created worker: Worker now: Now diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 9979586f4..e1946515c 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -253,6 +253,7 @@ globals: packages: Bultos ldap: LDAP samba: Samba + serial: Facturas por serie created: Fecha creación worker: Trabajador now: Ahora diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue new file mode 100644 index 000000000..4eb9fa69d --- /dev/null +++ b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue @@ -0,0 +1,68 @@ + + + +es: + Serial: Serie + Pending: Pendiente + diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue new file mode 100644 index 000000000..4f8c9d70b --- /dev/null +++ b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue @@ -0,0 +1,53 @@ + + + +en: + params: + daysAgo: Last days + serial: serial +es: + params: + daysAgo: Últimos días + serial: serie + diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js index cd8f7de9c..906db8a58 100644 --- a/src/router/modules/invoiceIn.js +++ b/src/router/modules/invoiceIn.js @@ -11,7 +11,7 @@ export default { component: RouterView, redirect: { name: 'InvoiceInMain' }, menus: { - main: ['InvoiceInList'], + main: ['InvoiceInList', 'InvoiceInSerial'], card: [ 'InvoiceInBasicData', 'InvoiceInVat', @@ -37,6 +37,16 @@ export default { }, component: () => import('src/pages/InvoiceIn/InvoiceInList.vue'), }, + { + path: 'serial', + name: 'InvoiceInSerial', + meta: { + title: 'serial', + icon: 'view_list', + }, + component: () => + import('src/pages/InvoiceIn/Serial/InvoiceInSerial.vue'), + }, { path: 'create', name: 'InvoiceInCreare',