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

#6896 fix Order module problems #817

Merged
jon merged 18 commits from Fix_OrderModuleProblems into dev 2024-10-29 11:20:14 +00:00
Conversation 0 Commits 18 Files Changed 9 +50 -63
1 changed files with 50 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1346a2e7fd - Show all commits

113
src/pages/Order/Card/OrderCatalogFilter.vue
View File

@ -6,8 +6,8 @@ import axios from 'axios';
import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnSelect from 'components/common/VnSelect.vue';
// import VnInput from 'src/components/common/VnInput.vue';
import getParamWhere from 'src/filters/getParamWhere';
import VnFilterPanelChip from 'src/components/ui/VnFilterPanelChip.vue';
const { t } = useI18n();
@ -49,6 +49,7 @@ const orderWaySelected = ref('ASC');
const routeQuery = JSON.parse(route?.query.params ?? '{}');
const paramsSearch = ref({});
jon marked this conversation as resolved Outdated
jsegarra commented 2024-10-10 09:07:23 +00:00
Outdated
Review
Copy Link

puede confundirse con la variable de la 189

puede confundirse con la variable de la 189
const tagData = ref([]);
onMounted(() => {
jon marked this conversation as resolved Outdated
jsegarra commented 2024-10-10 09:03:41 +00:00
Outdated
Review
Copy Link

si solo lo usas una vez porque no eliminas esta variable y lo pones en la siguiente linea? si tampoco haces ninguna validación

si solo lo usas una vez porque no eliminas esta variable y lo pones en la siguiente linea? si tampoco haces ninguna validación
paramsSearch.value = JSON.parse(routeQuery.filter ?? '{}')?.where ?? {};
@ -120,32 +121,6 @@ const selectedType = computed(() => {
return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
});
// const applyTagFilter = (params, search) => {
// if (params.tagGroups) params.tagGroups = null;
// if (!tagValues.value?.length) {
// params.tagGroups = null;
// search();
// return;
// }
// if (!params.tagGroups) {
// params.tagGroups = [];
// }
// params.tagGroups.push(
// JSON.stringify({
// values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
// tagSelection: {
// ...selectedTag.value,
// orgShowField: selectedTag?.value?.name,
// },
// tagFk: selectedTag?.value?.tagFk,
// })
// );
// search();
// selectedTag.value = null;
// tagValues.value = [{}];
// };
const applyTagFilter = (params, search) => {
if (!tagValues.value?.length) {
params.tagGroups = null;
@ -153,27 +128,46 @@ const applyTagFilter = (params, search) => {
return;
}
if (!params.tagGroups) {
if (!params.tagGroups || typeof params.tagGroups === 'string') {
params.tagGroups = [];
} else if (typeof params.tagGroups === 'string') {
params.tagGroups = [params.tagGroups];
}
const newTagGroup = JSON.stringify({
values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
tagSelection: {
...selectedTag.value,
orgShowField: selectedTag?.value?.name,
},
tagFk: selectedTag?.value?.tagFk,
});
params.tagGroups.push(newTagGroup);
params.tagGroups.push(
JSON.stringify({
values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
tagSelection: {
...selectedTag.value,
orgShowField: selectedTag?.value?.name,
},
tagFk: selectedTag?.value?.tagFk,
})
);
tagData.value.push(JSON.parse(params.tagGroups[params.tagGroups.length - 1]));
search();
selectedTag.value = null;
tagValues.value = [{}];
};
const removeTagChip = (selection, params, search) => {
if (typeof params.tagGroups === 'string') {
try {
params.tagGroups = JSON.parse(params.tagGroups);
} catch (error) {
console.error('Error parsing tagGroups:', error);
params.tagGroups = [];
}
}
console.log('params.tagGroups: ', params.tagGroups);
console.log('selection: ', selection);
if (Array.isArray(params.tagGroups)) {
params.tagGroups = params.tagGroups.filter((value) => value !== selection);
}
search();
};
const setCategoryList = (data) => {
categoryList.value = (data || [])
.filter((category) => category.display)
@ -198,22 +192,6 @@ function addOrder(value, field, params) {
params.orderBy = JSON.stringify(orderBy);
vnFilterPanelRef.value.search();
}
const data = ref([]);
function getTagData(value) {
if (Array.isArray(value) && value.length >= 1) {
const parsedTags = value.map((obj) => JSON.parse(obj));
if (parsedTags.length === 1) {
data.value = parsedTags[0];
} else {
data.value = parsedTags;
}
} else {
data.value = JSON.parse(value);
}
}
</script>
<template>
@ -224,29 +202,37 @@ function getTagData(value) {
v-model="paramsSearch"
:redirect="false"
:hidden-tags="['orderFk', 'orderBy', 'filter', 'search', 'or', 'and']"
:custom-tags="['tagGroups']"
:unremovable-params="['orderFk', 'orderBy']"
:disable-submit-event="true"
>
<template #tags="{ tag, formatFn }">
{{ console.log('tag.label: ', tag.label) }}
<strong v-if="tag.label === 'categoryFk'">
{{ t(selectedCategory?.name || '') }}
</strong>
<strong v-else-if="tag.label === 'typeFk'">
{{ t(selectedType?.name || '') }}
</strong>
<div v-else-if="tag.label === 'tagGroups'" class="q-gutter-x-xs">
{{ getTagData(tag.value) }}
<strong> {{ data.tagSelection?.name }}: </strong>
<span>
{{ console.log('data', data.values) }}
</span>
</div>
<div v-else class="q-gutter-x-xs">
<strong>{{ t(`params.${tag.label}`) }}: </strong>
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
<template #customTags="{ tags: customTags, params, searchFn }">
<template v-for="tag in customTags" :key="tag.label">
<template v-if="tag.label === 'tagGroups'">
<VnFilterPanelChip
v-for="chip in tagData"
:key="chip"
removable
@remove="removeTagChip(chip, params, searchFn)"
>
<strong>{{ chip.tagSelection?.name }}: </strong>
<span>{{ chip.values[0].value }}</span>
</VnFilterPanelChip>
</template>
</template>
</template>
<template #body="{ params, searchFn }">
<QItem class="category-filter q-mt-md">
<div
@ -410,6 +396,7 @@ function getTagData(value) {
icon="add_circle"
shortcut="+"
flat
size="md"
class="filter-icon"
@click="tagValues.push({})"
/>