7336_devToTest #354

Merged
alexm merged 359 commits from 7336_devToTest into test 2024-05-07 06:34:00 +00:00
1 changed files with 15 additions and 13 deletions
Showing only changes of commit 4792485214 - Show all commits

View File

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