From 011b5814a743867285e2362b68b163c83cfea861 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 28 Nov 2024 11:41:22 +0100
Subject: [PATCH] fix: refs #7936 improve error handling

---
 src/components/CrudModel.vue                   |  3 ++-
 .../InvoiceIn/Card/InvoiceInCorrective.vue     | 18 +++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 85bd5457a..7dd5129e9 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -176,7 +176,8 @@ async function saveChanges(data) {
     try {
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
     } catch (e) {
-        return (isLoading.value = false);
+        isLoading.value = false;
+        throw e;
     }
     originalData.value = JSON.parse(JSON.stringify(formData.value));
     if (changes.creates?.length) await vnPaginateRef.value.fetch();
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
index 165b3e0df..1d0a8d078 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
@@ -1,22 +1,21 @@
 <script setup>
 import { ref, computed, capitalize } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const { push, currentRoute } = useRouter();
+const route = useRoute();
 const { t } = useI18n();
 
-const invoiceId = +currentRoute.value.params.id;
 const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 const invoiceInCorrectionRef = ref();
 const filter = {
     include: { relation: 'invoiceIn' },
-    where: { correctingFk: invoiceId },
+    where: { correctingFk: route.params.id },
 };
 const columns = computed(() => [
     {
@@ -70,8 +69,6 @@ const siiTypeInvoiceIns = ref([]);
 const invoiceCorrectionTypes = ref([]);
 
 const requiredFieldRule = (val) => val || t('globals.requiredField');
-
-const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`);
 </script>
 <template>
     <FetchData
@@ -98,7 +95,6 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
         :filter="filter"
         auto-load
         primary-key="correctingFk"
-        @save-changes="onSave"
         :default-remove="false"
     >
         <template #body="{ rows }">
@@ -120,8 +116,8 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
                             :disable="row.invoiceIn.isBooked"
                             :filter-options="['description']"
                         >
-                            <template #option="{ opt }">
-                                <QItem>
+                            <template #option="{ opt, itemProps }">
+                                <QItem v-bind="itemProps">
                                     <QItemSection>
                                         <QItemLabel>{{ opt.description }}</QItemLabel>
                                     </QItemSection>
@@ -142,8 +138,8 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
                             :filter-options="['code', 'description']"
                             :disable="row.invoiceIn.isBooked"
                         >
-                            <template #option="{ opt }">
-                                <QItem>
+                            <template #option="{ opt, itemProps }">
+                                <QItem v-bind="itemProps">
                                     <QItemSection>
                                         <QItemLabel
                                             >{{ opt.code }} -