Merge pull request '#7283: Fix Item module' (!1042) from Fix-Items-Module into dev

Reviewed-on: #1042 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-12-09 12:29:54 +00:00 · 2024-12-09 12:29:54 +00:00 · 91afc3ddab
parent bf68eab480 d4682248fd
commit 91afc3ddab
39 changed files with 259 additions and 260 deletions
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -610,6 +610,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                                    $props.rowClick && $props.rowClick(row);
                                }
                            "
+                            style="height: 100%"
                        >
                            <QCardSection
                                vertical
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@ -238,6 +238,7 @@ async function openPointRecord(id, modelLog) {
    pointRecord.value = parseProps(propNames, locale, data);
 }
 async function setLogTree(data) {
+    if (!data) return;
    logTree.value = getLogTree(data);
 }

--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@ -61,6 +61,7 @@ const emit = defineEmits([
    'update:modelValue',
    'refresh',
    'clear',
+    'search',
    'init',
    'remove',
    'setUserParams',
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -398,8 +398,8 @@ entry:
        buys: Buys
        stickers: Stickers
        package: Package
-        packing: Packing
-        grouping: Grouping
+        packing: Pack.
+        grouping: Group.
        buyingValue: Buying value
        import: Import
        pvp: PVP
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -401,8 +401,8 @@ entry:
        buys: Compras
        stickers: Etiquetas
        package: Embalaje
-        packing: Packing
-        grouping: Grouping
+        packing: Pack.
+        grouping: Group.
        buyingValue: Coste
        import: Importe
        pvp: PVP
--- a/src/pages/Account/AccountFilter.vue
+++ b/src/pages/Account/AccountFilter.vue
@ -31,7 +31,6 @@ const rolesOptions = ref([]);
    <VnFilterPanel
        :data-key="props.dataKey"
        :search-button="true"
-        :hidden-tags="['search']"
        :redirect="false"
        search-url="table"
    >
--- a/src/pages/Account/Acls/AclFilter.vue
+++ b/src/pages/Account/Acls/AclFilter.vue
@ -37,11 +37,7 @@ onBeforeMount(() => {
        @on-fetch="(data) => (rolesOptions = data)"
        auto-load
    />
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        :hidden-tags="['search']"
-    >
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
        <template #tags="{ tag, formatFn }">
            <div class="q-gutter-x-xs">
                <strong>{{ t(`acls.aclFilter.${tag.label}`) }}: </strong>
--- a/src/pages/Account/Role/AccountRolesFilter.vue
+++ b/src/pages/Account/Role/AccountRolesFilter.vue
@ -13,12 +13,7 @@ const props = defineProps({
 </script>

 <template>
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        :hidden-tags="['search']"
-        :redirect="false"
-    >
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" :redirect="false">
        <template #tags="{ tag, formatFn }">
            <div class="q-gutter-x-xs">
                <strong>{{ t(`role.${tag.label}`) }}: </strong>
--- a/src/pages/Item/Card/ItemBarcode.vue
+++ b/src/pages/Item/Card/ItemBarcode.vue
@ -2,12 +2,15 @@
 import { ref, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import axios from 'axios';

 import CrudModel from 'src/components/CrudModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import useNotify from 'src/composables/useNotify.js';

 const route = useRoute();
 const { t } = useI18n();
+const { notify } = useNotify();

 const itemBarcodeRef = ref(null);

@ -23,6 +26,24 @@ const focusLastInput = () => {
        if (lastInput) lastInput.focus();
    });
 };
+
+const removeRow = (row) => {
+    itemBarcodeRef.value.remove([row]);
+};
+
+const submit = async (rows) => {
+    const params = rows[rows.length - 1];
+    let { data } = await axios.get('ItemBarcodes');
+    const code = params.code;
+
+    if (data.some((codes) => codes.code === code)) {
+        notify(t('Codes can not be repeated'), 'negative');
+        itemBarcodeRef.value.reset();
+        return;
+    }
+    await axios.patch(`ItemBarcodes`, params);
+    notify(t('globals.dataSaved'), 'positive');
+};
 </script>
 <template>
    <div class="full-width flex justify-center">
@ -39,6 +60,7 @@ const focusLastInput = () => {
                ref="itemBarcodeRef"
                url="ItemBarcodes"
                auto-load
+                :save-fn="submit"
            >
                <template #body="{ rows }">
                    <QCard class="q-px-lg q-py-md">
@ -54,7 +76,7 @@ const focusLastInput = () => {
                                focusable-input
                            />
                            <QIcon
-                                @click="itemBarcodeRef.remove([row])"
+                                @click="removeRow(row)"
                                class="cursor-pointer q-ml-md"
                                color="primary"
                                name="delete"
@ -89,4 +111,5 @@ es:
    Code: Código
    Remove barcode: Quitar código de barras
    Add barcode: Añadir código de barras
+    Codes can not be repeated: Los códigos no puden ser repetidos
 </i18n>
--- a/src/pages/Item/Card/ItemBasicData.vue
+++ b/src/pages/Item/Card/ItemBasicData.vue
@ -70,6 +70,7 @@ const onIntrastatCreated = (response, formData) => {
                    option-label="name"
                    hide-selected
                    map-options
+                    required
                >
                    <template #option="scope">
                        <QItem v-bind="scope.itemProps">
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, reactive, computed } from 'vue';
+import { ref, reactive, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';

--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@ -67,7 +67,7 @@ const handlePhotoUpdated = (evt = false) => {

 <template>
    <div class="relative-position">
-        <VnImg ref="image" :id="$props.entityId" zoom-resolution="1600x900">
+        <VnImg ref="image" :id="parseInt($props.entityId)" zoom-resolution="1600x900">
            <template #error>
                <div class="absolute-full picture text-center q-pa-md flex flex-center">
                    <div>
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, computed, onUnmounted, reactive, ref, nextTick, watch } from 'vue';
+import { onMounted, computed, reactive, ref, nextTick, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';

@ -145,8 +145,6 @@ onMounted(async () => {
    await updateWarehouse(warehouseFk.value);
 });

-onUnmounted(() => (stateStore.rightDrawer = false));
-
 watch(
    () => router.currentRoute.value.params.id,
    (newId) => {
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@ -1,12 +1,10 @@
 <script setup>
-import { onMounted, computed, onUnmounted, ref, watch } from 'vue';
+import { onMounted, computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { dateRange } from 'src/filters';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-
-import { useStateStore } from 'stores/useStateStore';
 import { toDateTimeFormat } from 'src/filters/date.js';
 import { dashIfEmpty } from 'src/filters';
 import { toCurrency } from 'filters/index';
@ -15,7 +13,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';

 const { t } = useI18n();
 const route = useRoute();
-const stateStore = useStateStore();

 const exprBuilder = (param, value) => {
    switch (param) {
@ -180,8 +177,6 @@ onMounted(async () => {
        updateFilter();
    });
 });
-
-onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

 <template>
--- a/src/pages/Item/Card/ItemShelving.vue
+++ b/src/pages/Item/Card/ItemShelving.vue
@ -1,19 +1,15 @@
 <script setup>
-import { onMounted, ref, computed, reactive } from 'vue';
+import { onMounted, ref, computed, reactive, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-
 import { toDateFormat } from 'src/filters/date.js';
-import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
+import VnTable from 'src/components/VnTable/VnTable.vue';

 const stateStore = useStateStore();

@ -21,8 +17,9 @@ const route = useRoute();
 const { t } = useI18n();
 const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
-
-const rowsSelected = ref([]);
+const tableRef = ref();
+const selectedRows = ref([]);
+const hasSelectedCards = computed(() => selectedRows.value.length > 0);

 const exprBuilder = (param, value) => {
    switch (param) {
@ -36,6 +33,11 @@ const exprBuilder = (param, value) => {
 };

 const params = reactive({ itemFk: route.params.id });
+const filter = reactive({
+    where: {
+        itemFk: route.params.id,
+    },
+});

 const arrayData = useArrayData('ItemShelvings', {
    url: 'ItemShelvingPlacementSupplyStocks',
@ -44,58 +46,32 @@ const arrayData = useArrayData('ItemShelvings', {
 });
 const rows = computed(() => arrayData.store.data || []);

-const applyColumnFilter = async (col) => {
-    const paramKey = col.columnFilter?.filterParamKey || col.field;
-    params[paramKey] = col.columnFilter.filterValue;
-    await arrayData.addFilter({ filter: null, params });
-};
-
-const getInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
-
 const columns = computed(() => [
    {
        label: t('shelvings.created'),
        name: 'created',
-        field: 'created',
        align: 'left',
-        sortable: true,
-        columnFilter: null,
-        format: (val) => toDateFormat(val),
+        columnFilter: false,
+        format: (row) => toDateFormat(row.created),
    },

    {
        label: t('shelvings.item'),
-        name: 'item',
-        field: 'itemFk',
+        name: 'itemFk',
        align: 'left',
-        sortable: true,
-        columnFilter: null,
+        columnFilter: false,
    },
    {
        label: t('shelvings.concept'),
-        name: 'concept',
+        name: 'longName',
        align: 'left',
-        sortable: true,
-        columnFilter: null,
+        columnFilter: false,
    },
    {
        label: t('shelvings.parking'),
        name: 'parking',
-        field: 'parking',
        align: 'left',
-        sortable: true,
-        format: (val) => dashIfEmpty(val),
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
+        component: 'select',
        attrs: {
            url: 'parkings',
            fields: ['code'],
@ -104,20 +80,13 @@ const columns = computed(() => [
            'option-label': 'code',
            dense: true,
        },
-        },
+        columnField: { component: null },
    },
    {
        label: t('shelvings.shelving'),
        name: 'shelving',
-        field: 'shelving',
        align: 'left',
-        sortable: true,
-        format: (val) => dashIfEmpty(val),
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
+        component: 'select',
        attrs: {
            url: 'shelvings',
            fields: ['code'],
@ -126,41 +95,20 @@ const columns = computed(() => [
            'option-label': 'code',
            dense: true,
        },
-        },
+        columnField: { component: null },
    },
    {
        label: t('shelvings.label'),
        name: 'label',
        align: 'left',
-        sortable: true,
-        format: (_, row) => (row.stock / row.packing).toFixed(2),
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterParamKey: 'label',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
+        columnFilter: { inWhere: true },
+        format: (row) => (row.stock / row.packing).toFixed(2),
    },
    {
        label: t('shelvings.packing'),
-        field: 'packing',
        name: 'packing',
+        attrs: { inWhere: true },
        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
    },
 ]);

@ -169,15 +117,16 @@ const totalLabels = computed(() =>
 );

 const removeLines = async () => {
-    const itemShelvingIds = rowsSelected.value.map((row) => row.itemShelvingFk);
+    const itemShelvingIds = selectedRows.value.map((row) => row.itemShelvingFk);
    await axios.post('ItemShelvings/deleteItemShelvings', { itemShelvingIds });
-    rowsSelected.value = [];
+    selectedRows.value = [];
    notify('shelvings.shelvingsRemoved', 'positive');
-    await arrayData.fetch({ append: false });
+    await tableRef.value.reload();
 };
 onMounted(async () => {
    await arrayData.fetch({ append: false });
 });
+watchEffect(selectedRows);
 </script>

 <template>
@ -203,7 +152,7 @@ onMounted(async () => {
            <QBtn
                color="primary"
                icon="delete"
-                :disabled="!rowsSelected.length"
+                :disabled="!hasSelectedCards"
                @click="
                    openConfirmationModal(
                        t('shelvings.removeConfirmTitle'),
@ -219,41 +168,27 @@ onMounted(async () => {
        </Teleport>
    </template>
    <QPage class="column items-center q-pa-md">
-        <QTable
-            :rows="rows"
+        <VnTable
+            ref="tableRef"
+            data-key="ItemShelving"
            :columns="columns"
-            row-key="id"
-            :pagination="{ rowsPerPage: 0 }"
-            class="full-width q-mt-md"
-            selection="multiple"
-            v-model:selected="rowsSelected"
-            :no-data-label="t('globals.noResults')"
+            :url="`ItemShelvingPlacementSupplyStocks`"
+            :filter="filter"
+            :expr-builder="exprBuilder"
+            :right-search="false"
+            v-model:selected="selectedRows"
+            :table="{
+                'row-key': 'itemShelvingFk',
+                selection: 'multiple',
+            }"
+            auto-load
        >
-            <template #top-row="{ cols }">
-                <QTr>
-                    <QTd />
-                    <QTd
-                        v-for="(col, index) in cols"
-                        :key="index"
-                        style="max-width: 100px"
-                    >
-                        <component
-                            :is="col.columnFilter.component"
-                            v-if="col.columnFilter"
-                            v-model="col.columnFilter.filterValue"
-                            v-bind="col.columnFilter.attrs"
-                            v-on="col.columnFilter.event(col)"
-                            dense
-                        />
-                    </QTd>
-                </QTr>
-            </template>
-            <template #body-cell-concept="{ row }">
-                <QTd @click.stop>
-                    <span class="link">{{ row.longName }}</span>
+            <template #column-longName="{ row }">
+                <span class="link" @click.stop>
+                    {{ row.longName }}
                    <ItemDescriptorProxy :id="row.itemFk" />
-                </QTd>
+                </span>
            </template>
-        </QTable>
+        </VnTable>
    </QPage>
 </template>
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@ -89,7 +89,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
            <QCard class="vn-one">
                <VnTitle
                    :url="getUrl(entityId, 'basic-data')"
-                    :text="t('item.summary.otherData')"
+                    :text="t('item.summary.basicData')"
                />
                <VnLv
                    :label="t('item.summary.intrastatCode')"
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@ -8,7 +8,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-
 import axios from 'axios';

 const route = useRoute();
@ -60,6 +59,10 @@ const insertTag = (rows) => {
    itemTagsRef.value.formData[itemTagsRef.value.formData.length - 1].priority =
        getHighestPriority(rows);
 };
+
+const submitTags = async (data) => {
+    itemTagsRef.value.onSubmit(data);
+};
 </script>

 <template>
@ -77,7 +80,6 @@ const insertTag = (rows) => {
                data-key="ItemTags"
                model="ItemTags"
                url="ItemTags"
-                update-url="Tags/onSubmit"
                :data-required="{
                    $index: undefined,
                    itemFk: route.params.id,
@ -147,6 +149,7 @@ const insertTag = (rows) => {
                                v-model="row.value"
                                :label="t('itemTags.value')"
                                :is-clearable="false"
+                                @keyup.enter.stop="submitTags(row)"
                            />
                            <VnInput
                                :label="t('itemBasicData.relevancy')"
@ -154,6 +157,7 @@ const insertTag = (rows) => {
                                v-model="row.priority"
                                :required="true"
                                :rules="validate('itemTag.priority')"
+                                @keyup.enter.stop="submitTags(row)"
                            />
                            <div class="row justify-center" style="flex: 0">
                                <QIcon
@ -189,3 +193,8 @@ const insertTag = (rows) => {
        </QPage>
    </div>
 </template>
+
+<i18n>
+es:
+    Tags can not be repeated: Las etiquetas no pueden repetirse
+</i18n>
--- a/src/pages/Item/Card/ItemTax.vue
+++ b/src/pages/Item/Card/ItemTax.vue
@ -28,7 +28,7 @@ const taxesFilter = {
    ],
 };

-const ItemTaxRef = ref(null);
+const ItemTaxRef = ref();
 const taxesOptions = ref([]);

 const submitTaxes = async (data) => {
@ -36,7 +36,10 @@ const submitTaxes = async (data) => {
        id: tax.id,
        taxClassFk: tax.taxClassFk,
    }));
-
+    if (payload.some((item) => item.taxClassFk === null)) {
+        notify(t('Tax class cannot be blank'), 'negative');
+        return;
+    }
    await axios.post(`Items/updateTaxes`, payload);
    notify(t('globals.dataSaved'), 'positive');
 };
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@ -413,7 +413,6 @@ function handleOnDataSave({ CrudModelRef }) {
            save-url="FixedPrices/crud"
            :user-params="{ warehouseFk: user.warehouseFk }"
            ref="tableRef"
-            dense
            :columns="columns"
            default-mode="table"
            auto-load
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@ -55,17 +55,6 @@ const columns = computed(() => [
        label: '',
        name: 'image',
        align: 'left',
-        columnField: {
-            component: VnImg,
-            attrs: ({ row }) => {
-                return {
-                    id: row?.id,
-                    zoomResolution: '1600x900',
-                    zoom: true,
-                    class: 'rounded',
-                };
-            },
-        },
        columnFilter: false,
        cardVisible: true,
    },
@ -184,7 +173,7 @@ const columns = computed(() => [
        cardVisible: true,
    },
    {
-        label: t('globals.origin'),
+        label: t('item.list.origin'),
        name: 'origin',
        align: 'left',
        component: 'select',
@ -228,7 +217,8 @@ const columns = computed(() => [
        },
    },
    {
-        label: t('item.list.weightByPiece'),
+        label: t('item.list.weight'),
+        toolTip: t('item.list.weightByPiece'),
        name: 'weightByPiece',
        align: 'left',
        component: 'input',
@ -322,7 +312,6 @@ const columns = computed(() => [
        ref="tableRef"
        data-key="ItemList"
        url="Items/filter"
-        url-create="Items"
        :create="{
            urlCreate: 'Items',
            title: t('Create Item'),
@ -333,12 +322,19 @@ const columns = computed(() => [
        }"
        :order="['isActive DESC', 'name', 'id']"
        :columns="columns"
-        auto-load
        redirect="Item"
        :is-editable="false"
        :right-search="false"
-        :filer="itemFilter"
+        :filter="itemFilter"
    >
+        <template #column-image="{ row }">
+            <VnImg
+                :id="row?.id"
+                zoom-resolution="1600x900"
+                :zoom="true"
+                class="rounded"
+            />
+        </template>
        <template #column-id="{ row }">
            <span class="link" @click.stop>
                {{ row.id }}
@ -348,7 +344,7 @@ const columns = computed(() => [
        <template #column-userName="{ row }">
            <span class="link" @click.stop>
                {{ row.userName }}
-                <WorkerDescriptorProxy :id="row.workerFk" />
+                <WorkerDescriptorProxy :id="row.buyerFk" />
            </span>
        </template>
        <template #column-description="{ row }">
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@ -199,7 +199,17 @@ onMounted(async () => {
                        dense
                        outlined
                        rounded
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        t(`params.${scope.opt?.name}`)
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                </QItemSection>
            </QItem>
            <QItem>
@ -434,6 +444,13 @@ en:
        description: Description
        name: Name
        id: Id
+        Accessories: Accessories
+        Artificial: Artificial
+        Flower: Flower
+        Fruit: Fruit
+        Green: Green
+        Handmade: Handmade
+        Plant: Plant
 es:
    More fields: Más campos
    params:
@ -450,4 +467,11 @@ es:
        description: Descripción
        name: Nombre
        id: Id
+        Accessories: Accesorios
+        Artificial: Artificial
+        Flower: Flor
+        Fruit: Fruta
+        Green: Verde
+        Handmade: Hecho a mano
+        Plant: Planta
 </i18n>
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@ -5,13 +5,16 @@ import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.v
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
-import { dashIfEmpty, toCurrency } from 'filters/index';
+import { toCurrency } from 'filters/index';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import ItemRequestDenyForm from './ItemRequestDenyForm.vue';
 import { toDate } from 'src/filters';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import ItemRequestFilter from './ItemRequestFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 const { t } = useI18n();
 const { notify } = useNotify();
 const stateStore = useStateStore();
@ -228,6 +231,11 @@ onMounted(async () => {
 </script>

 <template>
+    <RightMenu>
+        <template #right-panel>
+            <ItemRequestFilter data-key="itemRequest" />
+        </template>
+    </RightMenu>
    <VnTable
        ref="tableRef"
        data-key="itemRequest"
@ -239,6 +247,7 @@ onMounted(async () => {
        auto-load
        :disable-option="{ card: true }"
        chip-locale="item.params"
+        :right-search="false"
    >
        <template #column-ticketFk="{ row }">
            <span class="link">
@ -306,7 +315,6 @@ onMounted(async () => {
            />
        </template>
        <template #column-denyOptions="{ row, rowIndex }">
-            <QTd class="sticky no-padding">
            <QIcon
                v-if="row.response?.length"
                name="insert_drive_file"
@ -329,7 +337,6 @@ onMounted(async () => {
                    {{ t('Discard') }}
                </QTooltip>
            </QIcon>
-            </QTd>
        </template>
    </VnTable>
    <QDialog ref="denyFormRef" transition-show="scale" transition-hide="scale">
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { dateRange } from 'src/filters';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
@ -7,6 +7,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';

 const { t } = useI18n();
@ -22,7 +23,8 @@ const stateOptions = [
    { code: 'accepted', name: t('accepted') },
    { code: 'denied', name: t('denied') },
 ];
-
+const arrayData = useArrayData(props.dataKey);
+const fieldFiltersValues = ref([]);
 const itemTypesOptions = ref([]);
 const warehousesOptions = ref([]);

@ -57,6 +59,19 @@ const decrement = (paramsObj, key) => {

    paramsObj[key]--;
 };
+
+onMounted(async () => {
+    if (arrayData.store?.userParams) {
+        fieldFiltersValues.value = Object.entries(arrayData.store.userParams).map(
+            ([key, value]) => ({
+                name: key,
+                value,
+                selectedField: { name: key, label: t(`params.${key}`) },
+            })
+        );
+    }
+    exprBuilder('state', arrayData.store?.userParams?.state);
+});
 </script>

 <template>
--- a/src/pages/Item/ItemType/ItemTypeSearchbar.vue
+++ b/src/pages/Item/ItemType/ItemTypeSearchbar.vue
@ -10,7 +10,6 @@ const { t } = useI18n();
        url="ItemTypes"
        :label="t('Search item type')"
        :info="t('Search itemType by id, name or code')"
-        search-url="table"
    />
 </template>
 <i18n>
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@ -6,6 +6,7 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import FetchData from 'components/FetchData.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import ItemTypeFilter from './ItemType/ItemTypeFilter.vue';
+import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';

 const { t } = useI18n();
 const tableRef = ref();
@ -31,13 +32,14 @@ const columns = computed(() => [
    {
        align: 'left',
        name: 'name',
-        label: t('name'),
+        label: t('globals.name'),
        cardVisible: true,
        create: true,
    },
    {
        align: 'left',
        label: t('worker'),
+        name: 'workerFk',
        create: true,
        component: 'select',
        attrs: {
@ -45,20 +47,20 @@ const columns = computed(() => [
            optionLabel: 'nickname',
            optionValue: 'id',
        },
+        format: (row) => row.worker?.user?.name,
        cardVisible: true,
-        visible: true,
-        columnField: {
-            component: 'userLink',
-            attrs: ({ row }) => {
-                return {
-                    workerId: row?.worker?.id,
-                    name: row.worker?.user?.name,
-                    defaultName: true,
-                };
-            },
-        },
+        columnField: { component: null },
        columnFilter: {
-            name: 'workerFk',
+            attrs: {
+                url: 'Workers/activeWithInheritedRole',
+                fields: ['id', 'name'],
+                where: { role: 'buyer' },
+                optionFilter: 'firstName',
+                optionLabel: 'name',
+                optionValue: 'id',
+                useLike: false,
+            },
+            inWhere: true,
        },
    },
    {
@ -135,24 +137,27 @@ const columns = computed(() => [
        :columns="columns"
        auto-load
        :right-search="false"
-        :is-editable="false"
-        :use-model="true"
        redirect="item/item-type"
-    />
+    >
+        <template #column-workerFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.worker?.user?.name }}
+                <WorkerDescriptorProxy :id="row.workerFk" />
+            </span>
+        </template>
+    </VnTable>
 </template>

 <i18n>
    es:
        id: Id
        code: Código
-        name: Nombre
        worker: Trabajador
        ItemCategory: Reino
        Temperature: Temperatura
        Create ItemTypes: Crear familia
    en:
        code: Code
-        name: Name
        worker: Worker
        ItemCategory: ItemCategory
        Temperature: Temperature
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@ -95,6 +95,15 @@ item:
        mine: For me
        state: State
        myTeam: My team
+        shipped: Shipped
+        description: Description
+        quantity: Quantity
+        price: Price
+        item: Item
+        achieved: Achieved
+        concept: Concept
+        denyOptions: Deny
+        scopeDays: Scope days
    searchbar:
        label: Search item
    descriptor:
@ -112,7 +121,7 @@ item:
            title: All its properties will be copied
            subTitle: Do you want to clone this item?
    list:
-        id: Identifier
+        id: Id
        grouping: Grouping
        packing: Packing
        description: Description
@ -122,8 +131,9 @@ item:
        intrastat: Intrastat
        isActive: Active
        size: Size
-        origin: Origin
+        origin: Orig.
        userName: Buyer
+        weight: Weight
        weightByPiece: Weight/Piece
        stemMultiplier: Multiplier
        producer: Producer
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@ -97,6 +97,15 @@ item:
        mine: Para mi
        state: Estado
        myTeam: Mi equipo
+        shipped: Enviado
+        description: Descripción
+        quantity: Cantidad
+        price: Precio
+        item: Artículo
+        achieved: Conseguido
+        concept: Concepto
+        denyOptions: Denegado
+        scopeDays: Días en adelante
    searchbar:
        label: Buscar artículo
    descriptor:
@ -114,7 +123,7 @@ item:
            title: Todas sus propiedades serán copiadas
            subTitle: ¿Desea clonar este artículo?
    list:
-        id: Identificador
+        id: Id
        grouping: Grouping
        packing: Packing
        description: Descripción
@ -124,7 +133,8 @@ item:
        intrastat: Intrastat
        isActive: Activo
        size: Medida
-        origin: Origen
+        origin: Orig.
+        weight: Peso
        weightByPiece: Peso (gramos)/tallo
        userName: Comprador
        stemMultiplier: Multiplicador
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@ -1,7 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onMounted, onUnmounted, ref, computed, watch } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
@ -29,8 +29,6 @@ onMounted(() => {
    checkOrderConfirmation();
 });

-onUnmounted(() => (stateStore.rightDrawer = false));
-
 async function checkOrderConfirmation() {
    const response = await axios.get(`Orders/${route.params.id}`);
    if (response.data.isConfirmed === 1) {
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@ -2,7 +2,7 @@
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
-import { onMounted, onUnmounted } from 'vue';
+import { onMounted } from 'vue';
 import CardList from 'components/ui/CardList.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import { useRouter } from 'vue-router';
@ -21,7 +21,6 @@ const filter = {
 };

 onMounted(() => (stateStore.rightDrawer = true));
-onUnmounted(() => (stateStore.rightDrawer = false));

 function navigate(id) {
    router.push({ path: `/shelving/${id}` });
--- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
+import { ref, computed, onMounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';

 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
@ -134,8 +134,6 @@ onMounted(() => {
    loadDefaultTicketAction();
    ticketHaveNegatives();
 });
-
-onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

 <template>
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue';
+import { ref, computed, onMounted, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';

@ -168,8 +168,6 @@ const getTicketVolume = async () => {
 onMounted(() => {
    stateStore.rightDrawer = true;
 });
-
-onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

 <template>
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';

@ -197,8 +197,6 @@ onMounted(async () => {
    const filteredColumns = columns.value.filter((col) => col.name !== 'history');
    allColumnNames.value = filteredColumns.map((col) => col.name);
 });
-
-onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

 <template>
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter, useRoute } from 'vue-router';
 import { useQuasar } from 'quasar';
@ -421,8 +421,6 @@ onMounted(async () => {
    getConfig();
 });

-onUnmounted(() => (stateStore.rightDrawer = false));
-
 const items = ref([]);
 const newRow = ref({});

--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue';
+import { ref, computed, onMounted, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';

@ -90,8 +90,6 @@ const applyVolumes = async (salesData) => {
 };

 onMounted(() => (stateStore.rightDrawer = true));
-
-onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

 <template>
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@ -57,7 +57,6 @@ onMounted(async () => await getItemPackingTypes());
        search-url="advanceTickets"
        :data-key="props.dataKey"
        :search-button="true"
-        :hidden-tags="['search']"
        :unremovable-params="['warehouseFk', 'dateFuture', 'dateToAdvance']"
    >
        <template #tags="{ tag, formatFn }">
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@ -59,7 +59,6 @@ onMounted(async () => {
    />
    <VnFilterPanel
        :data-key="props.dataKey"
-        :hidden-tags="['search']"
        :un-removable-params="['warehouseFk', 'originScopeDays ', 'futureScopeDays']"
    >
        <template #tags="{ tag, formatFn }">
--- a/src/pages/Ticket/TicketWeekly.vue
+++ b/src/pages/Ticket/TicketWeekly.vue
@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectCache from 'src/components/common/VnSelectCache.vue';
@ -170,8 +170,6 @@ onMounted(async () => {
    const filteredColumns = columns.value.filter((col) => col.name !== 'actions');
    allColumnNames.value = filteredColumns.map((col) => col.name);
 });
-
-onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

 <template>
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@ -1,5 +1,5 @@
 <script setup>
-import { ref, onUnmounted } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';

 import ZoneEventsPanel from './ZoneEventsPanel.vue';
@ -40,8 +40,6 @@ const onZoneEventFormClose = () => {
    showZoneEventForm.value = false;
    zoneEventsFormProps.value = {};
 };
-
-onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

 <template>
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@ -28,11 +28,7 @@ const agencies = ref([]);
        @on-fetch="(data) => (agencies = data)"
        auto-load
    />
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        :hidden-tags="['search']"
-    >
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
        <template #tags="{ tag }">
            <div class="q-gutter-x-xs">
                <strong>{{ t(`filterPanel.${tag.label}`) }}: </strong>