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

Merge pull request '#7273 fixItemTags' (!895) from 7273-fixItemTags into dev
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #895
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Jorge Penadés 2024-11-05 11:56:14 +00:00
parent 9ee05721a4 9959fbf005
commit ec88bcbc44
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/pages/Item/Card/ItemTags.vue
View File

@ -109,7 +109,11 @@ const insertTag = (rows) => {
> >
<template #body="{ rows, validate }"> <template #body="{ rows, validate }">
<QCard class="q-px-lg q-pt-md q-pb-sm"> <QCard class="q-px-lg q-pt-md q-pb-sm">
<VnRow v-for="(row, index) in rows" :key="index"> <VnRow
v-for="(row, index) in rows"
:key="index"
class="items-center"
>
<VnSelect <VnSelect
:label="t('itemTags.tag')" :label="t('itemTags.tag')"
:options="tagOptions" :options="tagOptions"
@ -153,13 +157,14 @@ const insertTag = (rows) => {
:required="true" :required="true"
:rules="validate('itemTag.priority')" :rules="validate('itemTag.priority')"
/> />
<div class="row justify-center items-center" style="flex: 0"> <div class="row justify-center" style="flex: 0">
<QIcon <QIcon
@click="itemTagsRef.remove([row])" @click="itemTagsRef.remove([row])"
class="fill-icon-on-hover" class="fill-icon-on-hover"
color="primary" color="primary"
name="delete" name="delete"
size="sm" size="sm"
dense
> >
<QTooltip> <QTooltip>
{{ t('itemTags.removeTag') }} {{ t('itemTags.removeTag') }}
@ -167,22 +172,20 @@ const insertTag = (rows) => {
</QIcon> </QIcon>
</div> </div>
</VnRow> </VnRow>
<VnRow class="justify-center items-center">
<QBtn
@click="insertTag(rows)"
class="cursor-pointer"
color="primary"
flat
icon="add"
shortcut="+"
style="flex: 0"
>
<QTooltip>
{{ t('itemTags.addTag') }}
</QTooltip>
</QBtn>
</VnRow>
</QCard> </QCard>
<QPageSticky position="bottom-right" :offset="[25, 25]">
<QBtn
@click="insertTag(rows)"
color="primary"
icon="add"
shortcut="+"
fab
>
<QTooltip>
{{ t('itemTags.addTag') }}
</QTooltip>
</QBtn>
</QPageSticky>
</template> </template>
</CrudModel> </CrudModel>
</QPage> </QPage>

8
src/pages/Item/ItemList.vue
View File

@ -12,6 +12,8 @@ import ItemSummary from '../Item/Card/ItemSummary.vue';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue'; import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
import { cloneItem } from 'src/pages/Item/composables/cloneItem'; import { cloneItem } from 'src/pages/Item/composables/cloneItem';
import RightMenu from 'src/components/common/RightMenu.vue';
import ItemListFilter from './ItemListFilter.vue';
const entityId = computed(() => route.params.id); const entityId = computed(() => route.params.id);
const { openCloneDialog } = cloneItem(); const { openCloneDialog } = cloneItem();
@ -311,6 +313,11 @@ const columns = computed(() => [
:label="t('item.searchbar.label')" :label="t('item.searchbar.label')"
:info="t('You can search by id')" :info="t('You can search by id')"
/> />
<RightMenu>
<template #right-panel>
<ItemListFilter data-key="ItemList" />
</template>
</RightMenu>
<VnTable <VnTable
ref="tableRef" ref="tableRef"
data-key="ItemList" data-key="ItemList"
@ -329,6 +336,7 @@ const columns = computed(() => [
auto-load auto-load
redirect="Item" redirect="Item"
:is-editable="false" :is-editable="false"
:right-search="false"
:filer="itemFilter" :filer="itemFilter"
> >
<template #column-id="{ row }"> <template #column-id="{ row }">