Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2025-05-05 14:42:52 +02:00
commit f99bede26b
2 changed files with 16 additions and 21 deletions

View File

@ -54,7 +54,7 @@ const detailsColumns = ref([
{ {
name: 'item', name: 'item',
label: 'claim.item', label: 'claim.item',
field: (row) => row.sale.itemFk, field: (row) => dashIfEmpty(row.sale.itemFk),
sortable: true, sortable: true,
}, },
{ {
@ -67,13 +67,13 @@ const detailsColumns = ref([
{ {
name: 'quantity', name: 'quantity',
label: 'claim.quantity', label: 'claim.quantity',
field: (row) => row.sale.quantity, field: (row) => dashIfEmpty(row.sale.quantity),
sortable: true, sortable: true,
}, },
{ {
name: 'claimed', name: 'claimed',
label: 'claim.claimed', label: 'claim.claimed',
field: (row) => row.quantity, field: (row) => dashIfEmpty(row.quantity),
sortable: true, sortable: true,
}, },
{ {
@ -84,7 +84,7 @@ const detailsColumns = ref([
{ {
name: 'price', name: 'price',
label: 'claim.price', label: 'claim.price',
field: (row) => row.sale.price, field: (row) => dashIfEmpty(row.sale.price),
sortable: true, sortable: true,
}, },
{ {
@ -337,23 +337,16 @@ function claimUrl(section) {
</QTh> </QTh>
</QTr> </QTr>
</template> </template>
<template #body="props"> <template #body-cell-description="props">
<QTr :props="props"> <QTd :props="props">
<QTd v-for="col in props.cols" :key="col.name" :props="props"> <span class="link">
<template v-if="col.name === 'description'"> {{ props.value }}
<span class="link">{{ </span>
dashIfEmpty(col.field(props.row)) <ItemDescriptorProxy
}}</span> :id="props.row.sale.itemFk"
<ItemDescriptorProxy :sale-fk="props.row.saleFk"
:id="props.row.sale.itemFk" />
:sale-fk="props.row.saleFk" </QTd>
/>
</template>
<template v-else>
{{ dashIfEmpty(col.field(props.row)) }}
</template>
</QTd>
</QTr>
</template> </template>
</QTable> </QTable>
</QCard> </QCard>

View File

@ -182,6 +182,7 @@ const columns = computed(() => [
align: 'left', align: 'left',
showValue: false, showValue: false,
sortable: true, sortable: true,
style: 'max-width: 200px;',
}, },
{ {
label: t('globals.packages'), label: t('globals.packages'),
@ -206,6 +207,7 @@ const columns = computed(() => [
align: 'left', align: 'left',
showValue: false, showValue: false,
sortable: true, sortable: true,
style: 'max-width: 75px;',
}, },
{ {
label: t('extraCommunity.physicKg'), label: t('extraCommunity.physicKg'),