feat: add rounded CC field to travel summary and translations
gitea/salix-front/pipeline/pr-master There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-master There was a failure building this commit
Details
This commit is contained in:
parent
a519014685
commit
02e29c167a
|
@ -841,6 +841,7 @@ travel:
|
||||||
availabledHour: Availabled hour
|
availabledHour: Availabled hour
|
||||||
thermographs: Thermographs
|
thermographs: Thermographs
|
||||||
hb: HB
|
hb: HB
|
||||||
|
roundedCc: Rounded CC
|
||||||
basicData:
|
basicData:
|
||||||
daysInForward: Automatic movement (Raid)
|
daysInForward: Automatic movement (Raid)
|
||||||
isRaid: Raid
|
isRaid: Raid
|
||||||
|
|
|
@ -924,6 +924,7 @@ travel:
|
||||||
availabled: F. Disponible
|
availabled: F. Disponible
|
||||||
availabledHour: Hora Disponible
|
availabledHour: Hora Disponible
|
||||||
hb: HB
|
hb: HB
|
||||||
|
roundedCc: CC redondeado
|
||||||
basicData:
|
basicData:
|
||||||
daysInForward: Desplazamiento automatico (redada)
|
daysInForward: Desplazamiento automatico (redada)
|
||||||
isRaid: Redada
|
isRaid: Redada
|
||||||
|
|
|
@ -91,6 +91,13 @@ const entriesTableColumns = computed(() => {
|
||||||
showValue: true,
|
showValue: true,
|
||||||
},
|
},
|
||||||
{ label: 'CC', field: 'cc', name: 'cc', align: 'left', showValue: true },
|
{ label: 'CC', field: 'cc', name: 'cc', align: 'left', showValue: true },
|
||||||
|
{
|
||||||
|
label: t('travel.summary.roundedCc'),
|
||||||
|
field: 'cc',
|
||||||
|
name: 'roundedCc',
|
||||||
|
align: 'left',
|
||||||
|
showValue: true,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: 'Pallet',
|
label: 'Pallet',
|
||||||
field: 'pallet',
|
field: 'pallet',
|
||||||
|
@ -193,13 +200,18 @@ const entriesTotals = computed(() => {
|
||||||
freightValue: 0,
|
freightValue: 0,
|
||||||
packageValue: 0,
|
packageValue: 0,
|
||||||
cc: 0,
|
cc: 0,
|
||||||
|
roundedCc: 0,
|
||||||
pallet: 0,
|
pallet: 0,
|
||||||
m3: 0,
|
m3: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
entriesTableRows.value.forEach((row) => {
|
entriesTableRows.value.forEach((row) => {
|
||||||
for (const key in totals) {
|
for (const key in totals) {
|
||||||
totals[key] += row[key] || 0;
|
if (key === 'roundedCc') {
|
||||||
|
totals['roundedCc'] += Math.ceil(row['cc'] || 0);
|
||||||
|
} else {
|
||||||
|
totals[key] += row[key] || 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -208,6 +220,7 @@ const entriesTotals = computed(() => {
|
||||||
freight: toCurrency(totals.freightValue),
|
freight: toCurrency(totals.freightValue),
|
||||||
packageValue: toCurrency(totals.packageValue),
|
packageValue: toCurrency(totals.packageValue),
|
||||||
cc: totals.cc.toFixed(2),
|
cc: totals.cc.toFixed(2),
|
||||||
|
roundedCc: totals.roundedCc,
|
||||||
pallet: totals.pallet.toFixed(2),
|
pallet: totals.pallet.toFixed(2),
|
||||||
m3: totals.m3.toFixed(2),
|
m3: totals.m3.toFixed(2),
|
||||||
};
|
};
|
||||||
|
@ -337,9 +350,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
|
||||||
<VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
|
<VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('travel.summary.availabled')"
|
:label="t('travel.summary.availabled')"
|
||||||
:value="
|
:value="dashIfEmpty(toDateTimeFormat(travel.availabled))"
|
||||||
dashIfEmpty(toDateTimeFormat(travel.availabled))
|
|
||||||
"
|
|
||||||
/>
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="full-width">
|
<QCard class="full-width">
|
||||||
|
@ -376,6 +387,11 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
|
||||||
</QBtn>
|
</QBtn>
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
|
<template #body-cell-roundedCc="{ col, value }">
|
||||||
|
<QTd>
|
||||||
|
{{ Math.ceil(value) || 0 }}
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
<template #body-cell-observation="{ value }">
|
<template #body-cell-observation="{ value }">
|
||||||
<QTd>
|
<QTd>
|
||||||
<QIcon name="insert_drive_file" color="primary" size="24px">
|
<QIcon name="insert_drive_file" color="primary" size="24px">
|
||||||
|
@ -392,6 +408,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
|
||||||
<QTd class="text-bold">{{ entriesTotals.freight }}</QTd>
|
<QTd class="text-bold">{{ entriesTotals.freight }}</QTd>
|
||||||
<QTd class="text-bold">{{ entriesTotals.packageValue }}</QTd>
|
<QTd class="text-bold">{{ entriesTotals.packageValue }}</QTd>
|
||||||
<QTd class="text-bold">{{ entriesTotals.cc }}</QTd>
|
<QTd class="text-bold">{{ entriesTotals.cc }}</QTd>
|
||||||
|
<QTd class="text-bold">{{ entriesTotals.roundedCc }}</QTd>
|
||||||
<QTd class="text-bold">{{ entriesTotals.pallet }}</QTd>
|
<QTd class="text-bold">{{ entriesTotals.pallet }}</QTd>
|
||||||
<QTd class="text-bold">{{ entriesTotals.m3 }}</QTd>
|
<QTd class="text-bold">{{ entriesTotals.m3 }}</QTd>
|
||||||
</template>
|
</template>
|
||||||
|
|
Loading…
Reference in New Issue