wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

updates

This commit is contained in:
Javier Segarra 2024-07-23 15:09:42 +02:00
parent ce6a94bab8
commit 1ac0a85969
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/ui/VnFilterPanel.vue
View File

@ -95,8 +95,8 @@ watch(
); );
watch( watch(
() => arrayData.store.userParams, () => [store.userParams, store.userFilter],
(val) => setUserParams(val) ([userParams, userFilter]) => setUserParams({ ...userParams, filter: userFilter })
); );
watch( watch(

22
src/pages/Order/Card/OrderCatalog.vue
View File

@ -54,17 +54,17 @@ function extractValueTags(items) {
<template> <template>
<!-- TODO Sobreescribir la barra de búsqueda --> <!-- TODO Sobreescribir la barra de búsqueda -->
<Teleport to="#searchbar"> <!-- <Teleport to="#searchbar"> -->
<VnSearchbar <VnSearchbar
data-key="OrderCatalogList" data-key="OrderCatalogList"
:user-params="catalogParams" :user-params="catalogParams"
:static-params="['orderFk', 'orderBy']" :static-params="['orderFk', 'orderBy']"
:redirect="false" :redirect="false"
url="Orders/CatalogFilter" url="Orders/CatalogFilter"
:label="t('Search items')" :label="t('Search items')"
:info="t('You can search orders by reference')" :info="t('You can search orders by reference')"
/> />
</Teleport> <!-- </Teleport> -->
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above> <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
<QScrollArea class="fit text-grey-8"> <QScrollArea class="fit text-grey-8">
<OrderCatalogFilter <OrderCatalogFilter

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

@ -29,7 +29,7 @@ const props = defineProps({
}); });
const categoryList = ref(null); const categoryList = ref(null);
const selectedCategoryFk = ref(null); const selectedCategoryFk = ref(null);
const typeList = ref(null); const typeList = ref([]);
const selectedTypeFk = ref(null); const selectedTypeFk = ref(null);
const validationsStore = useValidator(); const validationsStore = useValidator();
const selectedOrder = ref(null); const selectedOrder = ref(null);
@ -165,7 +165,8 @@ const onOrderFieldChange = (value, params) => {
break; break;
} }
}; };
const getCategory = (fk) =>
(categoryList.value || []).find((category) => category?.id === fk);
const _moreFields = ['ASC', 'DESC']; const _moreFields = ['ASC', 'DESC'];
const _moreFieldsTypes = ['Relevancy', 'ColorAndPrice', 'Name', 'Price']; const _moreFieldsTypes = ['Relevancy', 'ColorAndPrice', 'Name', 'Price'];
const setCategoryList = (data) => { const setCategoryList = (data) => {
@ -177,6 +178,13 @@ const setCategoryList = (data) => {
})); }));
moreFields.value = useLang(_moreFields); moreFields.value = useLang(_moreFields);
moreFieldsOrder.value = useLang(_moreFieldsTypes); moreFieldsOrder.value = useLang(_moreFieldsTypes);
const { categoryFk } = JSON.parse(JSON.parse(route.query.params).filter).where;
if (!selectedCategoryFk.value) {
selectedCategoryFk.value = categoryFk;
selectedCategory.value = getCategory(categoryFk);
loadTypes(categoryFk);
}
}; };
const getCategoryClass = (category, params) => { const getCategoryClass = (category, params) => {