8032-devToTest_2440 #751

Merged
alexm merged 319 commits from 8032-devToTest_2440 into test 2024-09-24 10:05:33 +00:00
1 changed files with 7 additions and 1 deletions
Showing only changes of commit 452b084caf - Show all commits

View File

@ -48,15 +48,18 @@ const columns = computed(() => [
align: 'left',
label: t('Nickname'),
name: 'nickname',
columnClass: 'expand',
},
{
align: 'left',
format: (row) => row.agencyMode.name,
columnClass: 'expand',
label: t('Agency'),
},
{
align: 'left',
name: 'routeFk',
columnClass: 'shrink',
label: t('Route'),
},
{
@ -64,6 +67,7 @@ const columns = computed(() => [
field: 'packages',
label: t('Packages'),
name: 'packages',
columnClass: 'shrink',
},
{
align: 'left',
@ -169,8 +173,8 @@ const setShippedColor = (date) => {
class="q-pa-sm"
v-if="setTotalPriceColor(row)"
:color="setTotalPriceColor(row)"
text-color="black"
>
<!-- {{ setTotalPriceColor(row) }} -->
{{ toCurrency(row.totalWithVat) }}
</QBadge>
<span v-else> {{ toCurrency(row.totalWithVat) }}</span>
@ -185,6 +189,7 @@ const setShippedColor = (date) => {
<QBadge
class="q-pa-sm"
:color="setStateColor(row)"
text-color="black"
v-else-if="setStateColor(row)"
>
{{ row?.ticketState?.state.name }}
@ -195,6 +200,7 @@ const setShippedColor = (date) => {
<QBadge
class="q-pa-sm"
:color="setShippedColor(row.shipped)"
text-color="black"
v-if="setShippedColor(row.shipped)"
>
{{ toDateFormat(row.shipped) }}