fix: changes in list and filter to fix section
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
parent
222e83cad8
commit
bd3de77cbd
|
@ -20,11 +20,33 @@ const provinces = ref([]);
|
||||||
const states = ref([]);
|
const states = ref([]);
|
||||||
const agencies = ref([]);
|
const agencies = ref([]);
|
||||||
const warehouses = ref([]);
|
const warehouses = ref([]);
|
||||||
|
const alertLevels = ref([]);
|
||||||
|
const groupedStates = ref([]);
|
||||||
|
|
||||||
|
const getGroupedStates = () => {
|
||||||
|
for (const state of alertLevels.value) {
|
||||||
|
groupedStates.value.push({
|
||||||
|
id: state.id,
|
||||||
|
name: t(`${state.code}`),
|
||||||
|
code: state.code,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
console.log(groupedStates.value);
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<FetchData url="Provinces" @on-fetch="(data) => (provinces = data)" auto-load />
|
<FetchData url="Provinces" @on-fetch="(data) => (provinces = data)" auto-load />
|
||||||
<FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
|
<FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
|
||||||
|
<FetchData
|
||||||
|
url="AlertLevels"
|
||||||
|
@on-fetch="
|
||||||
|
(data) => {
|
||||||
|
(alertLevels = data), getGroupedStates();
|
||||||
|
}
|
||||||
|
"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
<FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
|
<FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
|
||||||
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
|
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
|
||||||
<FetchData
|
<FetchData
|
||||||
|
@ -100,12 +122,35 @@ const warehouses = ref([]);
|
||||||
option-label="name"
|
option-label="name"
|
||||||
emit-value
|
emit-value
|
||||||
map-options
|
map-options
|
||||||
|
use-input
|
||||||
dense
|
dense
|
||||||
outlined
|
outlined
|
||||||
rounded
|
rounded
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
<QItem>
|
||||||
|
<QItemSection v-if="!alertLevels">
|
||||||
|
<QSkeleton type="QInput" class="full-width" />
|
||||||
|
</QItemSection>
|
||||||
|
<QItemSection v-if="alertLevels">
|
||||||
|
<QSelect
|
||||||
|
:label="t('Grouped state')"
|
||||||
|
v-model="params.groupedStates"
|
||||||
|
@update:model-value="searchFn()"
|
||||||
|
:options="groupedStates"
|
||||||
|
option-value="id"
|
||||||
|
option-label="name"
|
||||||
|
emit-value
|
||||||
|
map-options
|
||||||
|
use-input
|
||||||
|
dense
|
||||||
|
outlined
|
||||||
|
rounded
|
||||||
|
sort-by="name ASC"
|
||||||
|
/>
|
||||||
|
</QItemSection>
|
||||||
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<VnInput
|
<VnInput
|
||||||
|
@ -124,6 +169,15 @@ const warehouses = ref([]);
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
<QItem>
|
||||||
|
<QItemSection>
|
||||||
|
<VnInput
|
||||||
|
v-model="params.nickname"
|
||||||
|
:label="t('Nickname')"
|
||||||
|
is-outlined
|
||||||
|
/>
|
||||||
|
</QItemSection>
|
||||||
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
|
@ -186,6 +240,7 @@ const warehouses = ref([]);
|
||||||
option-label="name"
|
option-label="name"
|
||||||
emit-value
|
emit-value
|
||||||
map-options
|
map-options
|
||||||
|
use-input
|
||||||
dense
|
dense
|
||||||
outlined
|
outlined
|
||||||
rounded
|
rounded
|
||||||
|
@ -206,6 +261,7 @@ const warehouses = ref([]);
|
||||||
option-label="name"
|
option-label="name"
|
||||||
emit-value
|
emit-value
|
||||||
map-options
|
map-options
|
||||||
|
use-input
|
||||||
dense
|
dense
|
||||||
outlined
|
outlined
|
||||||
rounded
|
rounded
|
||||||
|
@ -226,12 +282,22 @@ const warehouses = ref([]);
|
||||||
option-label="name"
|
option-label="name"
|
||||||
emit-value
|
emit-value
|
||||||
map-options
|
map-options
|
||||||
|
use-input
|
||||||
dense
|
dense
|
||||||
outlined
|
outlined
|
||||||
rounded
|
rounded
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
<QItem>
|
||||||
|
<QItemSection>
|
||||||
|
<VnInput
|
||||||
|
v-model="params.collectionFk"
|
||||||
|
:label="t('Collection')"
|
||||||
|
is-outlined
|
||||||
|
/>
|
||||||
|
</QItemSection>
|
||||||
|
</QItem>
|
||||||
</QExpansionItem>
|
</QExpansionItem>
|
||||||
</template>
|
</template>
|
||||||
</VnFilterPanel>
|
</VnFilterPanel>
|
||||||
|
@ -255,6 +321,11 @@ en:
|
||||||
provinceFk: Province
|
provinceFk: Province
|
||||||
agencyModeFk: Agency
|
agencyModeFk: Agency
|
||||||
warehouseFk: Warehouse
|
warehouseFk: Warehouse
|
||||||
|
FREE: Free
|
||||||
|
ON_PREPARATION: On preparation
|
||||||
|
PACKED: Packed
|
||||||
|
DELIVERED: Delivered
|
||||||
|
ON_PREVIOUS: ON_PREVIOUS
|
||||||
es:
|
es:
|
||||||
params:
|
params:
|
||||||
search: Contiene
|
search: Contiene
|
||||||
|
@ -288,4 +359,12 @@ es:
|
||||||
Yes: Si
|
Yes: Si
|
||||||
No: No
|
No: No
|
||||||
Days onward: Días adelante
|
Days onward: Días adelante
|
||||||
|
Grouped state: Estado agrupado
|
||||||
|
FREE: Libre
|
||||||
|
ON_PREPARATION: En preparación
|
||||||
|
PACKED: Encajado
|
||||||
|
DELIVERED: Servido
|
||||||
|
ON_PREVIOUS: ON_PREVIOUS
|
||||||
|
Collection: Colección
|
||||||
|
Nickname: Nombre mostrado
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
|
@ -548,7 +548,7 @@ function setReference(data) {
|
||||||
</template>
|
</template>
|
||||||
<template #column-salesPersonFk="{ row }">
|
<template #column-salesPersonFk="{ row }">
|
||||||
<span class="link" @click.stop>
|
<span class="link" @click.stop>
|
||||||
{{ row.salesPerson }}
|
{{ row.userName }}
|
||||||
<CustomerDescriptorProxy :id="row.salesPersonFk" />
|
<CustomerDescriptorProxy :id="row.salesPersonFk" />
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
Loading…
Reference in New Issue