Merge pull request 'fix_customerConsumption_filter' (!1357) from fix_customerConsumption_filter into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #1357 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
commit
d4212e6e07
|
|
@ -328,7 +328,6 @@ en:
|
|||
active: Is active
|
||||
visible: Is visible
|
||||
floramondo: Is floramondo
|
||||
salesPersonFk: Buyer
|
||||
categoryFk: Category
|
||||
|
||||
es:
|
||||
|
|
@ -339,7 +338,6 @@ es:
|
|||
active: Activo
|
||||
visible: Visible
|
||||
floramondo: Floramondo
|
||||
salesPersonFk: Comprador
|
||||
categoryFk: Categoría
|
||||
Plant: Planta natural
|
||||
Flower: Flor fresca
|
||||
|
|
|
|||
|
|
@ -653,7 +653,6 @@ supplier:
|
|||
tableVisibleColumns:
|
||||
nif: NIF/CIF
|
||||
account: Cuenta
|
||||
|
||||
summary:
|
||||
responsible: Responsable
|
||||
verified: Verificado
|
||||
|
|
|
|||
|
|
@ -61,6 +61,23 @@ const columns = computed(() => [
|
|||
columnFilter: false,
|
||||
cardVisible: true,
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'buyerId',
|
||||
label: t('customer.params.buyerId'),
|
||||
component: 'select',
|
||||
attrs: {
|
||||
url: 'TicketRequests/getItemTypeWorker',
|
||||
optionLabel: 'nickname',
|
||||
optionValue: 'id',
|
||||
|
||||
fields: ['id', 'nickname'],
|
||||
sortBy: ['nickname ASC'],
|
||||
optionFilter: 'firstName',
|
||||
},
|
||||
cardVisible: false,
|
||||
visible: false,
|
||||
},
|
||||
{
|
||||
name: 'description',
|
||||
align: 'left',
|
||||
|
|
@ -74,6 +91,7 @@ const columns = computed(() => [
|
|||
name: 'quantity',
|
||||
label: t('globals.quantity'),
|
||||
cardVisible: true,
|
||||
visible: true,
|
||||
columnFilter: {
|
||||
inWhere: true,
|
||||
},
|
||||
|
|
@ -138,11 +156,11 @@ const updateDateParams = (value, params) => {
|
|||
const campaign = campaignList.value.find((c) => c.id === value);
|
||||
if (!campaign) return;
|
||||
|
||||
const { dated, previousDays, scopeDays } = campaign;
|
||||
const _date = new Date(dated);
|
||||
const [from, to] = dateRange(_date);
|
||||
params.from = new Date(from.setDate(from.getDate() - previousDays)).toISOString();
|
||||
params.to = new Date(to.setDate(to.getDate() + scopeDays)).toISOString();
|
||||
const { dated, scopeDays } = campaign;
|
||||
const from = new Date(dated);
|
||||
from.setDate(from.getDate() - scopeDays);
|
||||
params.from = from;
|
||||
params.to = dated;
|
||||
return params;
|
||||
};
|
||||
</script>
|
||||
|
|
@ -205,24 +223,57 @@ const updateDateParams = (value, params) => {
|
|||
<template #moreFilterPanel="{ params }">
|
||||
<div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
|
||||
<VnSelect
|
||||
v-model="params.campaign"
|
||||
:options="campaignList"
|
||||
:label="t('globals.campaign')"
|
||||
:filled="true"
|
||||
class="q-px-sm q-pt-none fit"
|
||||
url="ItemTypes"
|
||||
v-model="params.typeId"
|
||||
:label="t('item.list.typeName')"
|
||||
:fields="['id', 'name', 'categoryFk']"
|
||||
:include="'category'"
|
||||
:sortBy="'name ASC'"
|
||||
dense
|
||||
option-label="code"
|
||||
@update:model-value="(data) => updateDateParams(data, params)"
|
||||
>
|
||||
<template #option="scope">
|
||||
<QItem v-bind="scope.itemProps">
|
||||
<QItemSection>
|
||||
<QItemLabel>
|
||||
{{ scope.opt?.code }}
|
||||
{{
|
||||
new Date(scope.opt?.dated).getFullYear()
|
||||
}}</QItemLabel
|
||||
>
|
||||
<QItemLabel>{{ scope.opt?.name }}</QItemLabel>
|
||||
<QItemLabel caption>{{
|
||||
scope.opt?.category?.name
|
||||
}}</QItemLabel>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
</VnSelect>
|
||||
<VnSelect
|
||||
:filled="true"
|
||||
class="q-px-sm q-pt-none fit"
|
||||
url="ItemCategories"
|
||||
v-model="params.categoryId"
|
||||
:label="t('item.list.category')"
|
||||
:fields="['id', 'name']"
|
||||
:sortBy="'name ASC'"
|
||||
dense
|
||||
@update:model-value="(data) => updateDateParams(data, params)"
|
||||
/>
|
||||
<VnSelect
|
||||
v-model="params.campaign"
|
||||
:options="campaignList"
|
||||
:label="t('globals.campaign')"
|
||||
:filled="true"
|
||||
class="q-px-sm q-pt-none fit"
|
||||
:option-label="(opt) => t(opt.code)"
|
||||
:fields="['id', 'code', 'dated', 'scopeDays']"
|
||||
@update:model-value="(data) => updateDateParams(data, params)"
|
||||
dense
|
||||
>
|
||||
<template #option="scope">
|
||||
<QItem v-bind="scope.itemProps">
|
||||
<QItemSection>
|
||||
<QItemLabel> {{ t(scope.opt?.code) }} </QItemLabel>
|
||||
<QItemLabel caption>
|
||||
{{ new Date(scope.opt?.dated).getFullYear() }}
|
||||
</QItemLabel>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
|
|
@ -247,7 +298,19 @@ const updateDateParams = (value, params) => {
|
|||
</template>
|
||||
|
||||
<i18n>
|
||||
en:
|
||||
|
||||
valentinesDay: Valentine's Day
|
||||
mothersDay: Mother's Day
|
||||
allSaints: All Saints' Day
|
||||
es:
|
||||
Enter a new search: Introduce una nueva búsqueda
|
||||
Group by items: Agrupar por artículos
|
||||
valentinesDay: Día de San Valentín
|
||||
mothersDay: Día de la Madre
|
||||
allSaints: Día de Todos los Santos
|
||||
Campaign consumption: Consumo campaña
|
||||
Campaign: Campaña
|
||||
From: Desde
|
||||
To: Hasta
|
||||
</i18n>
|
||||
|
|
|
|||
|
|
@ -107,6 +107,9 @@ customer:
|
|||
defaulterSinced: Defaulted Since
|
||||
hasRecovery: Has Recovery
|
||||
socialName: Social name
|
||||
typeId: Type
|
||||
buyerId: Buyer
|
||||
categoryId: Category
|
||||
city: City
|
||||
phone: Phone
|
||||
postcode: Postcode
|
||||
|
|
|
|||
|
|
@ -108,6 +108,9 @@ customer:
|
|||
hasRecovery: Tiene recobro
|
||||
socialName: Razón social
|
||||
campaign: Campaña
|
||||
typeId: Familia
|
||||
buyerId: Comprador
|
||||
categoryId: Reino
|
||||
city: Ciudad
|
||||
phone: Teléfono
|
||||
postcode: Código postal
|
||||
|
|
|
|||
Loading…
Reference in New Issue