fix: refs #8227 warnfix #1385

Merged
alexm merged 4 commits from 8227-warmfixRoute into test 2025-02-14 09:45:37 +00:00
1 changed files with 9 additions and 4 deletions
Showing only changes of commit da295685a3 - Show all commits

View File

@ -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,
)} `"
/>
<VnLv :label="t('Description')" :value="entity?.description" />