From 2fea795bdb6ec24793c1f76dae4313d414fca086 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 7 Feb 2025 07:21:59 +0100 Subject: [PATCH 1/3] fix: hotfix empty observations --- src/pages/Customer/Card/CustomerAddress.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue index 5c200582d..4869182cb 100644 --- a/src/pages/Customer/Card/CustomerAddress.vue +++ b/src/pages/Customer/Card/CustomerAddress.vue @@ -189,11 +189,11 @@ const toCustomerAddressEdit = (addressId) => { -
+
Date: Fri, 7 Feb 2025 07:32:28 +0100 Subject: [PATCH 2/3] fix: hotfix fetchData not use userFilter --- src/pages/Customer/Card/CustomerAddress.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue index 4869182cb..1b0d1dde1 100644 --- a/src/pages/Customer/Card/CustomerAddress.vue +++ b/src/pages/Customer/Card/CustomerAddress.vue @@ -117,7 +117,7 @@ const toCustomerAddressEdit = (addressId) => { data-key="CustomerAddresses" order="id DESC" ref="vnPaginateRef" - :user-filter="addressFilter" + :filter="addressFilter" :url="`Clients/${route.params.id}/addresses`" />
From 43b6ff89bef4b2f2a2b388f8e6d1ed3a2da45b92 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 7 Feb 2025 07:56:08 +0100 Subject: [PATCH 3/3] fix: fixed company filter --- src/pages/InvoiceOut/InvoiceOutList.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 09873642d..10b41509c 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -96,12 +96,19 @@ const columns = computed(() => [ }, { align: 'left', - name: 'companyCode', + name: 'companyFk', label: t('globals.company'), cardVisible: true, component: 'select', - attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' }, - columnField: { component: null }, + attrs: { + url: 'Companies', + optionLabel: 'code', + optionValue: 'id', + }, + columnField: { + component: null, + }, + format: (row, dashIfEmpty) => dashIfEmpty(row.companyCode), }, { align: 'left',