From df907a72809e7caf2bb90603cd0fb2ce14ca41aa Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 30 Jul 2024 12:43:26 +0200 Subject: [PATCH 1/6] fix: refs #6449 fix summaryId --- src/components/common/VnLog.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index 19765b1f7d..282393623c 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -213,7 +213,7 @@ function getLogTree(data) { } nLogs++; modelLog.logs.push(log); - + modelLog.summaryId = modelLog.logs[0].summaryId; // Changes const notDelete = log.action != 'delete'; const olds = (notDelete ? log.oldInstance : null) || {}; @@ -464,9 +464,12 @@ onUnmounted(() => { > {{ t(modelLog.modelI18n) }} - #{{ modelLog.summaryId }} + + {{ modelLog.showValue }} From 3bb261376d15f1c179eb012bdabb8dd5bbec137f Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 30 Jul 2024 13:16:45 +0200 Subject: [PATCH 2/6] chore: refs #6449 refactor model-value text --- src/components/common/VnLog.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index 282393623c..2af40dd272 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -470,9 +470,11 @@ onUnmounted(() => { v-if="modelLog.summaryId" v-text="`#${modelLog.summaryId}`" /> - - {{ modelLog.showValue }} - + Date: Thu, 8 Aug 2024 10:27:27 +0200 Subject: [PATCH 3/6] hotFix: vnVisibleColumn fix userId --- src/components/VnTable/VnVisibleColumn.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue index 6d9fd2c333..36f5ed7deb 100644 --- a/src/components/VnTable/VnVisibleColumn.vue +++ b/src/components/VnTable/VnVisibleColumn.vue @@ -65,7 +65,7 @@ async function fetchViewConfigData() { const userConfig = await getConfig('UserConfigViews', { where: { ...defaultFilter.where, - ...{ userFk: user.id }, + ...{ userFk: user.value.id }, }, }); From 26628c5f2aa51ae1cc19e714e29f49e2cf2121d5 Mon Sep 17 00:00:00 2001 From: pablone Date: Thu, 8 Aug 2024 11:18:37 +0200 Subject: [PATCH 4/6] fix: refs #7129 fix vehicle filter --- src/pages/Route/Card/RouteFilter.vue | 1 + src/pages/Route/RouteList.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue index 24b155389e..a6cd149f16 100644 --- a/src/pages/Route/Card/RouteFilter.vue +++ b/src/pages/Route/Card/RouteFilter.vue @@ -119,6 +119,7 @@ const emit = defineEmits(['search']); sort-by="numberPlate ASC" option-value="id" option-label="numberPlate" + option-filter-value="numberPlate" dense outlined rounded diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue index a978d8fda2..e24ed33ede 100644 --- a/src/pages/Route/RouteList.vue +++ b/src/pages/Route/RouteList.vue @@ -99,6 +99,7 @@ const columns = computed(() => [ url: 'vehicles', fields: ['id', 'numberPlate'], optionLabel: 'numberPlate', + optionFilterValue: 'numberPlate', find: { value: 'vehicleFk', label: 'vehiclePlateNumber', From c5358313dfe98244fb55b57579b4bf477345abc2 Mon Sep 17 00:00:00 2001 From: pablone Date: Thu, 8 Aug 2024 14:54:17 +0200 Subject: [PATCH 5/6] fix: route form --- src/pages/Route/Card/RouteForm.vue | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue index b80b4536db..8c89718fa9 100644 --- a/src/pages/Route/Card/RouteForm.vue +++ b/src/pages/Route/Card/RouteForm.vue @@ -142,11 +142,6 @@ const onSave = (data, response) => { @@ -194,7 +189,7 @@ es: Description: Descripción Is served: Se ha servido Created: Creado - Distance must be lesser than: La distancia debe ser inferior a {maxDistance} + The km can not exceed: La distancia debe ser inferior a {maxDistance} en: - Distance must be lesser than: Distance must be lesser than {maxDistance} + The km can not exceed: Distance must be lesser than {maxDistance} From 5e88004e790a08aa16902bef0d4d07fbcf5bf3cf Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 12 Aug 2024 08:34:16 +0200 Subject: [PATCH 6/6] fix(customerDescription): fix action buttons --- src/components/VnTable/VnTable.vue | 18 ++++++++++++---- .../Customer/Card/CustomerDescriptor.vue | 21 ++++++++++++++----- src/pages/InvoiceOut/InvoiceOutList.vue | 4 ++-- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 8cd7bb628c..16d4dd1609 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -108,6 +108,8 @@ const CrudModelRef = ref({}); const showForm = ref(false); const splittedColumns = ref({ columns: [] }); const columnsVisibilitySkiped = ref(); +const createForm = ref(); + const tableModes = [ { icon: 'view_column', @@ -139,6 +141,14 @@ onMounted(() => { .map((c) => c.name), ...['tableActions'], ]; + createForm.value = $props.create; + if ($props.create && route?.query?.createForm) { + showForm.value = true; + createForm.value = { + ...createForm.value, + ...{ formInitialData: JSON.parse(route?.query?.createForm) }, + }; + } }); watch( @@ -158,7 +168,7 @@ function setUserParams(watchedParams) { if (!watchedParams) return; if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams); - const filter = JSON.parse(watchedParams?.filter); + const filter = JSON.parse(watchedParams?.filter ?? '{}'); const where = filter?.where; const order = filter?.order; @@ -598,14 +608,14 @@ defineExpose({ - {{ create.title }} + {{ createForm.title }}