From e10e06bcd4a18f4608f12dc3d01829a7b71567e0 Mon Sep 17 00:00:00 2001 From: jorgep Date: Mon, 4 Mar 2024 08:25:43 +0100 Subject: [PATCH 01/56] fix: refs #6942 selectable expense --- src/components/FetchData.vue | 7 +- src/components/common/VnSelectFilter.vue | 2 +- .../InvoiceIn/Card/InvoiceInBasicData.vue | 481 +++++++++--------- 3 files changed, 239 insertions(+), 251 deletions(-) diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue index 5b3dcbea7..2a0864d3e 100644 --- a/src/components/FetchData.vue +++ b/src/components/FetchData.vue @@ -1,5 +1,5 @@ + diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue index 4903a5327..c3538db9b 100644 --- a/src/components/common/VnSelectFilter.vue +++ b/src/components/common/VnSelectFilter.vue @@ -151,7 +151,7 @@ watch(modelValue, (newValue) => { @on-fetch="(data) => setOptions(data)" :where="where || { [optionValue]: value }" :limit="limit" - :order-by="orderBy" + :sort-by="sortBy" :fields="fields" /> arrayData.store.data); const userConfig = ref(null); +const expenses = ref([]); const currencies = ref([]); const currenciesRef = ref(); const companies = ref([]); @@ -174,6 +174,7 @@ async function upsert() { @on-fetch="(data) => (userConfig = data)" auto-load /> + From 0fd83cf4357db52bd99c1002692b6eb6b015335a Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 5 Mar 2024 08:59:06 +0100 Subject: [PATCH 02/56] fix: refs #6942 changes and new features --- src/components/FormModel.vue | 20 +- src/i18n/en/index.js | 1 + src/i18n/es/index.js | 1 + .../InvoiceIn/Card/InvoiceInBasicData.vue | 191 +++++------------- src/pages/InvoiceIn/Card/InvoiceInCard.vue | 15 +- .../InvoiceIn/Card/InvoiceInDescriptor.vue | 13 +- src/pages/InvoiceIn/Card/InvoiceInDueDay.vue | 13 ++ src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 75 +++---- src/pages/InvoiceIn/Card/InvoiceInVat.vue | 20 +- src/pages/InvoiceIn/InvoiceInCreate.vue | 123 +++++++++++ src/pages/InvoiceIn/InvoiceInList.vue | 19 +- .../Supplier/Card/SupplierDescriptor.vue | 2 +- src/router/modules/invoiceIn.js | 9 + 13 files changed, 292 insertions(+), 210 deletions(-) create mode 100644 src/pages/InvoiceIn/InvoiceInCreate.vue diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 9f5ae319c..56811ffdd 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -96,16 +96,16 @@ onMounted(async () => { }); onBeforeRouteLeave((to, from, next) => { - if (!hasChanges.value) next(); - - quasar.dialog({ - component: VnConfirm, - componentProps: { - title: t('Unsaved changes will be lost'), - message: t('Are you sure exit without saving?'), - promise: () => next(), - }, - }); + if (hasChanges.value) { + quasar.dialog({ + component: VnConfirm, + componentProps: { + title: t('Unsaved changes will be lost'), + message: t('Are you sure exit without saving?'), + promise: () => next(), + }, + }); + } else next(); }); onUnmounted(() => { diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 0cc91c88d..7643ef640 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -698,6 +698,7 @@ export default { intrastat: 'Intrastat', corrective: 'Corrective', log: 'Logs', + create: 'Create', }, list: { ref: 'Reference', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 7369721e6..c22a15b69 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -756,6 +756,7 @@ export default { intrastat: 'Intrastat', corrective: 'Rectificativa', log: 'Registros de auditoría', + create: 'Crear', }, list: { ref: 'Referencia', diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue index 8ee7e647a..746ff3c49 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue @@ -1,6 +1,6 @@ +