From b82453582a9e25f25d65ffe27ee1ae3a2af62de1 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 17 Oct 2024 07:44:31 +0200 Subject: [PATCH 01/28] fix: refs #7304 7304 clean warning --- src/components/ui/VnAvatar.vue | 2 +- src/pages/Customer/Card/CustomerBasicData.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue index 1deb105db..2423f8ba7 100644 --- a/src/components/ui/VnAvatar.vue +++ b/src/components/ui/VnAvatar.vue @@ -6,7 +6,7 @@ import { useColor } from 'src/composables/useColor'; import { getCssVar } from 'quasar'; const $props = defineProps({ - workerId: { type: Number, required: true }, + workerId: { type: Number, default: null }, description: { type: String, default: null }, title: { type: String, default: null }, color: { type: String, default: null }, diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index d31669b43..3743a4b76 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -155,7 +155,6 @@ const exprBuilder = (param, value) => { url="Clients" :input-debounce="0" :label="t('customer.basicData.previousClient')" - :options="clients" :rules="validate('client.transferorFk')" emit-value map-options From 2be55ca81c5ab4514a7657dfaa94a8d8c95c79f9 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 19 Nov 2024 08:01:00 +0100 Subject: [PATCH 02/28] fix: refs #7304 fix list --- src/pages/Customer/CustomerList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue index 3cb17332c..865287aeb 100644 --- a/src/pages/Customer/CustomerList.vue +++ b/src/pages/Customer/CustomerList.vue @@ -12,6 +12,7 @@ import RightMenu from 'src/components/common/RightMenu.vue'; import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue'; import { toDate } from 'src/filters'; import CustomerFilter from './CustomerFilter.vue'; +import VnAvatar from 'src/components/ui/VnAvatar.vue'; const { t } = useI18n(); const router = useRouter(); From b9ba67c5a652495aee05d6f8172cfe9fa9fa7d94 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 19 Nov 2024 11:39:35 +0100 Subject: [PATCH 03/28] fix: refs #7304 fix warning --- src/components/ui/VnAvatar.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue index 2423f8ba7..0fe943ee2 100644 --- a/src/components/ui/VnAvatar.vue +++ b/src/components/ui/VnAvatar.vue @@ -6,7 +6,7 @@ import { useColor } from 'src/composables/useColor'; import { getCssVar } from 'quasar'; const $props = defineProps({ - workerId: { type: Number, default: null }, + workerId: { type: [Number, undefined], default: null }, description: { type: String, default: null }, title: { type: String, default: null }, color: { type: String, default: null }, @@ -38,7 +38,13 @@ watch(src, () => (showLetter.value = false)); - + +
From a53197342111a3dc5fdb308ed4ac932c65268df9 Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 27 Nov 2024 10:18:32 +0100 Subject: [PATCH 04/28] fix: hotfix search --- src/pages/Travel/Card/TravelCard.vue | 8 ++++---- src/pages/Travel/TravelList.vue | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue index 50cecef34..fd442d58b 100644 --- a/src/pages/Travel/Card/TravelCard.vue +++ b/src/pages/Travel/Card/TravelCard.vue @@ -7,13 +7,13 @@ import filter from './TravelFilter.js'; diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue index 852003a95..0e69250a8 100644 --- a/src/pages/Travel/TravelList.vue +++ b/src/pages/Travel/TravelList.vue @@ -208,6 +208,7 @@ const columns = computed(() => [ ref="tableRef" data-key="TravelList" url="Travels/filter" + redirect="travel" :create="{ urlCreate: 'Travels', title: t('Create Travels'), @@ -221,9 +222,7 @@ const columns = computed(() => [ order="landed DESC" :columns="columns" auto-load - redirect="travel" :is-editable="false" - :use-model="true" >