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

8231_testToMaster_2448 #997

Merged
alexm merged 400 commits from 8231_testToMaster_2448 into master 2024-11-26 06:28:29 +00:00
Conversation 2 Commits 400 Files Changed 268 +8 -14
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 52a2250acc - Show all commits

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

@ -29,7 +29,6 @@ const props = defineProps({
}, },
}); });
const showValueFilterDialog = ref(false);
const categoryList = ref(null); const categoryList = ref(null);
const selectedCategoryFk = ref(null); const selectedCategoryFk = ref(null);
const typeList = ref([]); const typeList = ref([]);
@ -104,14 +103,12 @@ const applyTags = (tagInfo, params, search) => {
if (!tagInfo || !tagInfo.values.length) { if (!tagInfo || !tagInfo.values.length) {
params.tagGroups = null; params.tagGroups = null;
search(); search();
toggleValueFilterDialog();
return; return;
} }
if (!params.tagGroups) params.tagGroups = []; if (!params.tagGroups) params.tagGroups = [];
params.tagGroups.push(tagInfo); params.tagGroups.push(tagInfo);
search(); search();
toggleValueFilterDialog();
}; };
const removeTagGroupParam = (params, search, valIndex = null) => { const removeTagGroupParam = (params, search, valIndex = null) => {
@ -149,10 +146,6 @@ function addOrder(value, field, params) {
vnFilterPanelRef.value.search(); vnFilterPanelRef.value.search();
} }
const toggleValueFilterDialog = () => {
showValueFilterDialog.value = !showValueFilterDialog.value;
};
onMounted(() => { onMounted(() => {
selectedCategoryFk.value = getParamWhere(route, 'categoryFk'); selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
selectedTypeFk.value = getParamWhere(route, 'typeFk'); selectedTypeFk.value = getParamWhere(route, 'typeFk');
@ -315,18 +308,19 @@ onMounted(() => {
flat flat
color="primary" color="primary"
size="md" size="md"
@click="toggleValueFilterDialog()"
/> />
<QPopupProxy>
<CatalogFilterValueDialog
:tags="tags"
@apply-tags="
($event) => applyTags($event, params, searchFn)
"
/>
</QPopupProxy>
</template> </template>
</VnInput> </VnInput>
</QItem> </QItem>
<QSeparator /> <QSeparator />
<QDialog v-model="showValueFilterDialog">
<CatalogFilterValueDialog
:tags="tags"
@apply-tags="($event) => applyTags($event, params, searchFn)"
/>
</QDialog>
</template> </template>
</VnFilterPanel> </VnFilterPanel>
</template> </template>