From 2e86cdfe52ec29d140383a6b5129252c21eb636d Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 16 Feb 2024 12:59:00 +0100 Subject: [PATCH 001/103] refs #6772 feat: fix approach --- src/components/ui/VnPaginate.vue | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index 4c38c1c1a..2e3927871 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -1,7 +1,9 @@ Date: Wed, 14 Aug 2024 15:27:36 +0200 Subject: [PATCH 016/103] fix: refs #6900 improve loading --- src/components/ui/VnFilterPanel.vue | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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'); } From 83a8f7e1473bda689cbda9c01b65c0234dd3b55d Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 16 Aug 2024 09:20:53 +0200 Subject: [PATCH 017/103] fix(invoiceOutGlobal): formData is object --- src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue index 23c63ee6a..be55c58fc 100644 --- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue +++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue @@ -48,7 +48,7 @@ const getStatus = computed({ onMounted(async () => { await invoiceOutGlobalStore.init(); - formData.value = formInitialData.value.invoiceDate; + formData.value = { invoiceDate: formInitialData.value.invoiceDate }; }); @@ -88,9 +88,6 @@ onMounted(async () => { :label="t('client')" v-model="formData.clientId" :options="clientsOptions" - option-value="id" - option-label="name" - hide-selected dense outlined rounded @@ -109,9 +106,7 @@ onMounted(async () => { :label="t('company')" v-model="formData.companyFk" :options="companiesOptions" - option-value="id" option-label="code" - hide-selected dense outlined rounded @@ -120,9 +115,6 @@ onMounted(async () => { :label="t('printer')" v-model="formData.printer" :options="printersOptions" - option-value="id" - option-label="name" - hide-selected dense outlined rounded From b35bf85f4a241d5287ed90c5f07f4d83ea34ea76 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 16 Aug 2024 10:50:45 +0200 Subject: [PATCH 018/103] fix(claim_summary): url links --- src/pages/Claim/Card/ClaimSummary.vue | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue index 4d817c3c2..9538e753f 100644 --- a/src/pages/Claim/Card/ClaimSummary.vue +++ b/src/pages/Claim/Card/ClaimSummary.vue @@ -36,8 +36,6 @@ const $props = defineProps({ const entityId = computed(() => $props.id || route.params.id); const ClaimStates = ref([]); -const claimUrl = ref(); -const salixUrl = ref(); const claimDmsRef = ref(); const claimDms = ref([]); const multimediaDialog = ref(); @@ -152,11 +150,6 @@ const developmentColumns = ref([ }, ]); -onMounted(async () => { - salixUrl.value = await getUrl(''); - claimUrl.value = salixUrl.value + `claim/${entityId.value}/`; -}); - async function getClaimDms() { claimDmsFilter.value.where = { claimFk: entityId.value }; await claimDmsRef.value.fetch(); @@ -177,10 +170,15 @@ function openDialog(dmsId) { multimediaSlide.value = dmsId; multimediaDialog.value = true; } + async function changeState(value) { await axios.patch(`Claims/updateClaim/${entityId.value}`, { claimStateFk: value }); router.go(route.fullPath); } + +function claimUrl(section) { + return '#/claim/' + entityId.value + '/' + section; +}