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

7336_devToTest #354

Merged
alexm merged 359 commits from 7336_devToTest into test 2024-05-07 06:34:00 +00:00
Conversation 0 Commits 359 Files Changed 230 +15 -13
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4792485214 - Show all commits

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

@ -6,7 +6,7 @@ import { useStateStore } from 'stores/useStateStore';
import FetchData from 'components/FetchData.vue'; import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue'; import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnSelectFilter from 'src/components/common/VnSelectFilter.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import { QCheckbox } from 'quasar'; import { QCheckbox } from 'quasar';
@ -119,10 +119,12 @@ onMounted(async () => {
const _moreFields = ['id', 'description', 'name', 'isActive']; const _moreFields = ['id', 'description', 'name', 'isActive'];
_moreFields.forEach((field) => { _moreFields.forEach((field) => {
console.log(field);
let prop = properties[field]; let prop = properties[field];
const label = t(`params.${field}`);
moreFields.value.push({ moreFields.value.push({
name: field, name: field,
label: prop ? prop.description : field, label,
type: prop ? prop.type : null, type: prop ? prop.type : null,
}); });
}); });
@ -183,7 +185,7 @@ onMounted(async () => {
</QItem> </QItem>
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnSelectFilter <VnSelect
:label="t('params.categoryFk')" :label="t('params.categoryFk')"
v-model="params.categoryFk" v-model="params.categoryFk"
@update:model-value=" @update:model-value="
@ -201,7 +203,7 @@ onMounted(async () => {
</QItem> </QItem>
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnSelectFilter <VnSelect
:label="t('params.typeFk')" :label="t('params.typeFk')"
v-model="params.typeFk" v-model="params.typeFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -223,12 +225,12 @@ onMounted(async () => {
</QItemSection> </QItemSection>
</QItem> </QItem>
</template> </template>
</VnSelectFilter> </VnSelect>
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnSelectFilter <VnSelect
:label="t('params.buyerFk')" :label="t('params.buyerFk')"
v-model="params.buyerFk" v-model="params.buyerFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -244,7 +246,7 @@ onMounted(async () => {
</QItem> </QItem>
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnSelectFilter <VnSelect
:label="t('params.supplierFk')" :label="t('params.supplierFk')"
v-model="params.supplierFk" v-model="params.supplierFk"
@update:model-value="searchFn()" @update:model-value="searchFn()"
@ -265,7 +267,7 @@ onMounted(async () => {
</QItemSection> </QItemSection>
</QItem> </QItem>
</template> </template>
</VnSelectFilter> </VnSelect>
</QItemSection> </QItemSection>
</QItem> </QItem>
<!-- Tags filter --> <!-- Tags filter -->
@ -287,7 +289,7 @@ onMounted(async () => {
class="row items-center" class="row items-center"
> >
<QItemSection class="col"> <QItemSection class="col">
<VnSelectFilter <VnSelect
:label="t('params.tag')" :label="t('params.tag')"
v-model="tag.selectedTag" v-model="tag.selectedTag"
:options="tagOptions" :options="tagOptions"
@ -302,7 +304,7 @@ onMounted(async () => {
/> />
</QItemSection> </QItemSection>
<QItemSection class="col"> <QItemSection class="col">
<VnSelectFilter <VnSelect
v-if="!tag?.selectedTag?.isFree && tag.valueOptions" v-if="!tag?.selectedTag?.isFree && tag.valueOptions"
:label="t('params.tag')" :label="t('params.tag')"
v-model="tag.value" v-model="tag.value"
@ -355,7 +357,7 @@ onMounted(async () => {
class="row items-center" class="row items-center"
> >
<QItemSection class="col"> <QItemSection class="col">
<VnSelectFilter <VnSelect
:label="t('params.tag')" :label="t('params.tag')"
v-model="fieldFilter.name" v-model="fieldFilter.name"
:options="moreFields" :options="moreFields"
@ -427,7 +429,7 @@ en:
isActive: Active isActive: Active
description: Description description: Description
name: Name name: Name
id: ID id: Id
es: es:
More fields: Más campos More fields: Más campos
params: params:
@ -443,5 +445,5 @@ es:
isActive: Activo isActive: Activo
description: Descripción description: Descripción
name: Nombre name: Nombre
id: ID id: Id
</i18n> </i18n>