From da295685a36c38958f289235294d7e9aa5b67843 Mon Sep 17 00:00:00 2001 From: carlossa <carlossa@verdnatura.es> Date: Thu, 13 Feb 2025 10:38:30 +0100 Subject: [PATCH] fix: refs #8227 warmfix --- src/pages/Route/Card/RouteDescriptor.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue index 14d96636269..cdbd95ddc39 100644 --- a/src/pages/Route/Card/RouteDescriptor.vue +++ b/src/pages/Route/Card/RouteDescriptor.vue @@ -38,7 +38,6 @@ const filter = { 'started', 'finished', 'cost', - 'zoneFk', 'isOk', ], include: [ @@ -47,7 +46,13 @@ const filter = { relation: 'vehicle', scope: { fields: ['id', 'm3'] }, }, - { relation: 'zone', scope: { fields: ['id', 'name'] } }, + { + relation: 'ticket', + scope: { + fields: ['id', 'name', 'routeFk'], + include: { relation: 'route', scope: { fields: ['id', 'name'] } }, + }, + }, { relation: 'worker', scope: { @@ -81,11 +86,11 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity <template #body="{ entity }"> <VnLv :label="t('Date')" :value="toDate(entity?.dated)" /> <VnLv :label="t('Agency')" :value="entity?.agencyMode?.name" /> - <VnLv :label="t('Zone')" :value="entity?.zone?.name" /> + <VnLv :label="t('Zone')" :value="entity?.ticket?.route?.name" /> <VnLv :label="t('Volume')" :value="`${dashIfEmpty(entity?.m3)} / ${dashIfEmpty( - entity?.vehicle?.m3 + entity?.vehicle?.m3, )} m³`" /> <VnLv :label="t('Description')" :value="entity?.description" />