fix: fix Description & TicketId filters on CustomerConsumption
gitea/salix-front/pipeline/pr-master There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-master There was a failure building this commit
Details
This commit is contained in:
parent
14b8fc150b
commit
af065eb66e
|
@ -17,6 +17,7 @@ import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.v
|
||||||
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
|
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
|
||||||
import VnSelect from 'components/common/VnSelect.vue';
|
import VnSelect from 'components/common/VnSelect.vue';
|
||||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||||
|
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
|
||||||
|
|
||||||
const arrayData = useArrayData('Client');
|
const arrayData = useArrayData('Client');
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
@ -50,7 +51,7 @@ const columns = computed(() => [
|
||||||
label: t('globals.ticket'),
|
label: t('globals.ticket'),
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
name: 'ticketId',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -67,24 +68,19 @@ const columns = computed(() => [
|
||||||
label: t('globals.description'),
|
label: t('globals.description'),
|
||||||
columnClass: 'expand',
|
columnClass: 'expand',
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
name: 'description',
|
||||||
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'quantity',
|
name: 'quantity',
|
||||||
label: t('globals.quantity'),
|
label: t('globals.quantity'),
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnFilter: {
|
visible: true,
|
||||||
inWhere: true,
|
columnFilter: false
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'grouped',
|
|
||||||
label: t('Group by items'),
|
|
||||||
component: 'checkbox',
|
|
||||||
visible: false,
|
|
||||||
orderBy: false,
|
|
||||||
},
|
},
|
||||||
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
onBeforeMount(async () => {
|
onBeforeMount(async () => {
|
||||||
|
@ -199,9 +195,9 @@ const updateDateParams = (value, params) => {
|
||||||
<div v-if="row.subName" class="subName">
|
<div v-if="row.subName" class="subName">
|
||||||
{{ row.subName }}
|
{{ row.subName }}
|
||||||
</div>
|
</div>
|
||||||
<FetchedTags :item="row" :max-length="3" />
|
<FetchedTags :item="row" :columns="6"/>
|
||||||
</template>
|
</template>
|
||||||
<template #moreFilterPanel="{ params }">
|
<template #moreFilterPanel="{ params, searchFn}">
|
||||||
<div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
|
<div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
|
||||||
<VnSelect
|
<VnSelect
|
||||||
v-model="params.campaign"
|
v-model="params.campaign"
|
||||||
|
@ -240,6 +236,13 @@ const updateDateParams = (value, params) => {
|
||||||
class="q-px-xs q-pt-none fit"
|
class="q-px-xs q-pt-none fit"
|
||||||
dense
|
dense
|
||||||
/>
|
/>
|
||||||
|
<VnCheckbox
|
||||||
|
v-model="params.grouped"
|
||||||
|
:label="t('Group by items')"
|
||||||
|
class="q-px-xs q-pt-none fit"
|
||||||
|
dense
|
||||||
|
@update:modelValue="() => searchFn()"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</VnTable>
|
</VnTable>
|
||||||
|
|
|
@ -94,3 +94,30 @@ customer:
|
||||||
hasToInvoiceByAddress: Invoice by address
|
hasToInvoiceByAddress: Invoice by address
|
||||||
isToBeMailed: Mailing
|
isToBeMailed: Mailing
|
||||||
hasSepaVnl: VNL B2B received
|
hasSepaVnl: VNL B2B received
|
||||||
|
search: Search customer
|
||||||
|
searchInfo: You can search by customer ID
|
||||||
|
params:
|
||||||
|
id: Id
|
||||||
|
isWorker: Is Worker
|
||||||
|
payMethod: Payment Method
|
||||||
|
workerFk: Author
|
||||||
|
observation: Last Observation
|
||||||
|
created: Last Update Date
|
||||||
|
creditInsurance: Credit Insurance
|
||||||
|
defaulterSinced: Defaulted Since
|
||||||
|
hasRecovery: Has Recovery
|
||||||
|
socialName: Social name
|
||||||
|
typeId: Type
|
||||||
|
buyerId: Buyer
|
||||||
|
categoryId: Category
|
||||||
|
city: City
|
||||||
|
phone: Phone
|
||||||
|
postcode: Postcode
|
||||||
|
campaign: Campaign
|
||||||
|
grouped: Grouped
|
||||||
|
search: Contains
|
||||||
|
itemId: Item Id
|
||||||
|
ticketFk: Ticket Id
|
||||||
|
description: Description
|
||||||
|
quantity: Quantity
|
||||||
|
ticketId: Ticket
|
||||||
|
|
|
@ -96,3 +96,30 @@ customer:
|
||||||
hasToInvoiceByAddress: Factura por consigna
|
hasToInvoiceByAddress: Factura por consigna
|
||||||
isToBeMailed: Env. emails
|
isToBeMailed: Env. emails
|
||||||
hasSepaVnl: Recibido B2B VNL
|
hasSepaVnl: Recibido B2B VNL
|
||||||
|
search: Buscar cliente
|
||||||
|
searchInfo: Puedes buscar por id o nombre del cliente
|
||||||
|
params:
|
||||||
|
id: ID
|
||||||
|
isWorker: Es trabajador
|
||||||
|
payMethod: F. Pago
|
||||||
|
workerFk: Autor
|
||||||
|
observation: Última observación
|
||||||
|
created: Fecha Ú. O.
|
||||||
|
creditInsurance: Crédito A.
|
||||||
|
defaulterSinced: Desde
|
||||||
|
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
|
||||||
|
grouped: Agrupado
|
||||||
|
search: Contiene
|
||||||
|
itemId: Id Artículo
|
||||||
|
ticketFk: Id Ticket
|
||||||
|
description: Descripción
|
||||||
|
quantity: Cantidad
|
||||||
|
ticketId: Ticket
|
||||||
|
|
Loading…
Reference in New Issue