From df907a72809e7caf2bb90603cd0fb2ce14ca41aa Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 30 Jul 2024 12:43:26 +0200 Subject: [PATCH 1/3] 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 19765b1f7..282393623 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/3] 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 282393623..2af40dd27 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 11:18:37 +0200 Subject: [PATCH 3/3] 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 24b155389..a6cd149f1 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 a978d8fda..e24ed33ed 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',