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

feat: refs #8117 filters and values added as needed #1132

Merged
jtubau merged 7 commits from 8117-filtersAndValuesReviewed into dev 2025-01-08 06:06:52 +00:00
Conversation 1 Commits 7 Files Changed 16 +84 -65
16 changed files with 84 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/common/VnSelect.vue
View File

@ -205,10 +205,10 @@ function filter(val, options) {
} }
if (!row) return; if (!row) return;
const id = row[$props.optionValue]; const id = String(row[$props.optionValue]);
const optionLabel = String(row[$props.optionLabel]).toLowerCase(); const optionLabel = String(row[$props.optionLabel]).toLowerCase();
return id == search || optionLabel.includes(search); return id.includes(search) || optionLabel.includes(search);
}); });
} }

3
src/components/common/VnSelectWorker.vue
View File

@ -51,6 +51,7 @@ const url = computed(() => {
option-value="id" option-value="id"
option-label="nickname" option-label="nickname"
:fields="['id', 'name', 'nickname', 'code']" :fields="['id', 'name', 'nickname', 'code']"
:filter-options="['id', 'name', 'nickname', 'code']"
sort-by="nickname ASC" sort-by="nickname ASC"
> >
<template #prepend v-if="$props.hasAvatar"> <template #prepend v-if="$props.hasAvatar">
@ -71,7 +72,7 @@ const url = computed(() => {
{{ scope.opt.nickname }} {{ scope.opt.nickname }}
</QItemLabel> </QItemLabel>
<QItemLabel caption v-else> <QItemLabel caption v-else>
{{ scope.opt.nickname }}, {{ scope.opt.code }} #{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
</QItemLabel> </QItemLabel>
</QItemSection> </QItemSection>
</QItem> </QItem>

11
src/pages/Claim/ClaimFilter.vue
View File

@ -93,16 +93,7 @@ defineExpose({ states });
outlined outlined
rounded rounded
dense dense
> />
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
<QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelect>
<VnSelect <VnSelect
:label="t('claim.responsible')" :label="t('claim.responsible')"
v-model="params.claimResponsibleFk" v-model="params.claimResponsibleFk"

10
src/pages/Entry/EntryFilter.vue
View File

@ -123,6 +123,7 @@ const companiesOptions = ref([]);
option-value="id" option-value="id"
option-label="name" option-label="name"
:fields="['id', 'name', 'nickname']" :fields="['id', 'name', 'nickname']"
:filter-options="['id', 'name', 'nickname']"
sort-by="nickname" sort-by="nickname"
hide-selected hide-selected
dense dense
@ -132,9 +133,12 @@ const companiesOptions = ref([]);
<template #option="scope"> <template #option="scope">
<QItem v-bind="scope.itemProps"> <QItem v-bind="scope.itemProps">
<QItemSection> <QItemSection>
<QItemLabel>{{ <QItemLabel>
scope.opt?.name + ': ' + scope.opt?.nickname {{ scope.opt?.name}}
}}</QItemLabel> </QItemLabel>
<QItemLabel caption>
{{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
</QItemLabel>
</QItemSection> </QItemSection>
</QItem> </QItem>
</template> </template>

10
src/pages/Entry/EntryLatestBuysFilter.vue
View File

@ -69,12 +69,14 @@ const tagValues = ref([]);
use-input use-input
@update:model-value="searchFn()" @update:model-value="searchFn()"
> >
<template #option="{ itemProps, opt }"> <template #option="scope">
<QItem v-bind="itemProps"> <QItem v-bind="scope.itemProps">
<QItemSection> <QItemSection>
<QItemLabel>{{ opt.name }}</QItemLabel> <QItemLabel>
{{ scope.opt?.name}}
</QItemLabel>
<QItemLabel caption> <QItemLabel caption>
{{ opt.nickname }} {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
</QItemLabel> </QItemLabel>
</QItemSection> </QItemSection>
</QItem> </QItem>

17
src/pages/InvoiceIn/InvoiceInFilter.vue
View File

@ -68,13 +68,26 @@ function handleDaysAgo(params, daysAgo) {
<VnSelect <VnSelect
v-model="params.supplierFk" v-model="params.supplierFk"
url="Suppliers" url="Suppliers"
:fields="['id', 'nickname']" :fields="['id', 'nickname', 'name']"
:label="getLocale('supplierFk')" :label="getLocale('supplierFk')"
option-label="nickname" option-label="nickname"
dense dense
outlined outlined
rounded rounded
/> >
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>
{{ scope.opt?.name}}
</QItemLabel>
<QItemLabel caption>
{{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelect>
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem> <QItem>

6
src/pages/InvoiceIn/InvoiceInList.vue
View File

@ -165,18 +165,18 @@ const cols = computed(() => [
<VnSelect <VnSelect
v-model="data.supplierFk" v-model="data.supplierFk"
url="Suppliers" url="Suppliers"
:fields="['id', 'nickname']" :fields="['id', 'nickname', 'name']"
:label="t('globals.supplier')" :label="t('globals.supplier')"
option-value="id" option-value="id"
option-label="nickname" option-label="nickname"
:filter-options="['id', 'name']" :filter-options="['id', 'name', 'nickname']"
:required="true" :required="true"
> >
<template #option="scope"> <template #option="scope">
<QItem v-bind="scope.itemProps"> <QItem v-bind="scope.itemProps">
<QItemSection> <QItemSection>
<QItemLabel>{{ scope.opt?.nickname }}</QItemLabel> <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
<QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel> <QItemLabel caption> #{{ scope.opt?.id }}, {{ scope.opt?.name }} </QItemLabel>
</QItemSection> </QItemSection>
</QItem> </QItem>
</template> </template>

12
src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
View File

@ -101,17 +101,7 @@ onMounted(async () => {
dense dense
outlined outlined
rounded rounded
> />
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>
#{{ scope.opt?.id }} {{ scope.opt?.name }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelect>
<VnSelect <VnSelect
:label="t('invoiceOutSerialType')" :label="t('invoiceOutSerialType')"
v-model="formData.serialType" v-model="formData.serialType"

11
src/pages/Item/ItemList.vue
View File

@ -142,6 +142,17 @@ const columns = computed(() => [
label: t('item.list.typeName'), label: t('item.list.typeName'),
name: 'typeName', name: 'typeName',
align: 'left', align: 'left',
component: 'select',
columnFilter: {
name: 'typeFk',
attrs: {
url: 'ItemTypes',
fields: ['id', 'name'],
},
},
jtubau commented 2024-12-26 07:36:22 +00:00
Review
Copy Link

añadida la opción filtrado por tipo en el list ya que en los filtros del rightmenu esta disponible su filtrado

añadida la opción filtrado por tipo en el list ya que en los filtros del rightmenu esta disponible su filtrado
alexm commented 2025-01-03 07:02:52 +00:00
Review
Copy Link

Tambien esta la opcion de incluir component: 'select', dentro de columnFilter asi te ahorras la parte de:

        columnField: {
            component: null,
        }
Tambien esta la opcion de incluir `component: 'select',` dentro de `columnFilter` asi te ahorras la parte de: ``` columnField: { component: null, } ```
columnField: {
component: null,
}
}, },
{ {
label: t('item.list.category'), label: t('item.list.category'),

23
src/pages/Item/ItemListFilter.vue
View File

@ -199,17 +199,7 @@ onMounted(async () => {
dense dense
outlined outlined
rounded rounded
> />
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>{{
t(`params.${scope.opt?.name}`)
}}</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelect>
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem> <QItem>
@ -265,6 +255,7 @@ onMounted(async () => {
option-value="id" option-value="id"
option-label="name" option-label="name"
:fields="['id', 'name', 'nickname']" :fields="['id', 'name', 'nickname']"
:filter-options="['id', 'name', 'nickname']"
sort-by="name ASC" sort-by="name ASC"
hide-selected hide-selected
dense dense
@ -274,9 +265,12 @@ onMounted(async () => {
<template #option="scope"> <template #option="scope">
<QItem v-bind="scope.itemProps"> <QItem v-bind="scope.itemProps">
<QItemSection> <QItemSection>
<QItemLabel>{{ <QItemLabel>
scope.opt?.name + ': ' + scope.opt?.nickname {{ scope.opt?.name}}
}}</QItemLabel> </QItemLabel>
<QItemLabel caption>
{{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
</QItemLabel>
</QItemSection> </QItemSection>
</QItem> </QItem>
</template> </template>
@ -375,6 +369,7 @@ onMounted(async () => {
:model-value="fieldFilter.selectedField" :model-value="fieldFilter.selectedField"
:options="moreFields" :options="moreFields"
option-label="label" option-label="label"
option-value="label"
dense dense
outlined outlined
rounded rounded

1
src/pages/Item/ItemRequestFilter.vue
View File

@ -149,7 +149,6 @@ onMounted(async () => {
:label="t('params.requesterFk')" :label="t('params.requesterFk')"
v-model="params.requesterFk" v-model="params.requesterFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
:fields="['id', 'name']"
:params="{ departmentCodes: ['VT'] }" :params="{ departmentCodes: ['VT'] }"
hide-selected hide-selected
dense dense

8
src/pages/Monitor/Ticket/MonitorTickets.vue
View File

@ -110,15 +110,13 @@ const columns = computed(() => [
name: 'salesPersonFk', name: 'salesPersonFk',
field: 'userName', field: 'userName',
align: 'left', align: 'left',
optionFilter: 'firstName',
columnFilter: { columnFilter: {
component: 'select', component: 'select',
attrs: { attrs: {
url: 'Workers/activeWithInheritedRole', url: 'Workers/search?departmentCodes=["VT"]',
fields: ['id', 'name'], fields: ['id', 'name', 'nickname', 'code'],
sortBy: 'nickname ASC', sortBy: 'nickname ASC',
where: { role: 'salesPerson' }, optionLabel: 'nickname',
useLike: false,
}, },
jtubau commented 2024-12-26 09:54:15 +00:00
Review
Copy Link

Esto soluciona la discrepancia entre el filtro del rightmenu y el de cabezera del salesperson.
https://redmine.verdnatura.es/issues/8337

Esto soluciona la discrepancia entre el filtro del rightmenu y el de cabezera del salesperson. https://redmine.verdnatura.es/issues/8337
}, },
}, },

1
src/pages/Order/Card/OrderFilter.vue
View File

@ -97,6 +97,7 @@ const sourceList = ref([]);
v-model="params.sourceApp" v-model="params.sourceApp"
:options="sourceList" :options="sourceList"
option-label="value" option-label="value"
option-value="value"
dense dense
outlined outlined
rounded rounded

10
src/pages/Ticket/TicketFilter.vue
View File

@ -101,7 +101,7 @@ const getGroupedStates = (data) => {
<QSkeleton type="QInput" class="full-width" /> <QSkeleton type="QInput" class="full-width" />
</QItemSection> </QItemSection>
<QItemSection v-if="states"> <QItemSection v-if="states">
<QSelect <VnSelect
:label="t('State')" :label="t('State')"
v-model="params.stateFk" v-model="params.stateFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -122,7 +122,7 @@ const getGroupedStates = (data) => {
<QSkeleton type="QInput" class="full-width" /> <QSkeleton type="QInput" class="full-width" />
</QItemSection> </QItemSection>
<QItemSection v-if="groupedStates"> <QItemSection v-if="groupedStates">
<QSelect <VnSelect
:label="t('Grouped state')" :label="t('Grouped state')"
v-model="params.groupedStates" v-model="params.groupedStates"
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -217,7 +217,7 @@ const getGroupedStates = (data) => {
<QSkeleton type="QInput" class="full-width" /> <QSkeleton type="QInput" class="full-width" />
</QItemSection> </QItemSection>
<QItemSection v-if="provinces"> <QItemSection v-if="provinces">
<QSelect <VnSelect
:label="t('Province')" :label="t('Province')"
v-model="params.provinceFk" v-model="params.provinceFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -238,7 +238,7 @@ const getGroupedStates = (data) => {
<QSkeleton type="QInput" class="full-width" /> <QSkeleton type="QInput" class="full-width" />
</QItemSection> </QItemSection>
<QItemSection v-if="agencies"> <QItemSection v-if="agencies">
<QSelect <VnSelect
:label="t('Agency')" :label="t('Agency')"
v-model="params.agencyModeFk" v-model="params.agencyModeFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -259,7 +259,7 @@ const getGroupedStates = (data) => {
<QSkeleton type="QInput" class="full-width" /> <QSkeleton type="QInput" class="full-width" />
</QItemSection> </QItemSection>
<QItemSection v-if="warehouses"> <QItemSection v-if="warehouses">
<QSelect <VnSelect
:label="t('Warehouse')" :label="t('Warehouse')"
v-model="params.warehouseFk" v-model="params.warehouseFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"

16
src/pages/Travel/ExtraCommunityFilter.vue
View File

@ -221,7 +221,20 @@ warehouses();
dense dense
outlined outlined
rounded rounded
/> >
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>
{{ scope.opt?.name}}
</QItemLabel>
<QItemLabel caption>
{{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelect>
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem> <QItem>
@ -232,6 +245,7 @@ warehouses();
:options="continentsOptions" :options="continentsOptions"
option-value="code" option-value="code"
option-label="name" option-label="name"
:filter-options="['code', 'name']"
hide-selected hide-selected
dense dense
outlined outlined

6
src/pages/Travel/TravelFilter.vue
View File

@ -140,10 +140,10 @@ en:
Id: Contains Id: Contains
ref: Reference ref: Reference
agency: Agency agency: Agency
warehouseInFk: W. In warehouseInFk: Warehouse In
shipped: Shipped shipped: Shipped
shipmentHour: Shipment Hour shipmentHour: Shipment Hour
warehouseOut: W. Out warehouseOut: Warehouse Out
landed: Landed landed: Landed
landingHour: Landing Hour landingHour: Landing Hour
totalEntries: Σ totalEntries: Σ
@ -156,7 +156,7 @@ es:
warehouseInFk: Alm.Entrada warehouseInFk: Alm.Entrada
shipped: F.Envío shipped: F.Envío
shipmentHour: Hora de envío shipmentHour: Hora de envío
warehouseOut: Alm.Entrada warehouseOut: Alm.Salida
landed: F.Entrega landed: F.Entrega
landingHour: Hora de entrega landingHour: Hora de entrega
totalEntries: Σ totalEntries: Σ