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

fix/OrderCatalog #893

Merged
jsegarra merged 11 commits from wbuezas/salix-front-mindshore-fork2:fix/OrderCatalog into dev 2024-11-12 12:01:43 +00:00
Conversation 0 Commits 11 Files Changed 6 +37 -19
2 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3825dc3851 - Show all commits

43
src/pages/Order/Card/CatalogFilterValueDialog.vue
View File

@ -63,6 +63,15 @@ const getSelectedTagValues = async (tag) => {
<template>
<QForm @submit="applyTags(tagValues)" class="all-pointer-events">
<QCard class="q-pa-sm column q-pa-lg">
<QBtn
round
color="primary"
style="position: absolute; z-index: 1; right: 0; top: 0"
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-11-07 06:55:30 +00:00
Outdated
Review
Copy Link

porque pones un valor por defecto si ya tiene el default?

porque pones un valor por defecto si ya tiene el default?
wbuezas commented 2024-11-07 22:07:53 +00:00
Outdated
Review
Copy Link

Buena observación, había quedado de antes que componentice esta parte.

Commit: 498a52a3e5

Buena observación, había quedado de antes que componentice esta parte. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/498a52a3e5a78c4e8c8f7c58a3cc4b655ca33cac
icon="search"
type="submit"
>
</QBtn>
<VnSelect
:label="t('params.tag')"
v-model="selectedTag"
@ -77,6 +86,16 @@ const getSelectedTagValues = async (tag) => {
use-input
@update:model-value="($event) => getSelectedTagValues($event)"
/>
<QBtn
icon="add_circle"
shortcut="+"
flat
class="filter-icon q-mb-md"
size="md"
dense
:disabled="!selectedTag || !tagValues[0].value"
@click="tagValues.unshift({})"
/>
<div
v-for="(value, index) in tagValues"
:key="value"
@ -95,7 +114,7 @@ const getSelectedTagValues = async (tag) => {
rounded
emit-value
use-input
:disable="!value"
:disable="!value || !selectedTag"
:is-clearable="false"
class="col"
/>
@ -108,25 +127,19 @@ const getSelectedTagValues = async (tag) => {
:is-clearable="false"
class="col"
/>
<QIcon
name="delete"
<QBtn
icon="delete"
size="md"
outlined
dense
rounded
flat
class="filter-icon col-2"
:disabled="!value.value"
@click="removeTagGroupParam(index)"
/>
</div>
</div>
<QBtn
icon="add_circle"
shortcut="+"
flat
class="filter-icon q-mb-md"
size="md"
dense
@click="tagValues.push({})"
/>
<QBtn color="primary" type="submit">
{{ t('search') }}
</QBtn>
</QCard>
</QForm>
</template>

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

@ -35,6 +35,7 @@ const arrayData = useArrayData(props.dataKey);
const categoryList = ref(null);
const selectedCategoryFk = ref(null);
const typeList = ref([]);
const tagsValues = ref([]);
const selectedTypeFk = ref(null);
const generalSearchParam = ref(null);
@ -289,9 +290,12 @@ onMounted(() => {
<QSeparator />
<QItem class="q-mt-lg">
<VnInput
<VnSelect
:label="t('components.itemsFilterPanel.value')"
is-outlined
:options="props.tagValue"
dense
outlined
rounded
:is-clearable="false"
v-model="generalSearchParam"
@keyup.enter="
@ -305,7 +309,7 @@ onMounted(() => {
<template #prepend>
<QIcon name="search" />
</template>
<template #append>
<template #after>
<QBtn
icon="add_circle"
shortcut="+"
@ -315,6 +319,7 @@ onMounted(() => {
/>
<QPopupProxy>
<CatalogFilterValueDialog
style="display: inline-block"
:tags="tags"
@apply-tags="
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-11-07 06:58:34 +00:00
Outdated
Review
Copy Link

Prueba con QPopupProxy mejor que dialogo porque así se abre en la misma región y no hay que mover tanto el ratón y vista.
También nos facilita copiar y pegar valores

Prueba con QPopupProxy mejor que dialogo porque así se abre en la misma región y no hay que mover tanto el ratón y vista. También nos facilita copiar y pegar valores
wbuezas commented 2024-11-07 22:16:42 +00:00
Outdated
Review
Copy Link

Coincido, QPopupProxy aplicado.

Commit: 52a2250acc

Coincido, `QPopupProxy` aplicado. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/52a2250acc721f80a9a5e5d85dd4b9bad99ea1df
($event) => applyTags($event, params, searchFn)
@ -322,7 +327,7 @@ onMounted(() => {
/>
</QPopupProxy>
</template>
</VnInput>
</VnSelect>
</QItem>
<QSeparator />
</template>