verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 85 Releases Wiki Activity

Merge pull request 'fix: #8813 fixed ClaimLines format' (!1097) from 8813-arreglarFormatoClaimLines into dev
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1097
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
This commit is contained in:
PAU ROVIRA ROSALENY 2024-12-19 05:06:27 +00:00
parent b851262ff8 8293a314c8
commit 8ca96d526e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pages/Claim/Card/ClaimLines.vue
View File

@ -57,6 +57,7 @@ function onFetch(rows, newRows) {
const price = row.quantity * sale.price; const price = row.quantity * sale.price;
const discount = (sale.discount * price) / 100; const discount = (sale.discount * price) / 100;
amountClaimed.value = amountClaimed.value + (price - discount); amountClaimed.value = amountClaimed.value + (price - discount);
} }
} }
@ -207,9 +208,10 @@ async function saveWhenHasChanges() {
selection="multiple" selection="multiple"
v-model:selected="selected" v-model:selected="selected"
:grid="$q.screen.lt.md" :grid="$q.screen.lt.md"
> >
<template #body-cell-claimed="{ row }"> <template #body-cell-claimed="{ row }">
<QTd auto-width align="right" class="text-primary"> <QTd auto-width align="right" class="text-primary shrink">
<QInput <QInput
v-model.number="row.quantity" v-model.number="row.quantity"
type="number" type="number"
@ -220,7 +222,7 @@ async function saveWhenHasChanges() {
</QTd> </QTd>
</template> </template>
<template #body-cell-description="{ row, value }"> <template #body-cell-description="{ row, value }">
<QTd auto-width align="right" class="text-primary"> <QTd auto-width align="right" class="link expand">
{{ value }} {{ value }}
<ItemDescriptorProxy <ItemDescriptorProxy
:id="row.sale.itemFk" :id="row.sale.itemFk"
@ -228,7 +230,7 @@ async function saveWhenHasChanges() {
</QTd> </QTd>
</template> </template>
<template #body-cell-discount="{ row, value, rowIndex }"> <template #body-cell-discount="{ row, value, rowIndex }">
<QTd auto-width align="right" class="text-primary"> <QTd auto-width align="right" class="text-primary shrink">
{{ value }} {{ value }}
<VnDiscount <VnDiscount
:quantity="row.quantity" :quantity="row.quantity"
@ -264,7 +266,7 @@ async function saveWhenHasChanges() {
</QItemSection> </QItemSection>
<QItemSection side> <QItemSection side>
<template v-if="column.name === 'claimed'"> <template v-if="column.name === 'claimed'">
<QItemLabel class="text-primary"> <QItemLabel class="text-primary shrink">
<QInput <QInput
v-model.number=" v-model.number="
props.row.quantity props.row.quantity
@ -282,7 +284,7 @@ async function saveWhenHasChanges() {
<template <template
v-else-if="column.name === 'discount'" v-else-if="column.name === 'discount'"
> >
<QItemLabel class="text-primary"> <QItemLabel class="text-primary shrink">
{{ column.value }} {{ column.value }}
<VnDiscount <VnDiscount
:quantity="props.row.quantity" :quantity="props.row.quantity"
@ -330,6 +332,7 @@ async function saveWhenHasChanges() {
.grid-style-transition { .grid-style-transition {
transition: transform 0.28s, background-color 0.28s; transition: transform 0.28s, background-color 0.28s;
} }
</style> </style>
<i18n> <i18n>

9
src/pages/Claim/Card/ClaimSummary.vue
View File

@ -345,12 +345,9 @@ function claimUrl(section) {
<span v-if="col.name != 'description'">{{ <span v-if="col.name != 'description'">{{
t(col.value) t(col.value)
}}</span> }}</span>
<QBtn <span class="link" v-if="col.name === 'description'">{{
v-if="col.name == 'description'" t(col.value)
flat }}</span>
color="blue"
>{{ col.value }}</QBtn
>
<ItemDescriptorProxy <ItemDescriptorProxy
v-if="col.name == 'description'" v-if="col.name == 'description'"
:id="props.row.sale.itemFk" :id="props.row.sale.itemFk"