verdnatura/salix-front
verdnatura
/
salix-front
3
3
Fork 1
Code Issues Pull Requests 75 Releases Wiki Activity

Merge pull request 'feat: #8663 add style to price tag' (!1754) from 8863-estilosOrderCatalog into dev
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1754
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
This commit is contained in:
Pau Rovira 2025-05-15 08:50:40 +00:00
parent 11277910c3 31c6b03262
commit fda88342af
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/ui/CatalogItem.vue
View File

@ -42,7 +42,7 @@ const card = toRef(props, 'item');
</div> </div>
<div class="content"> <div class="content">
<span class="link" @click.stop> <span class="link" @click.stop>
{{ card.name }} {{ card.longName }}
<ItemDescriptorProxy :id="card.id" /> <ItemDescriptorProxy :id="card.id" />
</span> </span>
<p class="subName">{{ card.subName }}</p> <p class="subName">{{ card.subName }}</p>
@ -57,11 +57,12 @@ const card = toRef(props, 'item');
<QIcon name="production_quantity_limits" size="xs" /> <QIcon name="production_quantity_limits" size="xs" />
{{ card.minQuantity }} {{ card.minQuantity }}
</div> </div>
<div class="footer"> <div class="footer q-mt-auto">
<div class="price"> <div class="price">
<p v-if="isCatalog"> <p v-if="isCatalog">
{{ card.available }} {{ t('to') }} <span class="text-primary">{{ card.available }}</span>
{{ toCurrency(card.price) }} {{ t('to') }}
<span class="text-bold" >{{ toCurrency(card.price) }}</span>
</p> </p>
<slot name="price" /> <slot name="price" />
<QIcon v-if="isCatalog" name="add_circle" class="icon"> <QIcon v-if="isCatalog" name="add_circle" class="icon">
@ -144,6 +145,7 @@ const card = toRef(props, 'item');
} }
.footer { .footer {
.price { .price {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;

2
src/pages/Order/Card/OrderCatalog.vue
View File

@ -19,7 +19,7 @@ const { t } = useI18n();
const dataKey = 'OrderCatalogList'; const dataKey = 'OrderCatalogList';
const catalogParams = { const catalogParams = {
orderFk: route.params.id, orderFk: route.params.id,
orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }), orderBy: JSON.stringify({ field: 'relevancy DESC, longName', way: 'ASC', isTag: false }),
}; };
const arrayData = useArrayData(dataKey, { const arrayData = useArrayData(dataKey, {
url: 'Orders/CatalogFilter', url: 'Orders/CatalogFilter',