Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer

.vscode/settings.json

@@ -14,5 +14,5 @@
     "[vue]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
-    "cSpell.words": ["axios"]
+    "cSpell.words": ["axios", "composables"]
 }

CHANGELOG.md

@@ -1,3 +1,169 @@
+# Version 24.28 - 2024-07-09
+
+### Added 🆕
+
+-   Change header titles style by:wbuezas
+-   chore: refs #7436 fix e2e (origin/7436-showQCheckbox) by:jorgep
+-   feat: #7196 eslint (origin/7196-cjsToEsm) by:jgallego
+-   feat: adapt tu VnTable → CrudModel by:alexm
+-   feat(CustomerFIlter): use correct table by:alexm
+-   feat(customerList): add searchbar by:alexm
+-   feat: customerList is customerExtendedList by:alexm
+-   feat: fixes #7196 by:jgallego
+-   feat: refs #6739 transferInvoice new checkbox and functionality by:Jon
+-   feat: refs #6825 create vnTable and add in CustomerExtendedList by:alexm
+-   feat: refs #6825 create vnTableColumn, cardActions by:alexm
+-   feat: refs #6825 fix modes by:alexm
+-   feat: refs #6825 qchip color by:alexm
+-   feat: refs #6825 right filter panel (6825-vnTable) by:alexm
+-   feat: refs #6825 scroll for table mode by:alexm
+-   feat: refs #6825 share filters, create popup by:alexm
+-   feat: refs #6825 VnComponent mix component and attrs Form to create new row by:alexm
+-   feat: refs #6825 VnTableFilter and VnPanelFilter init by:alexm
+-   feat: refs #6826 added rol summary link by:Jon
+-   feat: refs #6896 created VnImg and added to order module by:Jon
+-   feat: refs #6896 new filters by:Jon
+-   feat: refs #7129 fix some code and add order by:pablone
+-   feat: refs #7436 show checkbox by:jorgep
+-   feat: refs #7545 Deleted hasIncoterms client column (origin/7545-hasIncoterms) by:guillermo
+-   feat(TicketService): use correct format by:alexm
+-   feat(url): sepate filters by:alexm
+-   feat(VnFilter): merge objects by:alexm
+-   feat(VnTable): is-editable and use-model. fix: checkbox by:alexm
+-   feat(VnTable): refs #6825 actions sticky by:alexm
+-   feat(VnTable): refs #6825 addInWhere by:alexm
+-   feat(VnTable): refs #6825 dinamic columns by:alexm
+-   feat(VnTable): refs #6825 execute function when create by:alexm
+-   feat(VnTable): refs #6825 fix ellipsis and add titles by:alexm
+-   feat(VnTable): refs #6825 merge where's by:alexm
+-   feat(VnTable): refs #6825 move to folder. fix checkboxs by:alexm
+-   feat(VnTable): refs #6825 remove field prop. Add actions in table by:alexm
+-   feat(VnTable): refs #6825 use checkbox if startsWith 'is' or 'has' by:alexm
+-   feat(VnTable): refs #6825 VnTableChip component by:alexm
+-   feat(vnTable): reload data when change url by:alexm
+-   feat(WorkerFormation): add columnFilter by:alexm
+-   feat(WorkerFormation): is-editable and use-model by:alexm
+-   fix: notify icon style by:Javier Segarra
+-   refactor: refs #6896 fixed styles by:Jon
+-   Revert "feat: fixes #7196" by:alexm
+-   style: refs #6464 changed checkbox and qbtn styles by:Jon
+
+### Changed 📦
+
+-   perf: Remove div.col by:Javier Segarra
+-   perf: remove ItemPicture by:Javier Segarra
+-   perf: replace ItemPicture in favour of VnImg by:Javier Segarra
+-   refactor by:wbuezas
+-   refactor: refs #5447 changed warehouse filter by:Jon
+-   refactor: refs #5447 changed warehouse out filter behavior by:Jon
+-   refactor: refs #5447 fixed filter if continent not selected by:Jon
+-   refactor: refs #5447 fix request by:Jon
+-   refactor: refs #5447 refactor filters by:Jon
+-   refactor: refs #6739 changed invoice functions' name by:Jon
+-   refactor: refs #6739 changed router.push by:Jon
+-   refactor: refs #6739 deleted useless const by:Jon
+-   refactor: refs #6739 fix redirect transferInvoice by:Jon
+-   refactor: refs #6739 new confirmation window by:Jon
+-   refactor: refs #6739 requested changes by:Jon
+-   refactor: refs #6739 updated transferInvoice function by:Jon
+-   refactor: refs #6896 changes requested in PR by:Jon
+-   refactor: refs #6896 end migration orders by:Jon
+-   refactor: refs #6896 fixed styles by:Jon
+-   refactor: refs #6896 fix qdrawer by:Jon
+-   refactor: refs #6896 refactor VnImg by:Jon
+-   refactor: refs #6896 requested changes by:Jon
+-   refactor: refs #6977 fix VnImg props (origin/6977-ClonedURL) by:Jon
+-   refactor: refs #6977 refactor VnImg by:Jon
+-   refactor: refs #6977 use VnImg by:Jon
+-   refactors by:alexm
+
+### Fixed 🛠️
+
+-   chore: refs #7436 fix e2e (origin/7436-showQCheckbox) by:jorgep
+-   feat: fixes #7196 by:jgallego
+-   feat: refs #6825 fix modes by:alexm
+-   feat: refs #7129 fix some code and add order by:pablone
+-   feat(VnTable): is-editable and use-model. fix: checkbox by:alexm
+-   feat(VnTable): refs #6825 fix ellipsis and add titles by:alexm
+-   feat(VnTable): refs #6825 move to folder. fix checkboxs by:alexm
+-   fix(ArrayData): refs #6825 router.replace and use filter.where by:alexm
+-   fix: bug replace by:alexm
+-   fix: column hidden v-if by:Javier Segarra
+-   fix: comment 4 by:Javier Segarra
+-   fix: comments by:Javier Segarra
+-   fix: cypress.config to mjs by:alexm
+-   fix(EntryBuys): fix VnSubtoolbar by:alexm
+-   fixes: fix vnFilter params and redirect by:alexm
+-   fix: fix warnings by:alexm
+-   fix: invoiceDueDay test by:alexm
+-   fix log view not refreshing when changing id param by:wbuezas
+-   fix: map selected by:Javier Segarra
+-   fix: merge dev by:Javier Segarra
+-   fix: notify icon style by:Javier Segarra
+-   fix: point 1 by:Javier Segarra
+-   fix: point 3 by:Javier Segarra
+-   fix: refs #5447 deleted console.log by:Jon
+-   fix: refs 6464 deleted useless class in checkbox by:Jon
+-   fix: refs #6464 fix error isLoading by:Jon
+-   fix: refs #6739 changed checkbox field by:Jon
+-   fix: refs #6825 css by:carlossa
+-   fix: refs #6826 fix redirect by:Jon
+-   fix: refs #6826 fix roleDescriptor by:Jon
+-   fix: refs #7129 fix e2e by:pablone
+-   fix: refs #7129 fix module routes by:pablone
+-   fix: refs #7129 fix some issues on load and tools by:pablone
+-   fix: refs #7129 remove consoleLog by:pablone
+-   fix: refs #7129 remove fix from claim lines by:pablone
+-   fix: refs #7274 fix duplicate rows by:jorgep
+-   fix: refs #7433 skeleton by:jorgep
+-   fix: refs #7623 bugs & tests by:jorgep
+-   fix: refs #7623 disable router update by:jorgep
+-   fix: refs #7623 redirect by:jorgep
+-   fix: refs #7623 test by:jorgep
+-   fix: refs #7623 update add updateRoute prop in VnPaginate by:jorgep
+-   fix: refs #7623 updating skip param by:jorgep
+-   fix: revert cypress mjs by:alexm
+-   fix: SkeletonTable by:alexm
+-   fix: state translations by:Javier Segarra
+-   fix: ticket order by:Javier Segarra
+-   fix(ticket router): typo by:alexm
+-   fix(TicketService): pay use selected by:alexm
+-   fix: TravelLog by:Javier Segarra
+-   fix(url): filter by:alexm
+-   fix(url): redirect by:alexm
+-   fix(VnFilter): filter with params by:alexm
+-   fix(VnFilterPanel): remove key by:alexm
+-   fix(VnTable): create scss by:alexm
+-   fix(VnTable): duplicate fetch by:alexm
+-   fix(VnTable): Qtable v-bind by:alexm
+-   fix(VnTable): refs #6825 checkbox align and color by:alexm
+-   fix(VnTable): refs #6825 fix click sticky column by:alexm
+-   fix(VnTable): refs #6825 fix events and css by:alexm
+-   fix(VnTable): refs #6825 VnInputDate by:alexm
+-   fix(VnTable): showLabel by:alexm
+-   fix(VnTable): warns by:alexm
+-   fix: WorkerNotificationsManager test by:alexm
+-   fix: WorkerSelect option format by:Javier Segarra
+-   refactor: refs #5447 fixed filter if continent not selected by:Jon
+-   refactor: refs #5447 fix request by:Jon
+-   refactor: refs #6739 fix redirect transferInvoice by:Jon
+-   refactor: refs #6896 fixed styles by:Jon
+-   refactor: refs #6896 fix qdrawer by:Jon
+-   refactor: refs #6977 fix VnImg props (origin/6977-ClonedURL) by:Jon
+-   refs #6504 fix formModel claimFilter claimCard (origin/6504-fixCardClaim) by:carlossa
+-   refs #7406 fix components by:carlossa
+-   refs #7406 fix pr by:carlossa
+-   refs #7406 fix props by:carlossa
+-   refs #7406 fix Tb components create by:carlossa
+-   refs #7406 fix trad by:carlossa
+-   refs #7406 fix url by:carlossa
+-   refs #7406 fix VnTable columns by:carlossa
+-   refs #7409 fix balance and formation by:carlossa
+-   refs #7409 fix trad by:carlossa
+-   Revert "feat: fixes #7196" by:alexm
+-   test: fix intermitent e2e by:alexm
+-   test: fix vnSearchbar adapt to vnTable (origin/7648_dev_customerEntries) by:alexm
+
 # Version 24.24 - 2024-06-11
 
 ### Added 🆕

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.28.1",
+    "version": "24.32.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

src/boot/axios.js

@@ -55,10 +55,10 @@ const onResponseError = (error) => {
     }
 
     if (session.isLoggedIn() && response?.status === 401) {
-        session.destroy();
+        session.destroy(false);
         const hash = window.location.hash;
         const url = hash.slice(1);
-        Router.push({ path: url });
+        Router.push(`/login?redirect=${url}`);
     } else if (!session.isLoggedIn()) {
         return Promise.reject(error);
     }

src/components/CreateManualInvoiceForm.vue

@@ -46,22 +46,6 @@ const onDataSaved = async (formData, requestResponse) => {
         @on-fetch="(data) => (taxAreasOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Tickets"
-        :filter="{
-            fields: ['id', 'nickname'],
-            where: { refFk: null },
-            order: 'shipped DESC',
-        }"
-        @on-fetch="(data) => (ticketsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Clients"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (clientsOptions = data)"
-        auto-load
-    />
     <FormModelPopup
         ref="formModelPopupRef"
         :title="t('Create manual invoice')"
@@ -84,6 +68,10 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-value="id"
                     v-model="data.ticketFk"
                     @update:model-value="data.clientFk = null"
+                    url="Tickets"
+                    :where="{ refFk: null }"
+                    :fields="['id', 'nickname']"
+                    :filter-options="{ order: 'shipped DESC' }"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -105,6 +93,9 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-value="id"
                     v-model="data.clientFk"
                     @update:model-value="data.ticketFk = null"
+                    url="Clients"
+                    :fields="['id', 'name']"
+                    :filter-options="{ order: 'name ASC' }"
                 />
                 <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
             </VnRow>
@@ -116,7 +107,6 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-label="description"
                     option-value="code"
                     v-model="data.serial"
-                    :required="true"
                 />
                 <VnSelect
                     :label="t('Area')"
@@ -125,7 +115,6 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-label="code"
                     option-value="code"
                     v-model="data.taxArea"
-                    :required="true"
                 />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">

src/components/CrudModel.vue

@@ -67,7 +67,7 @@ const $props = defineProps({
         default: '',
         description: 'It is used for redirect on click "save and continue"',
     },
-    hasSubtoolbar: {
+    hasSubToolbar: {
         type: Boolean,
         default: true,
     },
@@ -98,19 +98,17 @@ defineExpose({
 });
 
 async function fetch(data) {
-    if (data && Array.isArray(data)) {
-        let $index = 0;
-        data.map((d) => (d.$index = $index++));
-    }
-
     resetData(data);
-
     emit('onFetch', data);
     return data;
 }
 
 function resetData(data) {
     if (!data) return;
+    if (data && Array.isArray(data)) {
+        let $index = 0;
+        data.map((d) => (d.$index = $index++));
+    }
     originalData.value = JSON.parse(JSON.stringify(data));
     formData.value = JSON.parse(JSON.stringify(data));
 
@@ -299,7 +297,7 @@ watch(formUrl, async () => {
         :url="url"
         :limit="limit"
         @on-fetch="fetch"
-        @on-change="resetData"
+        @on-change="fetch"
         :skeleton="false"
         ref="vnPaginateRef"
         v-bind="$attrs"
@@ -313,8 +311,11 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <SkeletonTable v-if="!formData" :columns="$attrs.columns?.length" />
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubtoolbar">
+    <SkeletonTable
+        v-if="!formData && $attrs.autoLoad"
+        :columns="$attrs.columns?.length"
+    />
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
             <QBtn

src/components/FormModel.vue

@@ -206,11 +206,11 @@ async function save() {
 
         updateAndEmit('onDataSaved', formData.value, response?.data);
         if ($props.reload) await arrayData.fetch({});
+        hasChanges.value = false;
     } catch (err) {
         console.error(err);
         notify('errors.writeRequest', 'negative');
     } finally {
-        hasChanges.value = false;
         isLoading.value = false;
     }
 }
@@ -261,28 +261,27 @@ defineExpose({
 </script>
 <template>
     <div class="column items-center full-width">
-        <QForm
-            v-if="formData"
-            @submit="save"
-            @reset="reset"
-            class="q-pa-md"
-            id="formModel"
-        >
+        <QForm @submit="save" @reset="reset" class="q-pa-md" id="formModel">
             <QCard>
                 <slot
+                    v-if="formData"
                     name="form"
                     :data="formData"
                     :validate="validate"
                     :filter="filter"
                 />
+                <SkeletonForm v-else />
             </QCard>
         </QForm>
     </div>
     <Teleport
         to="#st-actions"
-        v-if="stateStore?.isSubToolbarShown() && componentIsRendered"
+        v-if="
+            $props.defaultActions &&
+            stateStore?.isSubToolbarShown() &&
+            componentIsRendered
+        "
     >
-        <div v-if="$props.defaultActions">
         <QBtnGroup push class="q-gutter-x-sm">
             <slot name="moreActions" />
             <QBtn
@@ -335,9 +334,8 @@ defineExpose({
                 :title="t(defaultButtons.save.label)"
             />
         </QBtnGroup>
-        </div>
     </Teleport>
-    <SkeletonForm v-if="!formData" />
+
     <QInnerLoading
         :showing="isLoading"
         :label="t('globals.pleaseWait')"

src/components/FormModelPopup.vue

@@ -23,18 +23,15 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 
 const onDataSaved = (formData, requestResponse) => {
-    closeForm();
+    if (closeButton.value) closeButton.value.click();
     emit('onDataSaved', formData, requestResponse);
 };
 
 const isLoading = computed(() => formModelRef.value?.isLoading);
 
-const closeForm = async () => {
-    if (closeButton.value) closeButton.value.click();
-};
-
 defineExpose({
     isLoading,
+    onDataSaved,
 });
 </script>
 

src/components/LeftMenu.vue

@@ -58,6 +58,7 @@ function addChildren(module, route, parent) {
 }
 
 const items = ref([]);
+
 function getRoutes() {
     if (props.source === 'main') {
         const modules = Object.assign([], navigation.getModules().value);
@@ -66,9 +67,8 @@ function getRoutes() {
             const moduleDef = routes.find(
                 (route) => toLowerCamel(route.name) === item.module
             );
-            item.children = [];
-
             if (!moduleDef) continue;
+            item.children = [];
 
             addChildren(item.module, moduleDef, item.children);
         }

src/components/LeftMenuItem.vue

@@ -21,7 +21,7 @@ const itemComputed = computed(() => {
 </script>
 <template>
     <QItem
-        active-class="bg-hover"
+        active-class="bg-vn-hover"
         class="min-height"
         :to="{ name: itemComputed.name }"
         clickable

src/components/NavBar.vue

@@ -1,21 +1,19 @@
 <script setup>
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useSession } from 'src/composables/useSession';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { useQuasar } from 'quasar';
 import PinnedModules from './PinnedModules.vue';
 import UserPanel from 'components/UserPanel.vue';
 import VnBreadcrumbs from './common/VnBreadcrumbs.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
 const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
 const appName = 'Lilium';
 
 onMounted(() => stateStore.setMounted());
@@ -83,11 +81,12 @@ const pinnedModulesRef = ref();
                     id="user"
                 >
                     <QAvatar size="lg">
-                        <QImg
-                            :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
-                            spinner-color="primary"
-                        >
-                        </QImg>
+                        <VnImg
+                            :id="user.id"
+                            collection="user"
+                            size="160x160"
+                            :zoom-size="null"
+                        />
                     </QAvatar>
                     <QTooltip bottom>
                         {{ t('globals.userPanel') }}

src/components/TransferInvoiceForm.vue

@@ -8,7 +8,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
-
+import { useDialogPluginComponent } from 'quasar';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -18,7 +18,7 @@ const $props = defineProps({
         default: () => {},
     },
 });
-
+const { dialogRef } = useDialogPluginComponent();
 const quasar = useQuasar();
 const { t } = useI18n();
 const router = useRouter();
@@ -70,14 +70,11 @@ const makeInvoice = async () => {
                     });
             });
             if (!response) {
-                console.log('entra cuando no checkbox');
                 return;
             }
         }
 
-        console.log('params: ', params);
         const { data } = await axios.post('InvoiceOuts/transferInvoice', params);
-        console.log('data: ', data);
         notify(t('Transferred invoice'), 'positive');
         const id = data?.[0];
         if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
@@ -119,6 +116,7 @@ const makeInvoice = async () => {
         @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
         auto-load
     />
+    <QDialog ref="dialogRef">
         <FormPopup
         @on-submit="makeInvoice()"
         :title="t('Transfer invoice')"
@@ -203,6 +201,7 @@ const makeInvoice = async () => {
                 </VnRow>
             </template>
         </FormPopup>
+    </QDialog>
 </template>
 
 <i18n>

src/components/UserPanel.vue

@@ -12,12 +12,14 @@ import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnImg from 'src/components/ui/VnImg.vue';
+import { useRole } from 'src/composables/useRole';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
 const { copyText } = useClipboard();
+
 const userLocale = computed({
     get() {
         return locale.value;
@@ -99,6 +101,7 @@ function saveUserData(param, value) {
     axios.post('UserConfigs/setUserConfig', { [param]: value });
     localUserData();
 }
+const isEmployee = computed(() => useRole().isEmployee());
 </script>
 
 <template>
@@ -109,12 +112,14 @@ function saveUserData(param, value) {
         auto-load
     />
     <FetchData
+        v-if="isEmployee"
         url="Companies"
         order="name"
         @on-fetch="(data) => (companiesData = data)"
         auto-load
     />
     <FetchData
+        v-if="isEmployee"
         url="Accountings"
         order="name"
         @on-fetch="(data) => (accountBankData = data)"

src/components/VnTable/VnColumn.vue

@@ -5,8 +5,10 @@ import { dashIfEmpty } from 'src/filters';
 
 /* basic input */
 import VnSelect from 'components/common/VnSelect.vue';
+import VnSelectCache from 'components/common/VnSelectCache.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
 import VnComponent from 'components/common/VnComponent.vue';
 
 const model = defineModel(undefined, { required: true });
@@ -41,11 +43,23 @@ const $props = defineProps({
     },
 });
 
+const defaultSelect = {
+    attrs: {
+        row: $props.row,
+        disable: !$props.isEditable,
+        class: 'fit',
+    },
+    forceAttrs: {
+        label: $props.showLabel && $props.column.label,
+    },
+};
+
 const defaultComponents = {
     input: {
         component: markRaw(VnInput),
         attrs: {
             disable: !$props.isEditable,
+            class: 'fit',
         },
         forceAttrs: {
             label: $props.showLabel && $props.column.label,
@@ -55,6 +69,7 @@ const defaultComponents = {
         component: markRaw(VnInput),
         attrs: {
             disable: !$props.isEditable,
+            class: 'fit',
         },
         forceAttrs: {
             label: $props.showLabel && $props.column.label,
@@ -63,9 +78,19 @@ const defaultComponents = {
     date: {
         component: markRaw(VnInputDate),
         attrs: {
-            readonly: true,
+            readonly: !$props.isEditable,
             disable: !$props.isEditable,
             style: 'min-width: 125px',
+            class: 'fit',
+        },
+        forceAttrs: {
+            label: $props.showLabel && $props.column.label,
+        },
+    },
+    time: {
+        component: markRaw(VnInputTime),
+        attrs: {
+            disable: !$props.isEditable,
         },
         forceAttrs: {
             label: $props.showLabel && $props.column.label,
@@ -77,7 +102,7 @@ const defaultComponents = {
             const defaultAttrs = {
                 disable: !$props.isEditable,
                 'model-value': Boolean(prop),
-                class: 'no-padding',
+                class: 'no-padding fit',
             };
 
             if (typeof prop == 'number') {
@@ -91,13 +116,12 @@ const defaultComponents = {
         },
     },
     select: {
+        component: markRaw(VnSelectCache),
+        ...defaultSelect,
+    },
+    rawSelect: {
         component: markRaw(VnSelect),
-        attrs: {
-            disable: !$props.isEditable,
-        },
-        forceAttrs: {
-            label: $props.showLabel && $props.column.label,
-        },
+        ...defaultSelect,
     },
     icon: {
         component: markRaw(QIcon),
@@ -134,7 +158,7 @@ const col = computed(() => {
 const components = computed(() => $props.components ?? defaultComponents);
 </script>
 <template>
-    <div class="row no-wrap fit">
+    <div class="row no-wrap">
         <VnComponent
             v-if="col.before"
             :prop="col.before"

src/components/VnTable/VnFilter.vue

@@ -7,6 +7,7 @@ import { useArrayData } from 'composables/useArrayData';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 
 const $props = defineProps({
@@ -39,7 +40,7 @@ const enterEvent = {
 
 const defaultAttrs = {
     filled: !$props.showTitle,
-    class: 'q-px-sm q-pb-xs q-pt-none',
+    class: 'q-px-xs q-pb-xs q-pt-none fit',
     dense: true,
 };
 
@@ -47,6 +48,17 @@ const forceAttrs = {
     label: $props.showTitle ? '' : $props.column.label,
 };
 
+const selectComponent = {
+    component: markRaw(VnSelect),
+    event: updateEvent,
+    attrs: {
+        class: 'q-px-sm q-pb-xs q-pt-none fit',
+        dense: true,
+        filled: !$props.showTitle,
+    },
+    forceAttrs,
+};
+
 const components = {
     input: {
         component: markRaw(VnInput),
@@ -75,26 +87,29 @@ const components = {
         },
         forceAttrs,
     },
+    time: {
+        component: markRaw(VnInputTime),
+        event: updateEvent,
+        attrs: {
+            ...defaultAttrs,
+            disable: !$props.isEditable,
+        },
+        forceAttrs: {
+            label: $props.showLabel && $props.column.label,
+        },
+    },
     checkbox: {
         component: markRaw(QCheckbox),
         event: updateEvent,
         attrs: {
             dense: true,
-            class: $props.showTitle ? 'q-py-sm q-mt-md' : 'q-px-md q-py-xs',
+            class: $props.showTitle ? 'q-py-sm q-mt-md' : 'q-px-md q-py-xs fit',
             'toggle-indeterminate': true,
         },
         forceAttrs,
     },
-    select: {
-        component: markRaw(VnSelect),
-        event: updateEvent,
-        attrs: {
-            class: 'q-px-md q-pb-xs q-pt-none',
-            dense: true,
-            filled: !$props.showTitle,
-        },
-        forceAttrs,
-    },
+    select: selectComponent,
+    rawSelect: selectComponent,
 };
 
 async function addFilter(value) {
@@ -127,14 +142,11 @@ const showFilter = computed(
 </script>
 <template>
     <div
-        v-if="showTitle"
-        class="q-pt-sm q-px-sm ellipsis"
-        :class="`text-${column?.align ?? 'left'}`"
-        :style="!showFilter ? { 'min-height': 72 + 'px' } : ''"
+        v-if="showFilter"
+        class="full-width"
+        :class="alignRow()"
+        style="max-height: 45px; overflow: hidden"
     >
-        {{ column?.label }}
-    </div>
-    <div v-if="showFilter" class="full-width" :class="alignRow()">
         <VnTableColumn
             :column="$props.column"
             default="input"

src/components/VnTable/VnOrder.vue

@@ -0,0 +1,95 @@
+<script setup>
+import { ref } from 'vue';
+import { useArrayData } from 'composables/useArrayData';
+const model = defineModel({ type: Object, required: true });
+const $props = defineProps({
+    name: {
+        type: String,
+        default: '',
+    },
+    label: {
+        type: String,
+        default: undefined,
+    },
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    searchUrl: {
+        type: String,
+        default: 'params',
+    },
+    vertical: {
+        type: Boolean,
+        default: false,
+    },
+});
+const hover = ref();
+const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
+
+async function orderBy(name, direction) {
+    if (!name) return;
+    switch (direction) {
+        case 'DESC':
+            direction = undefined;
+            break;
+        case undefined:
+            direction = 'ASC';
+            break;
+        case 'ASC':
+            direction = 'DESC';
+            break;
+    }
+    if (!direction) return await arrayData.deleteOrder(name);
+    await arrayData.addOrder(name, direction);
+}
+
+defineExpose({ orderBy });
+</script>
+<template>
+    <div
+        @mouseenter="hover = true"
+        @mouseleave="hover = false"
+        @click="orderBy(name, model?.direction)"
+        class="row items-center no-wrap cursor-pointer"
+    >
+        <span :title="label">{{ label }}</span>
+        <QChip
+            v-if="name"
+            :label="!vertical && model?.index"
+            :icon="
+                (model?.index || hover) && !vertical
+                    ? model?.direction == 'DESC'
+                        ? 'arrow_downward'
+                        : 'arrow_upward'
+                    : undefined
+            "
+            :size="vertical ? '' : 'sm'"
+            :class="[
+                model?.index ? 'color-vn-text' : 'bg-transparent',
+                vertical ? 'q-px-none' : '',
+            ]"
+            class="no-box-shadow"
+            :clickable="true"
+            style="min-width: 40px"
+        >
+            <div
+                class="column flex-center"
+                v-if="vertical"
+                :style="!model?.index && 'color: #5d5d5d'"
+            >
+                {{ model?.index }}
+                <QIcon
+                    :name="
+                        model?.index
+                            ? model?.direction == 'DESC'
+                                ? 'arrow_downward'
+                                : 'arrow_upward'
+                            : 'swap_vert'
+                    "
+                    size="xs"
+                />
+            </div>
+        </QChip>
+    </div>
+</template>

src/components/VnTable/VnTable.vue

@@ -1,18 +1,20 @@
 <script setup>
-import { ref, onMounted, computed, watch } from 'vue';
+import { ref, onBeforeMount, onMounted, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
-
 import { useStateStore } from 'stores/useStateStore';
-import FormModelPopup from 'components/FormModelPopup.vue';
-import CrudModel from 'src/components/CrudModel.vue';
-import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnLv from 'components/ui/VnLv.vue';
 
+import CrudModel from 'src/components/CrudModel.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 import VnTableFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
+import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
 
 const $props = defineProps({
     columns: {
@@ -21,7 +23,7 @@ const $props = defineProps({
     },
     defaultMode: {
         type: String,
-        default: 'card', // 'table', 'card'
+        default: 'table', // 'table', 'card'
     },
     columnSearch: {
         type: Boolean,
@@ -32,7 +34,7 @@ const $props = defineProps({
         default: true,
     },
     rowClick: {
-        type: Function,
+        type: [Function, Boolean],
         default: null,
     },
     redirect: {
@@ -59,6 +61,30 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    hasSubToolbar: {
+        type: Boolean,
+        default: true,
+    },
+    disableOption: {
+        type: Object,
+        default: () => ({ card: false, table: false }),
+    },
+    withoutHeader: {
+        type: Boolean,
+        default: false,
+    },
+    tableCode: {
+        type: String,
+        default: null,
+    },
+    table: {
+        type: Object,
+        default: () => ({}),
+    },
+    tableHeight: {
+        type: String,
+        default: '90vh',
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -70,28 +96,42 @@ const DEFAULT_MODE = 'card';
 const TABLE_MODE = 'table';
 const mode = ref(DEFAULT_MODE);
 const selected = ref([]);
+const hasParams = ref(false);
 const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
 const params = ref({ ...routeQuery, ...routeQuery.filter?.where });
+const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
+const columnsVisibilitySkiped = ref();
 const tableModes = [
     {
         icon: 'view_column',
         title: t('table view'),
         value: TABLE_MODE,
+        disable: $props.disableOption?.table,
     },
     {
         icon: 'grid_view',
         title: t('grid view'),
         value: DEFAULT_MODE,
+        disable: $props.disableOption?.card,
     },
 ];
+onBeforeMount(() => {
+    setUserParams(route.query[$props.searchUrl]);
+    hasParams.value = Object.keys(params.value).length !== 0;
+});
 
 onMounted(() => {
     mode.value = quasar.platform.is.mobile ? DEFAULT_MODE : $props.defaultMode;
     stateStore.rightDrawer = true;
-    setUserParams(route.query[$props.searchUrl]);
+    columnsVisibilitySkiped.value = [
+        ...splittedColumns.value.columns
+            .filter((c) => c.visible == false)
+            .map((c) => c.name),
+        ...['tableActions'],
+    ];
 });
 
 watch(
@@ -105,14 +145,21 @@ watch(
     (val) => setUserParams(val)
 );
 
+const isTableMode = computed(() => mode.value == TABLE_MODE);
+
 function setUserParams(watchedParams) {
     if (!watchedParams) return;
 
     if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
-    const where = JSON.parse(watchedParams?.filter)?.where;
+    const filter = JSON.parse(watchedParams?.filter);
+    const where = filter?.where;
+    const order = filter?.order;
+
     watchedParams = { ...watchedParams, ...where };
     delete watchedParams.filter;
+    delete params.value?.filter;
     params.value = { ...params.value, ...watchedParams };
+    orders.value = parseOrder(order);
 }
 
 function splitColumns(columns) {
@@ -120,7 +167,7 @@ function splitColumns(columns) {
         columns: [],
         chips: [],
         create: [],
-        visible: [],
+        cardVisible: [],
     };
 
     for (const col of columns) {
@@ -128,7 +175,7 @@ function splitColumns(columns) {
         if (col.chip) splittedColumns.value.chips.push(col);
         if (col.isTitle) splittedColumns.value.title = col;
         if (col.create) splittedColumns.value.create.push(col);
-        if (col.cardVisible) splittedColumns.value.visible.push(col);
+        if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
         if ($props.useModel) col.columnFilter = { ...col.columnFilter, inWhere: true };
         splittedColumns.value.columns.push(col);
@@ -144,12 +191,13 @@ function splitColumns(columns) {
                 label: t('status'),
                 name: 'tableStatus',
                 columnFilter: false,
+                orderBy: false,
             });
     }
 }
 
 const rowClickFunction = computed(() => {
-    if ($props.rowClick) return $props.rowClick;
+    if ($props.rowClick != undefined) return $props.rowClick;
     if ($props.redirect) return ({ id }) => redirectFn(id);
     return () => {};
 });
@@ -175,11 +223,25 @@ function columnName(col) {
 }
 
 function getColAlign(col) {
-    return 'text-' + (col.align ?? 'left')
+    return 'text-' + (col.align ?? 'left');
 }
+
+function parseOrder(urlOrders) {
+    const orderObject = {};
+    if (!urlOrders) return orderObject;
+    if (typeof urlOrders == 'string') urlOrders = [urlOrders];
+    for (const [index, orders] of urlOrders.entries()) {
+        const [name, direction] = orders.split(' ');
+        orderObject[name] = { direction, index: index + 1 };
+    }
+    return orderObject;
+}
+
+const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 defineExpose({
     reload,
     redirect: redirectFn,
+    selected,
 });
 </script>
 <template>
@@ -195,24 +257,40 @@ defineExpose({
                 :data-key="$attrs['data-key']"
                 :search-button="true"
                 v-model="params"
-                :disable-submit-event="true"
                 :search-url="searchUrl"
+                :redirect="!!redirect"
             >
                 <template #body>
+                    <div
+                        class="row no-wrap flex-center"
+                        v-for="col of splittedColumns.columns"
+                        :key="col.id"
+                    >
                         <VnTableFilter
                             :column="col"
                             :data-key="$attrs['data-key']"
-                        v-for="col of splittedColumns.columns"
-                        :key="col.id"
                             v-model="params[columnName(col)]"
                             :search-url="searchUrl"
                         />
-                </template>
+                        <VnTableOrder
+                            v-model="orders[col.name]"
+                            :name="col.orderBy ?? col.name"
+                            :data-key="$attrs['data-key']"
+                            :search-url="searchUrl"
+                            :vertical="true"
+                        />
+                    </div>
                     <slot
                         name="moreFilterPanel"
                         :params="params"
                         :columns="splittedColumns.columns"
                     />
+                    <slot
+                        name="moreFilterPanel"
+                        :params="params"
+                        :columns="splittedColumns.columns"
+                    />
+                </template>
             </VnFilterPanel>
         </QScrollArea>
     </QDrawer>
@@ -223,41 +301,49 @@ defineExpose({
             :limit="20"
             ref="CrudModelRef"
             :search-url="searchUrl"
-            :disable-infinite-scroll="mode == TABLE_MODE"
+            :disable-infinite-scroll="isTableMode"
             @save-changes="reload"
-            :has-subtoolbar="isEditable"
+            :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
+            :auto-load="hasParams || $attrs['auto-load']"
         >
+            <template
+                v-for="(_, slotName) in $slots"
+                #[slotName]="slotData"
+                :key="slotName"
+            >
+                <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+            </template>
             <template #body="{ rows }">
                 <QTable
-                    v-bind="$attrs['QTable']"
+                    v-bind="table"
                     class="vnTable"
                     :columns="splittedColumns.columns"
                     :rows="rows"
                     v-model:selected="selected"
-                    :grid="mode != TABLE_MODE"
+                    :grid="!isTableMode"
                     table-header-class="bg-header"
                     card-container-class="grid-three"
                     flat
-                    :style="mode == TABLE_MODE && 'max-height: 90vh'"
+                    :style="isTableMode && `max-height: ${tableHeight}`"
                     virtual-scroll
                     @virtual-scroll="
                         (event) =>
                             event.index > rows.length - 2 &&
                             CrudModelRef.vnPaginateRef.paginate()
                     "
-                    @row-click="(_, row) => rowClickFunction(row)"
+                    @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
+                    @update:selected="emit('update:selected', $event)"
                 >
-                    <template #top-left>
+                    <template #top-left v-if="!$props.withoutHeader">
                         <slot name="top-left"></slot>
                     </template>
                     <template #top-right>
-                        <!-- <QBtn
-                        icon="visibility"
-                        title="asd"
-                        class="bg-vn-section-color q-mr-md"
-                        dense
-                        v-if="mode == 'table'"
-                    /> -->
+                        <VnVisibleColumn
+                            v-if="isTableMode"
+                            v-model="splittedColumns.columns"
+                            :table-code="tableCode ?? route.name"
+                            :skip="columnsVisibilitySkiped"
+                        />
                         <QBtnToggle
                             v-model="mode"
                             toggle-color="primary"
@@ -266,6 +352,7 @@ defineExpose({
                             :options="tableModes"
                         />
                         <QBtn
+                            v-if="$props.rightSearch"
                             icon="filter_alt"
                             title="asd"
                             class="bg-vn-section-color q-ml-md"
@@ -274,18 +361,33 @@ defineExpose({
                         />
                     </template>
                     <template #header-cell="{ col }">
-                        <QTh
-                            auto-width
-                            style="min-width: 100px"
-                            v-if="$props.columnSearch"
+                        <QTh v-if="col.visible ?? true" auto-width>
+                            <div
+                                class="column self-start q-ml-xs ellipsis"
+                                :class="`text-${col?.align ?? 'left'}`"
+                                style="height: 75px"
                             >
+                                <div
+                                    class="row items-center no-wrap"
+                                    style="height: 30px"
+                                >
+                                    <VnTableOrder
+                                        v-model="orders[col.name]"
+                                        :name="col.orderBy ?? col.name"
+                                        :label="col?.label"
+                                        :data-key="$attrs['data-key']"
+                                        :search-url="searchUrl"
+                                    />
+                                </div>
                                 <VnTableFilter
+                                    v-if="$props.columnSearch"
                                     :column="col"
                                     :show-title="true"
                                     :data-key="$attrs['data-key']"
                                     v-model="params[columnName(col)]"
                                     :search-url="searchUrl"
                                 />
+                            </div>
                         </QTh>
                     </template>
                     <template #header-cell-tableActions>
@@ -308,15 +410,18 @@ defineExpose({
                         <QTd
                             auto-width
                             class="no-margin q-px-xs"
-                            :class="getColAlign(col)"
+                            :class="[getColAlign(col), col.class, col.columnField?.class]"
+                            v-if="col.visible ?? true"
                         >
+                            <slot :name="`column-${col.name}`" :col="col" :row="row">
                                 <VnTableColumn
                                     :column="col"
                                     :row="row"
-                                :is-editable="false"
+                                    :is-editable="col.isEditable ?? isEditable"
                                     v-model="row[col.name]"
                                     component-prop="columnField"
                                 />
+                            </slot>
                         </QTd>
                     </template>
                     <template #body-cell-tableActions="{ col, row }">
@@ -395,15 +500,15 @@ defineExpose({
                                         :class="$props.cardClass"
                                     >
                                         <div
-                                            v-for="col of splittedColumns.visible"
+                                            v-for="col of splittedColumns.cardVisible"
                                             :key="col.name"
                                             class="fields"
                                         >
                                             <VnLv
                                                 :label="
-                                                    !col.component &&
-                                                    col.label &&
-                                                    `${col.label}:`
+                                                    !col.component && col.label
+                                                        ? `${col.label}:`
+                                                        : ''
                                                 "
                                             >
                                                 <template #value>
@@ -411,6 +516,11 @@ defineExpose({
                                                         @click="
                                                             stopEventPropagation($event)
                                                         "
+                                                    >
+                                                        <slot
+                                                            :name="`column-${col.name}`"
+                                                            :col="col"
+                                                            :row="row"
                                                         >
                                                             <VnTableColumn
                                                                 :column="col"
@@ -420,6 +530,7 @@ defineExpose({
                                                                 component-prop="columnField"
                                                                 :show-label="true"
                                                             />
+                                                        </slot>
                                                     </span>
                                                 </template>
                                             </VnLv>
@@ -477,6 +588,7 @@ defineExpose({
                         default="input"
                         v-model="data[column.name]"
                         :show-label="true"
+                        component-prop="columnCreate"
                     />
                     <slot name="more-create-dialog" :data="data" />
                 </div>
@@ -487,8 +599,12 @@ defineExpose({
 <i18n>
 en:
     status: Status
+    table view: Table view
+    grid view: Grid view
 es:
     status: Estados
+    table view: Vista en tabla
+    grid view: Vista en cuadrícula
 </i18n>
 
 <style lang="scss">
@@ -498,7 +614,11 @@ es:
 }
 
 .bg-header {
-    background-color: #5d5d5d;
+    background-color: var(--vn-header-color);
+    color: var(--vn-text-color);
+}
+
+.color-vn-text {
     color: var(--vn-text-color);
 }
 
@@ -507,7 +627,7 @@ es:
 .q-table--dark tr,
 .q-table--dark th,
 .q-table--dark td {
-    border-color: #222222;
+    border-color: var(--vn-section-color);
 }
 
 .q-table__container > div:first-child {
@@ -577,7 +697,7 @@ es:
         right: 0;
     }
     td.sticky {
-        background-color: var(--q-dark);
+        background-color: var(--vn-section-color);
         z-index: 1;
     }
 }

src/components/VnTable/VnVisibleColumn.vue

@@ -0,0 +1,189 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref, computed, onMounted } from 'vue';
+
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const columns = defineModel({ type: Object, default: [] });
+const $props = defineProps({
+    tableCode: {
+        type: String,
+        default: '',
+    },
+    skip: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const state = useState();
+const user = state.getUser();
+const popupProxyRef = ref();
+const initialUserConfigViewData = ref();
+const localColumns = ref([]);
+
+const areAllChecksMarked = computed(() => {
+    return localColumns.value.every((col) => col.visible);
+});
+
+function setUserConfigViewData(data, isLocal) {
+    if (!data) return;
+    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+    if (!isLocal) localColumns.value = [];
+    // Array to Object
+    const skippeds = $props.skip.reduce((a, v) => ({ ...a, [v]: v }), {});
+
+    for (let column of columns.value) {
+        const { label, name } = column;
+        if (skippeds[name]) continue;
+        column.visible = data[name] ?? true;
+        if (!isLocal) localColumns.value.push({ name, label, visible: column.visible });
+    }
+}
+
+function toggleMarkAll(val) {
+    localColumns.value.forEach((col) => (col.visible = val));
+}
+
+async function getConfig(url, filter) {
+    const response = await axios.get(url, {
+        params: { filter: filter },
+    });
+    return response.data && response.data.length > 0 ? response.data[0] : null;
+}
+
+async function fetchViewConfigData() {
+    try {
+        const defaultFilter = {
+            where: { tableCode: $props.tableCode },
+        };
+
+        const userConfig = await getConfig('UserConfigViews', {
+            where: {
+                ...defaultFilter.where,
+                ...{ userFk: user.id },
+            },
+        });
+
+        if (userConfig) {
+            initialUserConfigViewData.value = userConfig;
+            setUserConfigViewData(userConfig.configuration);
+            return;
+        }
+
+        const defaultConfig = await getConfig('DefaultViewConfigs', defaultFilter);
+        if (defaultConfig) {
+            setUserConfigViewData(defaultConfig.columns);
+            return;
+        }
+    } catch (err) {
+        console.err('Error fetching config view data', err);
+    }
+}
+
+async function saveConfig() {
+    const configuration = {};
+    for (const { name, visible } of localColumns.value)
+        configuration[name] = visible ?? true;
+    setUserConfigViewData(configuration, true);
+    if (!$props.tableCode) return popupProxyRef.value.hide();
+
+    try {
+        const params = {};
+        // Si existe una view config del usuario hacemos un update si no la creamos
+        if (initialUserConfigViewData.value) {
+            params.updates = [
+                {
+                    data: {
+                        configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
+                    configuration,
+                },
+            ];
+        }
+
+        const response = await axios.post('UserConfigViews/crud', params);
+        if (response.data && response.data[0]) {
+            initialUserConfigViewData.value = response.data[0];
+        }
+        notify('globals.dataSaved', 'positive');
+        popupProxyRef.value.hide();
+    } catch (err) {
+        console.error('Error saving user view config', err);
+        notify('errors.writeRequest', 'negative');
+    }
+}
+
+onMounted(async () => {
+    setUserConfigViewData({});
+    await fetchViewConfigData();
+});
+</script>
+<template>
+    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md q-px-sm" dense>
+        <QPopupProxy ref="popupProxyRef">
+            <QCard class="column q-pa-md">
+                <QIcon name="info" size="sm" class="info-icon">
+                    <QTooltip>{{ t('Check the columns you want to see') }}</QTooltip>
+                </QIcon>
+                <span class="text-body1 q-mb-sm">{{ t('Visible columns') }}</span>
+                <QCheckbox
+                    :label="t('Tick all')"
+                    :model-value="areAllChecksMarked"
+                    @update:model-value="toggleMarkAll($event)"
+                    class="q-mb-sm"
+                />
+                <div v-if="columns.length > 0" class="checks-layout">
+                    <QCheckbox
+                        v-for="col in localColumns"
+                        :key="col.name"
+                        :label="col.label"
+                        v-model="col.visible"
+                    />
+                </div>
+                <QBtn
+                    class="full-width q-mt-md"
+                    color="primary"
+                    @click="saveConfig()"
+                    :label="t('globals.save')"
+                />
+            </QCard>
+        </QPopupProxy>
+        <QTooltip>{{ t('Visible columns') }}</QTooltip>
+    </QBtn>
+</template>
+
+<style lang="scss" scoped>
+.info-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+}
+
+.checks-layout {
+    display: grid;
+    grid-template-columns: repeat(3, 200px);
+}
+</style>
+
+<i18n>
+    es:
+        Check the columns you want to see: Marca las columnas que quieres ver
+        Visible columns: Columnas visibles
+        Tick all: Marcar todas
+</i18n>

src/components/common/TableVisibleColumns.vue

@@ -52,7 +52,7 @@ const toggleMarkAll = (val) => {
 
 const getConfig = async (url, filter) => {
     const response = await axios.get(url, {
-        params: { filter: filter },
+        params: { filter: JSON.stringify(filter) },
     });
     return response.data && response.data.length > 0 ? response.data[0] : null;
 };
@@ -60,7 +60,7 @@ const getConfig = async (url, filter) => {
 const fetchViewConfigData = async () => {
     try {
         const userConfigFilter = {
-            where: { tableCode: $props.tableCode, userFk: user.id },
+            where: { tableCode: $props.tableCode, userFk: user.value.id },
         };
         const userConfig = await getConfig('UserConfigViews', userConfigFilter);
 
@@ -74,8 +74,14 @@ const fetchViewConfigData = async () => {
         const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
 
         if (defaultConfig) {
+            // Si el backend devuelve una configuración por defecto la usamos
             setUserConfigViewData(defaultConfig.columns);
             return;
+        } else {
+            // Si no hay configuración por defecto mostramos todas las columnas
+            const defaultColumns = {};
+            $props.allColumns.forEach((col) => (defaultColumns[col] = true));
+            setUserConfigViewData(defaultColumns);
         }
     } catch (err) {
         console.err('Error fetching config view data', err);

src/components/common/VnBreadcrumbs.vue

@@ -18,7 +18,7 @@ watchEffect(() => {
         (matched) => Object.keys(matched.meta).length
     );
     breadcrumbs.value.length = 0;
-
+    if (!matched.value[0]) return;
     if (matched.value[0].name != 'Dashboard') {
         root.value = useCamelCase(matched.value[0].path.substring(1).toLowerCase());
 

src/components/common/VnCard.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { onBeforeMount, computed } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, onBeforeRouteUpdate } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
@@ -39,8 +39,17 @@ const arrayData = useArrayData(props.dataKey, {
 
 onBeforeMount(async () => {
     if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
-    await arrayData.fetch({ append: false });
+    await arrayData.fetch({ append: false, updateRouter: false });
 });
+
+if (props.baseUrl) {
+    onBeforeRouteUpdate(async (to, from) => {
+        if (to.params.id !== from.params.id) {
+            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
+            await arrayData.fetch({ append: false, updateRouter: false });
+        }
+    });
+}
 </script>
 <template>
     <QDrawer

src/components/common/VnComponent.vue

@@ -12,7 +12,7 @@ const $props = defineProps({
         default: () => {},
     },
     value: {
-        type: [Object, Number, String],
+        type: [Object, Number, String, Boolean],
         default: () => {},
     },
 });
@@ -54,7 +54,6 @@ function toValueAttrs(attrs) {
             v-bind="mix(toComponent).attrs"
             v-on="mix(toComponent).event ?? {}"
             v-model="model"
-            class="fit"
         />
     </span>
 </template>

src/components/common/VnDmsList.vue

@@ -273,6 +273,10 @@ function shouldRenderButton(button, isExternal = false) {
     if (button.name == 'download') return true;
     return button.external === isExternal;
 }
+
+defineExpose({
+    dmsRef,
+});
 </script>
 <template>
     <VnPaginate
@@ -374,7 +378,11 @@ function shouldRenderButton(button, isExternal = false) {
         />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showFormDialog()" />
+        <QBtn fab color="primary" icon="add" @click="showFormDialog()" class="fill-icon">
+            <QTooltip>
+                {{ t('Upload file') }}
+            </QTooltip>
+        </QBtn>
     </QPageSticky>
 </template>
 <style scoped>
@@ -392,4 +400,5 @@ en:
 es:
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     Generate identifier for original file: Generar identificador para archivo original
+    Upload file: Subir fichero
 </i18n>

src/components/common/VnInput.vue

@@ -93,7 +93,12 @@ const inputRules = [
                     name="close"
                     size="xs"
                     v-if="hover && value && !$attrs.disabled && $props.clearable"
-                    @click="value = null"
+                    @click="
+                        () => {
+                            value = null;
+                            emit('remove');
+                        }
+                    "
                 ></QIcon>
                 <QIcon v-if="info" name="info">
                     <QTooltip max-width="350px">

src/components/common/VnInputDate.vue

@@ -1,84 +1,31 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { onMounted, watch, computed, ref } from 'vue';
+import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import isValidDate from 'filters/isValidDate';
 
-const props = defineProps({
-    modelValue: {
-        type: String,
-        default: null,
-    },
-    readonly: {
-        type: Boolean,
-        default: false,
-    },
+const model = defineModel({ type: String });
+const $props = defineProps({
     isOutlined: {
         type: Boolean,
         default: false,
     },
-    emitDateFormat: {
-        type: Boolean,
-        default: false,
-    },
 });
-const hover = ref(false);
-
-const emit = defineEmits(['update:modelValue']);
 
 const { t } = useI18n();
 const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 
-const joinDateAndTime = (date, time) => {
-    if (!date) {
-        return null;
-    }
-    if (!time) {
-        return new Date(date).toISOString();
-    }
-    const [year, month, day] = date.split('/');
-    return new Date(`${year}-${month}-${day}T${time}`).toISOString();
-};
+const dateFormat = 'DD/MM/YYYY';
+const isPopupOpen = ref();
+const hover = ref();
+const mask = ref();
 
-const time = computed(() => (props.modelValue ? props.modelValue.split('T')?.[1] : null));
-const value = computed({
-    get() {
-        return props.modelValue;
-    },
-    set(value) {
-        emit(
-            'update:modelValue',
-            props.emitDateFormat ? new Date(value) : joinDateAndTime(value, time.value)
-        );
-    },
+onMounted(() => {
+    // fix quasar bug
+    mask.value = '##/##/####';
 });
 
-const isPopupOpen = ref(false);
-
-const onDateUpdate = (date) => {
-    value.value = date;
-    isPopupOpen.value = false;
-};
-
-const padDate = (value) => value.toString().padStart(2, '0');
-const formatDate = (dateString) => {
-    const date = new Date(dateString || '');
-    return `${date.getFullYear()}/${padDate(date.getMonth() + 1)}/${padDate(
-        date.getDate()
-    )}`;
-};
-const displayDate = (dateString) => {
-    if (!dateString || !isValidDate(dateString)) {
-        return '';
-    }
-    return new Date(dateString).toLocaleDateString([], {
-        year: 'numeric',
-        month: '2-digit',
-        day: '2-digit',
-    });
-};
-
 const styleAttrs = computed(() => {
-    return props.isOutlined
+    return $props.isOutlined
         ? {
               dense: true,
               outlined: true,
@@ -86,46 +33,114 @@ const styleAttrs = computed(() => {
           }
         : {};
 });
+
+const formattedDate = computed({
+    get() {
+        if (!model.value) return model.value;
+        return date.formatDate(new Date(model.value), dateFormat);
+    },
+    set(value) {
+        if (value == model.value) return;
+        let newDate;
+        if (value) {
+            // parse input
+            if (value.includes('/')) {
+                if (value.length == 6) value = value + new Date().getFullYear();
+                if (value.length >= 10) {
+                    if (value.at(2) == '/') value = value.split('/').reverse().join('/');
+                    value = date.formatDate(
+                        new Date(value).toISOString(),
+                        'YYYY-MM-DDTHH:mm:ss.SSSZ'
+                    );
+                }
+            }
+            const [year, month, day] = value.split('-').map((e) => parseInt(e));
+            newDate = new Date(year, month - 1, day);
+            if (model.value) {
+                const orgDate =
+                    model.value instanceof Date ? model.value : new Date(model.value);
+
+                newDate.setHours(
+                    orgDate.getHours(),
+                    orgDate.getMinutes(),
+                    orgDate.getSeconds(),
+                    orgDate.getMilliseconds()
+                );
+            }
+        }
+        if (!isNaN(newDate)) model.value = newDate.toISOString();
+    },
+});
+
+const popupDate = computed(() =>
+    model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
+);
+
+watch(
+    () => model.value,
+    (val) => (formattedDate.value = val),
+    { immediate: true }
+);
 </script>
 
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            v-model="formattedDate"
             class="vn-input-date"
-            readonly
-            :model-value="displayDate(value)"
+            :mask="mask"
+            placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
             :rules="$attrs.required ? [requiredFieldRule] : null"
-            @click="isPopupOpen = true"
+            :clearable="false"
         >
             <template #append>
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value && !readonly"
-                    @click="onDateUpdate(null)"
-                ></QIcon>
-                <QIcon name="event" class="cursor-pointer">
-                    <QPopupProxy
-                        v-model="isPopupOpen"
-                        cover
+                    v-if="
+                        ($attrs.clearable == undefined || $attrs.clearable) &&
+                        hover &&
+                        model &&
+                        !$attrs.disable
+                    "
+                    @click="
+                        model = null;
+                        isPopupOpen = false;
+                    "
+                />
+                <QIcon
+                    name="event"
+                    class="cursor-pointer"
+                    @click="isPopupOpen = !isPopupOpen"
+                    :title="t('Open date')"
+                />
+            </template>
+            <QMenu
                 transition-show="scale"
                 transition-hide="scale"
-                        :no-parent-event="props.readonly"
+                v-model="isPopupOpen"
+                anchor="bottom left"
+                self="top start"
+                :no-focus="true"
+                :no-parent-event="true"
             >
                 <QDate
+                    v-model="popupDate"
+                    :landscape="true"
                     :today-btn="true"
-                            :model-value="formatDate(value)"
-                            @update:model-value="onDateUpdate"
+                    @update:model-value="
+                        (date) => {
+                            formattedDate = date;
+                            isPopupOpen = false;
+                        }
+                    "
                 />
-                    </QPopupProxy>
-                </QIcon>
-            </template>
+            </QMenu>
         </QInput>
     </div>
 </template>
-
 <style lang="scss">
 .vn-input-date.q-field--standard.q-field--readonly .q-field__control:before {
     border-bottom-style: solid;
@@ -135,3 +150,7 @@ const styleAttrs = computed(() => {
     border-style: solid;
 }
 </style>
+<i18n>
+    es:
+        Open date: Abrir fecha
+</i18n>

src/components/common/VnInputTime.vue

@@ -1,14 +1,11 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { watch, computed, ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
-import isValidDate from 'filters/isValidDate';
+import { date } from 'quasar';
 
+const model = defineModel({ type: String });
 const props = defineProps({
-    modelValue: {
-        type: String,
-        default: null,
-    },
-    readonly: {
+    timeOnly: {
         type: Boolean,
         default: false,
     },
@@ -17,43 +14,13 @@ const props = defineProps({
         default: false,
     },
 });
-const emit = defineEmits(['update:modelValue']);
 const { t } = useI18n();
 const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 
-const value = computed({
-    get() {
-        return props.modelValue;
-    },
-    set(value) {
-        const [hours, minutes] = value.split(':');
-        const date = new Date(props.modelValue);
-        date.setHours(Number.parseInt(hours) || 0, Number.parseInt(minutes) || 0, 0, 0);
-        emit('update:modelValue', value ? date.toISOString() : null);
-    },
-});
-
-const isPopupOpen = ref(false);
-const onDateUpdate = (date) => {
-    internalValue.value = date;
-};
-
-const save = () => {
-    value.value = internalValue.value;
-};
-const formatTime = (dateString) => {
-    if (!dateString || !isValidDate(dateString)) {
-        return '';
-    }
-
-    const date = new Date(dateString || '');
-    return date.toLocaleTimeString([], {
-        hour: '2-digit',
-        minute: '2-digit',
-    });
-};
-
-const internalValue = ref(formatTime(value));
+const dateFormat = 'HH:mm';
+const isPopupOpen = ref();
+const hover = ref();
+const inputRef = ref();
 
 const styleAttrs = computed(() => {
     return props.isOutlined
@@ -64,54 +31,115 @@ const styleAttrs = computed(() => {
           }
         : {};
 });
+
+const formattedTime = computed({
+    get() {
+        if (!model.value || model.value?.length <= 5) return model.value;
+        return dateToTime(model.value);
+    },
+    set(value) {
+        if (value == model.value) return;
+        let time = value;
+        if (time) {
+            if (time?.length > 5) time = dateToTime(time);
+            else {
+                if (time.length == 1 && parseInt(time) > 2) time = time.padStart(2, '0');
+                time = time.padEnd(5, '0');
+                if (!time.includes(':'))
+                    time = time.substring(0, 2) + ':' + time.substring(3, 5);
+            }
+            if (!props.timeOnly) {
+                const [hh, mm] = time.split(':');
+                const date = model.value ?? Date.vnNew();
+                date.setHours(hh, mm, 0);
+                time = date?.toISOString();
+            }
+        }
+        model.value = time;
+    },
+});
+
+function dateToTime(newDate) {
+    return date.formatDate(new Date(newDate), dateFormat);
+}
+const timeField = ref();
+watch(
+    () => model.value,
+    (val) => (formattedTime.value = val),
+    { immediate: true }
+);
+
+watch(
+    () => formattedTime.value,
+    async (val) => {
+        let position = 3;
+        const input = inputRef.value?.getNativeElement();
+        if (!val || !input) return;
+
+        let [hh, mm] = val.split(':');
+        hh = parseInt(hh);
+        if (hh >= 10 || mm != '00') return;
+
+        await nextTick();
+        await nextTick();
+        if (!hh) position = 0;
+        input.setSelectionRange(position, position);
+    },
+    { immediate: true }
+);
 </script>
 
 <template>
+    <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            ref="inputRef"
             class="vn-input-time"
-        readonly
-        :model-value="formatTime(value)"
+            mask="##:##"
+            placeholder="--:--"
+            v-model="formattedTime"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
+            style="min-width: 100px"
             :rules="$attrs.required ? [requiredFieldRule] : null"
-        @click="isPopupOpen = true"
+            @click="isPopupOpen = false"
+            @focus="inputRef.getNativeElement().setSelectionRange(0, 0)"
         >
             <template #append>
-            <QIcon name="Schedule" class="cursor-pointer">
-                <QPopupProxy
-                    v-model="isPopupOpen"
-                    cover
+                <QIcon
+                    name="close"
+                    size="xs"
+                    v-if="
+                        ($attrs.clearable == undefined || $attrs.clearable) &&
+                        hover &&
+                        model &&
+                        !$attrs.disable
+                    "
+                    @click="
+                        model = null;
+                        isPopupOpen = false;
+                    "
+                />
+                <QIcon
+                    name="Schedule"
+                    class="cursor-pointer"
+                    @click="isPopupOpen = !isPopupOpen"
+                    :title="t('Open time')"
+                />
+            </template>
+            <QMenu
                 transition-show="scale"
                 transition-hide="scale"
-                    :no-parent-event="props.readonly"
+                v-model="isPopupOpen"
+                anchor="bottom left"
+                self="top start"
+                :no-focus="true"
+                :no-parent-event="true"
             >
-                    <QTime
-                        :format24h="false"
-                        :model-value="formatTime(value)"
-                        @update:model-value="onDateUpdate"
-                    >
-                        <div class="row items-center justify-end q-gutter-sm">
-                            <QBtn
-                                :label="t('Cancel')"
-                                color="primary"
-                                flat
-                                v-close-popup
-                            />
-                            <QBtn
-                                label="Ok"
-                                color="primary"
-                                flat
-                                @click="save"
-                                v-close-popup
-                            />
-                        </div>
-                    </QTime>
-                </QPopupProxy>
-            </QIcon>
-        </template>
+                <QTime v-model="formattedTime" mask="HH:mm" landscape now-btn />
+            </QMenu>
         </QInput>
+    </div>
 </template>
-
 <style lang="scss">
 .vn-input-time.q-field--standard.q-field--readonly .q-field__control:before {
     border-bottom-style: solid;
@@ -121,8 +149,8 @@ const styleAttrs = computed(() => {
     border-style: solid;
 }
 </style>
-
 <i18n>
     es:
-    Cancel: Cancelar
+        Open time: Abrir tiempo
 </i18n>
+, nextTick

src/components/common/VnLog.vue

@@ -49,6 +49,7 @@ const filter = {
         'changedModelId',
         'changedModelValue',
         'description',
+        'summaryId',
     ],
     include: [
         {
@@ -459,12 +460,12 @@ onUnmounted(() => {
                                 :style="{
                                     backgroundColor: useColor(modelLog.model),
                                 }"
-                                :title="modelLog.model"
+                                :title="`${modelLog.model} #${modelLog.id}`"
                             >
                                 {{ t(modelLog.modelI18n) }}
                             </QChip>
-                            <span class="model-id" v-if="modelLog.id"
-                                >#{{ modelLog.id }}</span
+                            <span class="model-id" v-if="modelLog.summaryId"
+                                >#{{ modelLog.summaryId }}</span
                             >
                             <span class="model-value" :title="modelLog.showValue">
                                 {{ modelLog.showValue }}

src/components/common/VnSelect.vue

@@ -61,6 +61,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    useLike: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const { t } = useI18n();
@@ -71,6 +75,7 @@ const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
 const dataRef = ref();
+const lastVal = ref();
 
 const value = computed({
     get() {
@@ -81,14 +86,31 @@ const value = computed({
     },
 });
 
+watch(options, (newValue) => {
+    setOptions(newValue);
+});
+
+watch(modelValue, (newValue) => {
+    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
+        fetchFilter(newValue);
+});
+
+onMounted(() => {
+    setOptions(options.value);
+    if ($props.url && $props.modelValue && !findKeyInOptions())
+        fetchFilter($props.modelValue);
+    if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
+});
+
+function findKeyInOptions() {
+    if (!$props.options) return;
+    return filter($props.modelValue, $props.options)?.length;
+}
+
 function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
-onMounted(() => {
-    setOptions(options.value);
-    if ($props.url && $props.modelValue) fetchFilter($props.modelValue);
-});
 
 function filter(val, options) {
     const search = val.toString().toLowerCase();
@@ -103,7 +125,8 @@ function filter(val, options) {
             });
         }
 
-        const id = row.id;
+        if (!row) return;
+        const id = row[$props.optionValue];
         const optionLabel = String(row[$props.optionLabel]).toLowerCase();
 
         return id == search || optionLabel.includes(search);
@@ -114,19 +137,28 @@ async function fetchFilter(val) {
     if (!$props.url || !dataRef.value) return;
 
     const { fields, sortBy, limit } = $props;
-    let key = optionLabel.value;
+    let key = optionFilter.value ?? optionLabel.value;
 
-    if (new RegExp(/\d/g).test(val)) key = optionFilter.value ?? optionValue.value;
+    if (new RegExp(/\d/g).test(val)) key = optionValue.value;
 
-    const where = { ...{ [key]: { like: `%${val}%` } }, ...$props.where };
+    const defaultWhere = $props.useLike
+        ? { [key]: { like: `%${val}%` } }
+        : { [key]: val };
+    const where = { ...(val ? defaultWhere : {}), ...$props.where };
     const fetchOptions = { where, order: sortBy, limit };
     if (fields) fetchOptions.fields = fields;
     return dataRef.value.fetch(fetchOptions);
 }
 
 async function filterHandler(val, update) {
-    if (!$props.defaultFilter) return update();
+    if (!val && lastVal.value === val) {
+        lastVal.value = val;
+        return update();
+    }
+    lastVal.value = val;
     let newOptions;
+
+    if (!$props.defaultFilter) return update();
     if ($props.url) {
         newOptions = await fetchFilter(val);
     } else newOptions = filter(val, myOptionsOriginal.value);
@@ -142,19 +174,6 @@ async function filterHandler(val, update) {
         }
     );
 }
-
-watch(options, (newValue) => {
-    setOptions(newValue);
-});
-
-watch(modelValue, (newValue) => {
-    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
-        fetchFilter(newValue);
-});
-
-onMounted(async () => {
-    if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
-});
 </script>
 
 <template>

src/components/common/VnSelectCache.vue

@@ -0,0 +1,39 @@
+<script setup>
+import { ref, onBeforeMount, useAttrs } from 'vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+
+const $props = defineProps({
+    row: {
+        type: [Object],
+        default: null,
+    },
+    find: {
+        type: [String, Object],
+        default: null,
+        description: 'search in row to add default options',
+    },
+});
+const options = ref([]);
+
+onBeforeMount(async () => {
+    const { url, optionValue, optionLabel } = useAttrs();
+    const findBy = $props.find ?? url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
+    if (!findBy || !$props.row) return;
+    // is object
+    if (typeof findBy == 'object') {
+        const { value, label } = findBy;
+        if (!$props.row[value] || !$props.row[label]) return;
+        return (options.value = [
+            {
+                [optionValue ?? 'id']: $props.row[value],
+                [optionLabel ?? 'name']: $props.row[label],
+            },
+        ]);
+    }
+    // is string
+    if ($props.row[findBy]) options.value = [$props.row[findBy]];
+});
+</script>
+<template>
+    <VnSelect v-bind="$attrs" :options="$attrs.options ?? options" />
+</template>

src/components/ui/CardDescriptor.vue

@@ -46,7 +46,7 @@ let arrayData;
 let store;
 let entity;
 const isLoading = ref(false);
-
+const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -56,12 +56,19 @@ onBeforeMount(async () => {
         skip: 0,
     });
     store = arrayData.store;
-    entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+    entity = computed(() => {
+        const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
+        if (data) emit('onFetch', data);
+        return data;
+    });
+
     // It enables to load data only once if the module is the same as the dataKey
-    if ($props.dataKey !== route.meta.moduleName || !route.params.id) await getData();
+    if (!isSameDataKey.value || !route.params.id) await getData();
     watch(
         () => [$props.url, $props.filter],
-        async () => await getData()
+        async () => {
+            if (!isSameDataKey.value) await getData();
+        }
     );
 });
 
@@ -77,14 +84,50 @@ async function getData() {
         isLoading.value = false;
     }
 }
+
+function getValueFromPath(path) {
+    if (!path) return;
+    const keys = path.toString().split('.');
+    let current = entity.value;
+
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
+    }
+    return current;
+}
+
 const emit = defineEmits(['onFetch']);
+
+const iconModule = computed(() => route.matched[1].meta.icon);
+const toModule = computed(() =>
+    route.matched[1].path.split('/').length > 2
+        ? route.matched[1].redirect
+        : route.matched[1].children[0].redirect
+);
 </script>
 
 <template>
     <div class="descriptor">
         <template v-if="entity && !isLoading">
             <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action" />
+                <slot name="header-extra-action"
+                    ><QBtn
+                        round
+                        flat
+                        dense
+                        size="md"
+                        :icon="iconModule"
+                        color="white"
+                        class="link"
+                        :to="$attrs['to-module'] ?? toModule"
+                    >
+                        <QTooltip>
+                            {{ t('globals.goToModuleIndex') }}
+                        </QTooltip>
+                    </QBtn></slot
+                >
+
                 <QBtn
                     @click.stop="viewSummary(entity.id, $props.summary)"
                     round
@@ -127,9 +170,9 @@ const emit = defineEmits(['onFetch']);
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
                     </QTooltip>
-                    <QMenu>
+                    <QMenu ref="menuRef">
                         <QList>
-                            <slot name="menu" :entity="entity" />
+                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
                         </QList>
                     </QMenu>
                 </QBtn>
@@ -139,8 +182,8 @@ const emit = defineEmits(['onFetch']);
                 <QList dense>
                     <QItemLabel header class="ellipsis text-h5" :lines="1">
                         <div class="title">
-                            <span v-if="$props.title" :title="$props.title">
-                                {{ entity[title] ?? $props.title }}
+                            <span v-if="$props.title" :title="getValueFromPath(title)">
+                                {{ getValueFromPath(title) ?? $props.title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span :title="entity.name">
@@ -151,7 +194,7 @@ const emit = defineEmits(['onFetch']);
                     </QItemLabel>
                     <QItem dense>
                         <QItemLabel class="subtitle" caption>
-                            #{{ $props.subtitle ?? entity.id }}
+                            #{{ getValueFromPath(subtitle) ?? entity.id }}
                         </QItemLabel>
                     </QItem>
                 </QList>

src/components/ui/CardSummary.vue

@@ -187,15 +187,10 @@ function existSummary(routes) {
                 color: lighten($primary, 20%);
             }
             .q-checkbox {
-                display: flex;
-                margin-bottom: 9px;
                 & .q-checkbox__label {
-                    margin-left: 31px;
                     color: var(--vn-text-color);
                 }
                 & .q-checkbox__inner {
-                    position: absolute;
-                    left: 0;
                     color: var(--vn-label-color);
                 }
             }

src/components/ui/CatalogItem.vue

@@ -7,7 +7,7 @@ import VnImg from 'src/components/ui/VnImg.vue';
 import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
-import toCurrency from '../../../filters/toCurrency';
+import { toCurrency } from 'filters/index';
 
 const DEFAULT_PRICE_KG = 0;
 
@@ -18,6 +18,10 @@ defineProps({
         type: Object,
         required: true,
     },
+    isCatalog: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const dialog = ref(null);
@@ -27,8 +31,8 @@ const dialog = ref(null);
     <div class="container order-catalog-item overflow-hidden">
         <QCard class="card shadow-6">
             <div class="img-wrapper">
-                <VnImg :id="item.id" class="image" />
-                <div v-if="item.hex" class="item-color-container">
+                <VnImg :id="item.id" zoom-size="lg" class="image" />
+                <div v-if="item.hex && isCatalog" class="item-color-container">
                     <div
                         class="item-color"
                         :style="{ backgroundColor: `#${item.hex}` }"
@@ -48,13 +52,18 @@ const dialog = ref(null);
                         :value="item?.[`value${index + 4}`]"
                     />
                 </template>
+                <div v-if="item.minQuantity" class="min-quantity">
+                    <QIcon name="production_quantity_limits" size="xs" />
+                    {{ item.minQuantity }}
+                </div>
                 <div class="footer">
                     <div class="price">
-                        <p>
+                        <p v-if="isCatalog">
                             {{ item.available }} {{ t('to') }}
                             {{ toCurrency(item.price) }}
                         </p>
-                        <QIcon name="add_circle" class="icon">
+                        <slot name="price" />
+                        <QIcon v-if="isCatalog" name="add_circle" class="icon">
                             <QTooltip>{{ t('globals.add') }}</QTooltip>
                             <QPopupProxy ref="dialog">
                                 <OrderCatalogItemDialog
@@ -128,6 +137,11 @@ const dialog = ref(null);
     }
 }
 
+.min-quantity {
+    text-align: right;
+    color: $negative !important;
+}
+
 .footer {
     .price {
         overflow: hidden;

src/components/ui/QCalendarMonthWrapper.vue

@@ -52,8 +52,8 @@ const containerClasses = computed(() => {
     --calendar-border-current: #84d0e2 2px solid;
     --calendar-current-color-dark: #84d0e2;
     // Colores de fondo del calendario en dark mode
-    --calendar-outside-background-dark: #222;
-    --calendar-background-dark: #222;
+    --calendar-outside-background-dark: var(--vn-section-color);
+    --calendar-background-dark: var(--vn-section-color);
 }
 
 // Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
@@ -70,8 +70,27 @@ const containerClasses = computed(() => {
     text-transform: capitalize;
 }
 
+.q-calendar-month__head--workweek,
+.q-calendar-month__head--weekday,
+// .q-calendar-month__workweek.q-past-day,
+.q-calendar-month__week :nth-child(6),
+:nth-child(7) {
+    color: var(--vn-label-color);
+}
+
+.q-calendar-month__head--weekdays > div[aria-label='miércoles'] > span {
+    /* color: transparent; */
+    visibility: hidden;
+    // position: absolute;
+}
+.q-calendar-month__head--weekdays > div[aria-label='miércoles'] > span:after {
+    content: 'X';
+    visibility: visible;
+    left: 33%;
+    position: absolute;
+}
 .transparent-background {
-    --calendar-background-dark: transparent;
+    // --calendar-background-dark: transparent;
     --calendar-background: transparent;
     --calendar-outside-background-dark: transparent;
 }
@@ -110,11 +129,6 @@ const containerClasses = computed(() => {
             cursor: pointer;
         }
     }
-    .q-calendar-month__week--days > div:nth-child(6),
-    .q-calendar-month__week--days > div:nth-child(7) {
-        // Cambia el color de los días sábado y domingo
-        color: #777777;
-    }
 
     .q-calendar-month__week--wrapper {
         margin-bottom: 4px;
@@ -124,6 +138,7 @@ const containerClasses = computed(() => {
         height: 32px;
         display: flex;
         justify-content: center;
+        color: var(--vn-label-color);
     }
 
     .q-calendar__button--bordered {
@@ -147,7 +162,7 @@ const containerClasses = computed(() => {
     .q-calendar-month__head--workweek,
     .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
         text-transform: capitalize;
-        color: $color-font-secondary;
+        color: var(--vn-label-color);
         font-weight: bold;
         font-size: 0.8rem;
         text-align: center;

src/components/ui/SkeletonForm.vue

@@ -1,20 +1,14 @@
 <template>
-    <div class="q-pa-md">
     <div class="row q-gutter-md q-mb-md">
-            <QSkeleton type="QInput" square />
-            <QSkeleton type="QInput" square />
+        <QSkeleton type="QInput" class="col" square />
+        <QSkeleton type="QInput" class="col" square />       
     </div>
     <div class="row q-gutter-md q-mb-md">
-            <QSkeleton type="QInput" square />
-            <QSkeleton type="QInput" square />
+        <QSkeleton type="QInput" class="col" square />
+        <QSkeleton type="QInput" class="col" square />       
     </div>
     <div class="row q-gutter-md q-mb-md">
-            <QSkeleton type="QInput" square />
-            <QSkeleton type="QInput" square />
-        </div>
-        <div class="row q-gutter-md">
-            <QSkeleton type="QBtn" />
-            <QSkeleton type="QBtn" />
-        </div>
+        <QSkeleton type="QInput" class="col" square />
+        <QSkeleton type="QInput" class="col" square />       
     </div>
 </template>

src/components/ui/VnFilterPanel.vue

@@ -7,27 +7,29 @@ import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
-const params = defineModel({ default: {}, required: true, type: Object });
 const $props = defineProps({
+    modelValue: {
+        type: Object,
+        default: () => {},
+    },
     dataKey: {
         type: String,
         required: true,
     },
     searchButton: {
         type: Boolean,
-        required: false,
         default: false,
     },
     showAll: {
         type: Boolean,
         default: true,
     },
-    unremovableParams: {
+    unRemovableParams: {
         type: Array,
         required: false,
         default: () => [],
-        description:
-            'Algunos filtros vienen con parametros de búsqueda por default y necesitan tener si o si un valor, por eso de ser necesario, esta prop nos sirve para saber que filtros podemos remover y cuales no',
+        description: `Some filters come with default search parameters and require a value.
+            This prop helps us determine which filters can be removed and which cannot.`,
     },
     exprBuilder: {
         type: Function,
@@ -55,18 +57,27 @@ const $props = defineProps({
     },
 });
 
-const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
+defineExpose({ search });
+const emit = defineEmits([
+    'update:modelValue',
+    'refresh',
+    'clear',
+    'search',
+    'init',
+    'remove',
+]);
 
 const arrayData = useArrayData($props.dataKey, {
     exprBuilder: $props.exprBuilder,
     searchUrl: $props.searchUrl,
-    navigate: {},
+    navigate: $props.redirect ? {} : null,
 });
 const route = useRoute();
 const store = arrayData.store;
-
+const userParams = ref({});
 onMounted(() => {
-    emit('init', { params: params.value });
+    userParams.value = $props.modelValue ?? {};
+    emit('init', { params: userParams.value });
 });
 
 function setUserParams(watchedParams) {
@@ -75,7 +86,7 @@ function setUserParams(watchedParams) {
     if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
     watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
     delete watchedParams.filter;
-    params.value = { ...params.value, ...watchedParams };
+    userParams.value = { ...userParams.value, ...watchedParams };
 }
 
 watch(
@@ -88,18 +99,23 @@ watch(
     (val) => setUserParams(val)
 );
 
+watch(
+    () => $props.modelValue,
+    (val) => (userParams.value = val ?? {})
+);
+
 const isLoading = ref(false);
 async function search(evt) {
     if (evt && $props.disableSubmitEvent) return;
 
     store.filter.where = {};
     isLoading.value = true;
-    const filter = { ...params.value };
+    const filter = { ...userParams.value, ...$props.modelValue };
     store.userParamsChanged = true;
-    store.filter.skip = 0;
-    store.skip = 0;
-    const { params: newParams } = await arrayData.addFilter({ params: params.value });
-    params.value = newParams;
+    const { params: newParams } = await arrayData.addFilter({
+        params: filter,
+    });
+    userParams.value = newParams;
 
     if (!$props.showAll && !Object.values(filter).length) store.data = [];
 
@@ -109,8 +125,9 @@ async function search(evt) {
 
 async function reload() {
     isLoading.value = true;
-    const params = Object.values(params.value).filter((param) => param);
-
+    const params = Object.values(userParams.value).filter((param) => param);
+    store.skip = 0;
+    store.page = 1;
     await arrayData.fetch({ append: false });
     if (!$props.showAll && !params.length) store.data = [];
     isLoading.value = false;
@@ -120,20 +137,19 @@ async function reload() {
 async function clearFilters() {
     isLoading.value = true;
     store.userParamsChanged = true;
-    store.filter.skip = 0;
-    store.skip = 0;
+    arrayData.reset(['skip', 'filter.skip', 'page']);
     // Filtrar los params no removibles
-    const removableFilters = Object.keys(params.value).filter((param) =>
-        $props.unremovableParams.includes(param)
+    const removableFilters = Object.keys(userParams.value).filter((param) =>
+        $props.unRemovableParams.includes(param)
     );
     const newParams = {};
     // Conservar solo los params que no son removibles
     for (const key of removableFilters) {
-        newParams[key] = params.value[key];
+        newParams[key] = userParams.value[key];
     }
-    params.value = {};
-    params.value = { ...newParams }; // Actualizar los params con los removibles
-    await arrayData.applyFilter({ params: params.value });
+    userParams.value = {};
+    userParams.value = { ...newParams }; // Actualizar los params con los removibles
+    await arrayData.applyFilter({ params: userParams.value });
 
     if (!$props.showAll) {
         store.data = [];
@@ -141,12 +157,13 @@ async function clearFilters() {
 
     isLoading.value = false;
     emit('clear');
+    emit('update:modelValue', userParams.value);
 }
 
 const tagsList = computed(() => {
     const tagList = [];
-    for (const key of Object.keys(params.value)) {
-        const value = params.value[key];
+    for (const key of Object.keys(userParams.value)) {
+        const value = userParams.value[key];
         if (value == null || ($props.hiddenTags || []).includes(key)) continue;
         tagList.push({ label: key, value });
     }
@@ -161,9 +178,10 @@ const customTags = computed(() =>
 );
 
 async function remove(key) {
-    params.value[key] = undefined;
+    userParams.value[key] = undefined;
     search();
     emit('remove', key);
+    emit('update:modelValue', userParams.value);
 }
 
 function formatValue(value) {
@@ -175,6 +193,14 @@ function formatValue(value) {
 </script>
 
 <template>
+    <QBtn
+        class="q-mt-lg q-mr-xs q-mb-lg"
+        round
+        color="primary"
+        style="position: fixed; z-index: 1; right: 0; bottom: 0"
+        icon="search"
+        @click="search()"
+    ></QBtn>
     <QForm @submit="search" id="filterPanelForm">
         <QList dense>
             <QItem class="q-mt-xs">
@@ -223,7 +249,7 @@ function formatValue(value) {
                     <VnFilterPanelChip
                         v-for="chip of tags"
                         :key="chip.label"
-                        :removable="!unremovableParams.includes(chip.label)"
+                        :removable="!unRemovableParams.includes(chip.label)"
                         @remove="remove(chip.label)"
                     >
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
@@ -236,7 +262,7 @@ function formatValue(value) {
                     <slot
                         v-if="$slots.customTags"
                         name="customTags"
-                        :params="params"
+                        :params="userParams"
                         :tags="customTags"
                         :format-fn="formatValue"
                         :search-fn="search"
@@ -246,25 +272,8 @@ function formatValue(value) {
             <QSeparator />
         </QList>
         <QList dense class="list q-gutter-y-sm q-mt-sm">
-            <slot name="body" :params="params" :search-fn="search"></slot>
+            <slot name="body" :params="userParams" :search-fn="search"></slot>
         </QList>
-        <template v-if="$props.searchButton">
-            <QItem>
-                <QItemSection class="q-py-sm">
-                    <QBtn
-                        :label="t('Search')"
-                        class="full-width"
-                        color="primary"
-                        dense
-                        icon="search"
-                        rounded
-                        :type="disableSubmitEvent ? 'button' : 'submit'"
-                        unelevated
-                    />
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-        </template>
     </QForm>
     <QInnerLoading
         :label="t('globals.pleaseWait')"

src/components/ui/VnImg.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useSession } from 'src/composables/useSession';
 
 const $props = defineProps({
@@ -28,21 +28,29 @@ const $props = defineProps({
 const show = ref(false);
 const token = useSession().getTokenMultimedia();
 const timeStamp = ref(`timestamp=${Date.now()}`);
-const url = computed(
-    () =>
-        `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
-);
+import noImage from '/no-user.png';
+import { useRole } from 'src/composables/useRole';
+const url = computed(() => {
+    const isEmployee = useRole().isEmployee();
+    return isEmployee
+        ? `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
+        : noImage;
+});
 const reload = () => {
     timeStamp.value = `timestamp=${Date.now()}`;
 };
 defineExpose({
     reload,
 });
-
-onMounted(() => {});
 </script>
 <template>
-    <QImg :src="url" v-bind="$attrs" @click="show = !show" spinner-color="primary" />
+    <QImg
+        :class="{ zoomIn: $props.zoomSize }"
+        :src="url"
+        v-bind="$attrs"
+        @click="show = !show"
+        spinner-color="primary"
+    />
     <QDialog v-model="show" v-if="$props.zoomSize">
         <QImg
             :src="url"
@@ -56,7 +64,9 @@ onMounted(() => {});
 
 <style lang="scss" scoped>
 .q-img {
+    &.zoomIn {
         cursor: zoom-in;
+    }
     min-width: 50px;
 }
 .rounded {

src/components/ui/VnLv.vue

@@ -2,6 +2,7 @@
 import { dashIfEmpty } from 'src/filters';
 import { useI18n } from 'vue-i18n';
 import { useClipboard } from 'src/composables/useClipboard';
+import { computed } from 'vue';
 
 const $props = defineProps({
     label: { type: String, default: null },
@@ -24,52 +25,67 @@ function copyValueText() {
         },
     });
 }
+const val = computed(() => $props.value);
 </script>
-<style scoped>
+<template>
+    <div class="vn-label-value">
+        <QCheckbox
+            v-if="typeof value === 'boolean'"
+            v-model="val"
+            :label="label"
+            disable
+            dense
+        />
+        <template v-else>
+            <div v-if="label || $slots.label" class="label">
+                <slot name="label">
+                    <span>{{ label }}</span>
+                </slot>
+            </div>
+            <div class="value">
+                <slot name="value">
+                    <span :title="value">
+                        {{ dash ? dashIfEmpty(value) : value }}
+                    </span>
+                </slot>
+            </div>
+            <div class="info" v-if="info">
+                <QIcon name="info" class="cursor-pointer" size="xs" color="grey">
+                    <QTooltip class="bg-dark text-white shadow-4" :offset="[10, 10]">
+                        {{ info }}
+                    </QTooltip>
+                </QIcon>
+            </div>
+            <div class="copy" v-if="copy && value" @click="copyValueText()">
+                <QIcon name="Content_Copy" color="primary">
+                    <QTooltip>{{ t('globals.copyClipboard') }}</QTooltip>
+                </QIcon>
+            </div>
+        </template>
+    </div>
+</template>
+<style lang="scss" scoped>
+.vn-label-value {
+    &:hover .copy {
+        visibility: visible;
+        cursor: pointer;
+    }
+
     .label,
     .value {
         white-space: pre-line;
         word-wrap: break-word;
     }
-</style>
-<template>
-    <div class="vn-label-value">
-        <div v-if="$props.label || $slots.label" class="label">
-            <slot name="label">
-                <span>{{ $props.label }}</span>
-            </slot>
-        </div>
-        <div class="value">
-            <slot name="value">
-                <span :title="$props.value">
-                    {{ $props.dash ? dashIfEmpty($props.value) : $props.value }}
-                </span>
-            </slot>
-        </div>
-        <div class="info" v-if="$props.info">
-            <QIcon name="info" class="cursor-pointer" size="xs" color="grey">
-                <QTooltip class="bg-dark text-white shadow-4" :offset="[10, 10]">
-                    {{ $props.info }}
-                </QTooltip>
-            </QIcon>
-        </div>
-        <div class="copy" v-if="$props.copy && $props.value" @click="copyValueText()">
-            <QIcon name="Content_Copy" color="primary">
-                <QTooltip>{{ t('globals.copyClipboard') }}</QTooltip>
-            </QIcon>
-        </div>
-    </div>
-</template>
-
-<style lang="scss" scoped>
-.vn-label-value:hover .copy {
-    visibility: visible;
-    cursor: pointer;
-}
     .copy {
         visibility: hidden;
     }
+
     .info {
         margin-left: 5px;
     }
+}
+
+:deep(.q-checkbox.disabled) {
+    opacity: 1 !important;
+}
 </style>

src/components/ui/VnNotes.vue

@@ -78,6 +78,7 @@ async function insert() {
         ref="vnPaginateRef"
         class="show"
         v-bind="$attrs"
+        search-url="notes"
     >
         <template #body="{ rows }">
             <TransitionGroup name="list" tag="div" class="column items-center full-width">

src/components/ui/VnPaginate.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, watch } from 'vue';
+import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 
@@ -26,6 +26,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    userFilter: {
+        type: Object,
+        default: null,
+    },
     where: {
         type: Object,
         default: null,
@@ -80,6 +84,7 @@ const pagination = ref({
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
+    userFilter: props.userFilter,
     where: props.where,
     limit: props.limit,
     order: props.order,
@@ -95,6 +100,8 @@ onMounted(async () => {
     mounted.value = true;
 });
 
+onBeforeUnmount(() => arrayData.reset());
+
 watch(
     () => props.data,
     () => {
@@ -118,8 +125,7 @@ const addFilter = async (filter, params) => {
 
 async function fetch(params) {
     useArrayData(props.dataKey, params);
-    store.filter.skip = 0;
-    store.skip = 0;
+    arrayData.reset(['filter.skip', 'skip']);
     await arrayData.fetch({ append: false });
     if (!store.hasMoreData) {
         isLoading.value = false;

src/components/ui/VnSearchbar.vue

@@ -103,7 +103,7 @@ async function search() {
     const staticParams = Object.entries(store.userParams).filter(
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
-    store.skip = 0;
+    arrayData.reset(['skip', 'page']);
 
     if (props.makeFetch)
         await arrayData.applyFilter({

src/components/ui/VnSubToolbar.vue

@@ -1,6 +1,7 @@
 <script setup>
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onMounted, onBeforeUnmount, ref } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
+
 const stateStore = useStateStore();
 const actions = ref(null);
 const data = ref(null);
@@ -24,13 +25,12 @@ onMounted(() => {
     if (data.value) observer.observe(data.value, opts);
 });
 
-onUnmounted(() => {
-    stateStore.toggleSubToolbar();
-});
+onBeforeUnmount(() => stateStore.toggleSubToolbar());
 </script>
 
 <template>
     <QToolbar
+        id="subToolbar"
         class="justify-end sticky"
         v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
     >

src/composables/useArrayData.js

@@ -1,4 +1,4 @@
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import axios from 'axios';
 import { useArrayDataStore } from 'stores/useArrayDataStore';
@@ -16,20 +16,19 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     const router = useRouter();
     let canceller = null;
 
-    const page = ref(1);
-
     onMounted(() => {
         setOptions();
-        store.skip = 0;
+        reset(['skip']);
 
         const query = route.query;
         const searchUrl = store.searchUrl;
         if (query[searchUrl]) {
             const params = JSON.parse(query[searchUrl]);
-            const filter = params?.filter;
+            const filter = params?.filter && JSON.parse(params?.filter ?? '{}');
             delete params.filter;
             store.userParams = { ...params, ...store.userParams };
-            store.userFilter = { ...JSON.parse(filter), ...store.userFilter };
+            store.userFilter = { ...filter, ...store.userFilter };
+            if (filter.order) store.order = filter.order;
         }
     });
 
@@ -71,9 +70,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         canceller = new AbortController();
 
         const filter = {
-            order: store.order,
             limit: store.limit,
-            skip: store.skip,
         };
 
         let exprFilter;
@@ -88,13 +85,19 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         }
 
         Object.assign(filter, store.userFilter, exprFilter);
-        Object.assign(store.filter, filter);
-        const params = {
-            filter: JSON.stringify(store.filter),
-        };
+        let where;
+        if (filter?.where || store.filter?.where)
+            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
+        Object.assign(filter, store.filter);
+        filter.where = where;
+        const params = { filter };
 
         Object.assign(params, userParams);
+        params.filter.skip = store.skip;
+        if (store.order && store.order.length) params.filter.order = store.order;
+        else delete params.filter.order;
 
+        params.filter = JSON.stringify(params.filter);
         store.currentFilter = params;
         store.isLoading = true;
         const response = await axios.get(store.url, {
@@ -130,6 +133,10 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         delete store[option];
     }
 
+    function reset(opts = []) {
+        if (arrayDataStore.get(key)) arrayDataStore.reset(key, opts);
+    }
+
     function cancelRequest() {
         if (canceller) {
             canceller.abort();
@@ -142,60 +149,100 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         store.filter = {};
         if (params) store.userParams = { ...params };
 
-        const response = await fetch({ append: false });
+        const response = await fetch({});
         return response;
     }
 
     async function addFilter({ filter, params }) {
-        if (filter) store.userFilter = Object.assign(store.userFilter, filter);
+        if (filter) store.filter = filter;
 
         let userParams = { ...store.userParams, ...params };
         userParams = sanitizerParams(userParams, store?.exprBuilder);
 
         store.userParams = userParams;
-        store.skip = 0;
-        store.filter.skip = 0;
-        page.value = 1;
+        reset(['skip', 'filter.skip', 'page']);
 
-        await fetch({ append: false });
+        await fetch({});
         return { filter, params };
     }
 
     async function addFilterWhere(where) {
-        const storedFilter = { ...store.userFilter };
+        const storedFilter = { ...store.filter };
         if (!storedFilter?.where) storedFilter.where = {};
         where = { ...storedFilter.where, ...where };
         await addFilter({ filter: { where } });
     }
 
+    async function addOrder(field, direction = 'ASC') {
+        const newOrder = field + ' ' + direction;
+        let order = store.order || [];
+        if (typeof order == 'string') order = [order];
+
+        let index = order.findIndex((o) => o.split(' ')[0] === field);
+        if (index > -1) {
+            order[index] = newOrder;
+        } else {
+            index = order.length;
+            order.push(newOrder);
+        }
+
+        store.order = order;
+        reset(['skip', 'filter.skip', 'page']);
+        fetch({});
+        index++;
+
+        return { index, order };
+    }
+
+    async function deleteOrder(field) {
+        let order = store.order ?? [];
+        if (typeof order == 'string') order = [order];
+
+        const index = order.findIndex((o) => o.split(' ')[0] === field);
+        if (index > -1) order.splice(index, 1);
+
+        store.order = order;
+        fetch({});
+    }
+
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    const key = Object.keys(exprBuilder ? exprBuilder(param) : param);
-                    if (key[0]) delete store.filter.where[key[0]];
+                    let key;
+                    if (exprBuilder) {
+                        const result = exprBuilder(param);
+                        if (result !== undefined && result !== null)
+                            key = Object.keys(result);
+                    } else {
+                        if (typeof param === 'object' && param !== null)
+                            key = Object.keys(param);
+                    }
+                    if (key && key[0]) {
+                        delete store.filter.where[key[0]];
                         if (Object.keys(store.filter.where).length === 0) {
                             delete store.filter.where;
                         }
                     }
                 }
             }
+        }
         return params;
     }
 
     async function loadMore() {
         if (!store.hasMoreData) return;
 
-        store.skip = store.limit * page.value;
-        page.value += 1;
+        store.skip = store.limit * store.page;
+        store.page += 1;
 
         await fetch({ append: true });
     }
 
     async function refresh() {
-        if (Object.values(store.userParams).length) await fetch({ append: false });
+        if (Object.values(store.userParams).length) await fetch({});
     }
 
     function updateStateParams() {
@@ -237,6 +284,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         applyFilter,
         addFilter,
         addFilterWhere,
+        addOrder,
+        deleteOrder,
         refresh,
         destroy,
         loadMore,
@@ -245,5 +294,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         updateStateParams,
         isLoading,
         deleteOption,
+        reset,
     };
 }

src/composables/useRole.js

@@ -27,8 +27,12 @@ export function useRole() {
 
         return false;
     }
+    function isEmployee() {
+        return hasAny(['employee']);
+    }
 
     return {
+        isEmployee,
         fetch,
         hasAny,
         state,

src/composables/useSession.js

@@ -58,20 +58,25 @@ export function useSession() {
             }
         }
     }
-    async function destroy() {
+    async function destroy(destroyTokens = true) {
         const tokens = {
             tokenMultimedia: 'Accounts/logout',
             token: 'VnUsers/logout',
         };
         const storage = keepLogin() ? localStorage : sessionStorage;
-
-        for (const [key, url] of Object.entries(tokens)) {
-            await destroyToken(url, storage, key);
+        let destroyTokenPromises = [];
+        try {
+            if (destroyTokens) {
+                const { data: isValidToken } = await axios.get('VnUsers/validateToken');
+                if (isValidToken)
+                    destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
+                        destroyToken(url, storage, key)
+                    );
             }
-
+        } finally {
             localStorage.clear();
             sessionStorage.clear();
-
+            await Promise.allSettled(destroyTokenPromises);
             const { setUser } = useState();
 
             setUser({
@@ -84,6 +89,7 @@ export function useSession() {
 
             stopRenewer();
         }
+    }
 
     async function login(data) {
         setSession(data);

src/css/app.scss

@@ -4,8 +4,10 @@
 
 body.body--light {
     --font-color: black;
-    --vn-section-color: #e0e0e0;
+    --vn-header-color: #cecece;
     --vn-page-color: #ffffff;
+    --vn-section-color: #e0e0e0;
+    --vn-section-hover-color: #b9b9b9;
     --vn-text-color: var(--font-color);
     --vn-label-color: #5f5f5f;
     --vn-accent-color: #e7e3e3;
@@ -17,8 +19,10 @@ body.body--light {
     }
 }
 body.body--dark {
+    --vn-header-color: #5d5d5d;
     --vn-page-color: #222;
     --vn-section-color: #3d3d3d;
+    --vn-section-hover-color: #747474;
     --vn-text-color: white;
     --vn-label-color: #a8a8a8;
     --vn-accent-color: #424242;
@@ -71,8 +75,9 @@ select:-webkit-autofill {
 .bg-vn-section-color {
     background-color: var(--vn-section-color);
 }
-.bg-hover {
-    background-color: #666666;
+
+.bg-vn-hover {
+    background-color: var(--vn-section-hover-color);
 }
 
 .color-vn-label {
@@ -152,6 +157,15 @@ select:-webkit-autofill {
     color: var(--vn-label-color);
 }
 
+.disabled {
+    & .q-checkbox__label {
+        color: var(--vn-text-color);
+    }
+    & .q-checkbox__inner {
+        color: var(--vn-label-color);
+    }
+}
+
 .q-chip,
 .q-notification__message,
 .q-notification__icon {
@@ -174,8 +188,6 @@ select:-webkit-autofill {
     justify-content: center;
 }
 
-/* q-notification row items-stretch q-notification--standard bg-negative text-white */
-
 .q-card,
 .q-table,
 .q-table__bottom,
@@ -219,3 +231,29 @@ input::-webkit-inner-spin-button {
 *::-webkit-scrollbar-track {
     background: transparent;
 }
+
+.q-table {
+    thead,
+    tbody {
+        th {
+            .q-select {
+                max-width: 120px;
+            }
+        }
+        td {
+            padding: 1px 10px 1px 10px;
+            max-width: 100px;
+            div span {
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+        .expand {
+            max-width: 400px;
+        }
+    }
+}

src/i18n/locale/en.yml

@@ -46,6 +46,7 @@ globals:
     noPinnedModules: You don't have any pinned modules
     summary:
         basicData: Basic data
+    daysOnward: Days onward
     today: Today
     yesterday: Yesterday
     dateFormat: en-GB
@@ -90,6 +91,7 @@ globals:
     send: Send
     code: Code
     pageTitles:
+        logIn: Login
         summary: Summary
         basicData: Basic data
         log: Logs
@@ -100,13 +102,150 @@ globals:
         modes: Modes
         zones: Zones
         zonesList: Zones
-        deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
+        deliveryDays: Delivery days
+        upcomingDeliveries: Upcoming deliveries
         role: Role
         alias: Alias
         aliasUsers: Users
         subRoles: Subroles
         inheritedRoles: Inherited Roles
+        customers: Customers
+        list: List
+        webPayments: Web Payments
+        extendedList: Extended list
+        notifications: Notifications
+        defaulter: Defaulter
+        customerCreate: New customer
+        fiscalData: Fiscal data
+        billingData: Billing data
+        consignees: Consignees
+        notes: Notes
+        credits: Credits
+        greuges: Greuges
+        balance: Balance
+        recoveries: Recoveries
+        webAccess: Web access
+        sms: Sms
+        creditManagement: Credit management
+        creditContracts: Credit contracts
+        creditOpinion: Credit opinion
+        others: Others
+        samples: Samples
+        consumption: Consumption
+        mandates: Mandates
+        contacts: Contacts
+        webPayment: Web payment
+        fileManagement: File management
+        unpaid: Unpaid
+        entries: Entries
+        buys: Buys
+        dms: File management
+        entryCreate: New entry
+        latestBuys: Latest buys
+        tickets: Tickets
+        ticketCreate: New Tickets
+        boxing: Boxing
+        sale: Sale
+        claims: Claims
+        claimCreate: New claim
+        lines: Lines
+        photos: Photos
+        development: Development
+        action: Action
+        invoiceOuts: Invoice out
+        negativeBases: Negative Bases
+        globalInvoicing: Global invoicing
+        invoiceOutCreate: Create invoice out
+        shelving: Shelving
+        shelvingList: Shelving List
+        shelvingCreate: New shelving
+        invoiceIns: Invoices In
+        invoiceInCreate: Create invoice in
+        vat: VAT
+        dueDay: Due day
+        intrastat: Intrastat
+        corrective: Corrective
+        order: Orders
+        orderList: List
+        orderCreate: New order
+        catalog: Catalog
+        volume: Volume
+        workers: Workers
+        workerCreate: New worker
+        department: Department
+        pda: PDA
+        pbx: Private Branch Exchange
+        calendar: Calendar
+        timeControl: Time control
+        locker: Locker
+        wagons: Wagons
+        wagonsList: Wagons List
+        wagonCreate: Create wagon
+        wagonEdit: Edit wagon
+        typesList: Types List
+        typeCreate: Create type
+        typeEdit: Edit type
+        wagonCounter: Trolley counter
+        roadmap: Roadmap
+        stops: Stops
+        routes: Routes
+        cmrsList: CMRs list
+        RouteList: List
+        routeCreate: New route
+        RouteRoadmap: Roadmaps
+        RouteRoadmapCreate: Create roadmap
+        autonomous: Autonomous
+        suppliers: Suppliers
+        supplier: Supplier
+        expedition: Expedition
+        services: Service
+        components: Components
+        pictures: Pictures
+        packages: Packages
+        tracking: Tracking
+        labeler: Labeler
+        supplierCreate: New supplier
+        accounts: Accounts
+        addresses: Addresses
+        agencyTerm: Agency agreement
+        travel: Travels
+        extraCommunity: Extra community
+        travelCreate: New travel
+        history: Log
+        thermographs: Thermograph
+        items: Items
+        diary: Diary
+        tags: Tags
+        create: Create
+        buyRequest: Buy requests
+        fixedPrice: Fixed prices
+        wasteBreakdown: Waste breakdown
+        itemCreate: New item
+        barcode: Barcodes
+        tax: Tax
+        botanical: Botanical
+        itemTypeCreate: New item type
+        family: Item Type
+        lastEntries: Last entries
+        itemType: Item type
+        monitors: Monitors
+        dashboard: Dashboard
+        users: Users
+        createTicket: Create ticket
+        ticketAdvance: Advance tickets
+        futureTickets: Future tickets
+        purchaseRequest: Purchase request
+        weeklyTickets: Weekly tickets
+        formation: Formation
+        locations: Locations
+        warehouses: Warehouses
+        saleTracking: Sale tracking
+        roles: Roles
+        connections: Connections
+        acls: ACLs
+        mailForwarding: Mail forwarding
+        mailAlias: Mail alias
+        privileges: Privileges
     created: Created
     worker: Worker
     now: Now
@@ -114,6 +253,7 @@ globals:
     new: New
     comment: Comment
     observations: Observations
+    goToModuleIndex: Go to module index
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -132,8 +272,6 @@ login:
     loginError: Invalid username or password
     fieldRequired: This field is required
     twoFactorRequired: Two-factor verification required
-    pageTitles:
-        logIn: Login
 twoFactor:
     code: Code
     validate: Validate
@@ -148,40 +286,8 @@ verifyEmail:
         verifyEmail: Email verification
 dashboard:
     pageTitles:
-        dashboard: Dashboard
+
 customer:
-    pageTitles:
-        customers: Customers
-        list: List
-        webPayments: Web Payments
-        extendedList: Extended list
-        notifications: Notifications
-        defaulter: Defaulter
-        customerCreate: New customer
-        summary: Summary
-        basicData: Basic data
-        fiscalData: Fiscal data
-        billingData: Billing data
-        consignees: Consignees
-        notes: Notes
-        credits: Credits
-        greuges: Greuges
-        balance: Balance
-        recoveries: Recoveries
-        webAccess: Web access
-        log: Log
-        sms: Sms
-        creditManagement: Credit management
-        creditContracts: Credit contracts
-        creditOpinion: Credit opinion
-        others: Others
-        samples: Samples
-        consumption: Consumption
-        mandates: Mandates
-        contacts: Contacts
-        webPayment: Web payment
-        fileManagement: File management
-        unpaid: Unpaid
     list:
         phone: Phone
         email: Email
@@ -311,17 +417,6 @@ customer:
             hasCoreVnl: VNL core received
             hasSepaVnl: VNL B2B received
 entry:
-    pageTitles:
-        entries: Entries
-        list: List
-        summary: Summary
-        basicData: Basic data
-        buys: Buys
-        notes: Notes
-        dms: File management
-        log: Log
-        entryCreate: New entry
-        latestBuys: Latest buys
     list:
         newEntry: New entry
         landed: Landed
@@ -330,6 +425,18 @@ entry:
         booked: Booked
         confirmed: Confirmed
         ordered: Ordered
+        tableVisibleColumns:
+            id: Id
+            reference: Reference
+            created: Creation
+            supplierFk: Supplier
+            isBooked: Booked
+            isConfirmed: Confirmed
+            isOrdered: Ordered
+            companyFk: Company
+            travelFk: Travel
+            isExcludedFromAvailable: Inventory
+            isRaid: Raid
     summary:
         commission: Commission
         currency: Currency
@@ -405,7 +512,8 @@ entry:
         landed: Landed
         warehouseOut: Warehouse Out
     latestBuys:
-        picture: Picture
+        tableVisibleColumns:
+            image: Picture
             itemFk: Item ID
             packing: Packing
             grouping: Grouping
@@ -433,6 +541,8 @@ entry:
             packagingFk: Package
             packingOut: Package out
             landing: Landing
+            isExcludedFromAvailable: Es inventory
+            isRaid: Raid
 ticket:
     pageTitles:
         tickets: Tickets
@@ -444,6 +554,9 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        dms: File management
+        volume: Volume
+        observation: Notes
         ticketAdvance: Advance tickets
         futureTickets: Future tickets
         purchaseRequest: Purchase request
@@ -521,90 +634,7 @@ ticket:
         landed: Landed
         warehouse: Warehouse
         agency: Agency
-claim:
-    pageTitles:
-        claims: Claims
-        list: List
-        claimCreate: New claim
-        summary: Summary
-        basicData: Basic Data
-        lines: Lines
-        photos: Photos
-        development: Development
-        log: Audit logs
-        notes: Notes
-        action: Action
-    list:
-        customer: Customer
-        assignedTo: Assigned
-        created: Created
-        state: State
-    rmaList:
-        code: Code
-        records: records
-    card:
-        claimId: Claim ID
-        attendedBy: Attended by
-        created: Created
-        state: State
-        ticketId: Ticket ID
-        customerSummary: Customer summary
-        claimedTicket: Claimed ticket
-        saleTracking: Sale tracking
-        ticketTracking: Ticket tracking
-        commercial: Commercial
-        province: Province
-        zone: Zone
-        customerId: client ID
-    summary:
-        customer: Customer
-        assignedTo: Assigned
-        attendedBy: Attended by
-        created: Created
-        state: State
-        details: Details
-        item: Item
-        landed: Landed
-        quantity: Quantity
-        claimed: Claimed
-        price: Price
-        discount: Discount
-        total: Total
-        actions: Actions
-        responsibility: Responsibility
-        company: Company
-        person: Employee/Customer
-        notes: Notes
-        photos: Photos
-        development: Development
-        reason: Reason
-        result: Result
-        responsible: Responsible
-        worker: Worker
-        redelivery: Redelivery
-        changeState: Change state
-    basicData:
-        customer: Customer
-        assignedTo: Assigned
-        created: Created
-        state: State
-        pickup: Pick up
-        null: No
-        agency: Agency
-        delivery: Delivery
-    photo:
-        fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
-        noData: 'There are no images/videos, click here or drag and drop the file'
-        dragDrop: Drag and drop it here
 invoiceOut:
-    pageTitles:
-        invoiceOuts: Invoice out
-        list: List
-        negativeBases: Negative Bases
-        globalInvoicing: Global invoicing
-        invoiceOutCreate: Create invoice out
-        summary: Summary
-        basicData: Basic Data
     list:
         ref: Reference
         issued: Issued
@@ -672,13 +702,6 @@ invoiceOut:
         errors:
             downloadCsvFailed: CSV download failed
 shelving:
-    pageTitles:
-        shelving: Shelving
-        shelvingList: Shelving List
-        shelvingCreate: New shelving
-        summary: Summary
-        basicData: Basic Data
-        log: Logs
     list:
         parking: Parking
         priority: Priority
@@ -705,17 +728,6 @@ parking:
         info: You can search by parking code
         label: Search parking...
 invoiceIn:
-    pageTitles:
-        invoiceIns: Invoices In
-        list: List
-        invoiceInCreate: Create invoice in
-        summary: Summary
-        basicData: Basic data
-        vat: VAT
-        dueDay: Due day
-        intrastat: Intrastat
-        corrective: Corrective
-        log: Logs
     list:
         ref: Reference
         supplier: Supplier
@@ -766,15 +778,6 @@ invoiceIn:
         stems: Stems
         country: Country
 order:
-    pageTitles:
-        order: Orders
-        orderList: List
-        orderCreate: New order
-        summary: Summary
-        basicData: Basic Data
-        catalog: Catalog
-        volume: Volume
-        lines: Lines
     field:
         salesPersonFk: Sales Person
         clientFk: Client
@@ -849,7 +852,7 @@ worker:
         calendar: Calendar
         timeControl: Time control
         locker: Locker
-        formation: Formation
+        balance: Balance
     list:
         name: Name
         email: Email
@@ -930,16 +933,14 @@ worker:
             remark: Bonficado
             hasDiploma: Diploma
     imageNotFound: Image not found
+    balance:
+        tableVisibleColumns:
+            paymentDate: Date
+            incomeType: Type
+            debit: Debt
+            credit: Have
+            concept: Concept
 wagon:
-    pageTitles:
-        wagons: Wagons
-        wagonsList: Wagons List
-        wagonCreate: Create wagon
-        wagonEdit: Edit wagon
-        typesList: Types List
-        typeCreate: Create type
-        typeEdit: Edit type
-        wagonCounter: Trolley counter
     type:
         name: Name
         submit: Submit
@@ -968,20 +969,9 @@ wagon:
         minHeightBetweenTrays: 'The minimum height between trays is '
         maxWagonHeight: 'The maximum height of the wagon is '
         uncompleteTrays: There are incomplete trays
-route/roadmap:
-    pageTitles:
-        roadmap: Roadmap
-        summary: Summary
-        basicData: Basic Data
-        stops: Stops
-roadmap:
-    pageTitles:
-        roadmap: Roadmap
-        summary: Summary
-        basicData: Basic Data
-        stops: Stops
 route:
     pageTitles:
+        agency: Agency List
         routes: Routes
         cmrsList: CMRs list
         RouteList: List
@@ -1020,28 +1010,20 @@ route:
         volume: Volume
         finished: Finished
 supplier:
-    pageTitles:
-        suppliers: Suppliers
-        supplier: Supplier
-        list: List
-        supplierCreate: New supplier
-        summary: Summary
-        basicData: Basic data
-        fiscalData: Fiscal data
-        billingData: Billing data
-        log: Log
-        accounts: Accounts
-        contacts: Contacts
-        addresses: Addresses
-        consumption: Consumption
-        agencyTerm: Agency agreement
-        dms: File management
     list:
         payMethod: Pay method
         payDeadline: Pay deadline
         payDay: Pay day
         account: Account
         newSupplier: New supplier
+        tableVisibleColumns:
+            id: Id
+            name: Name
+            nif: NIF/CIF
+            nickname: Alias
+            account: Account
+            payMethod: Pay Method
+            payDay: Pay Day
     summary:
         responsible: Responsible
         notes: Notes
@@ -1127,15 +1109,16 @@ supplier:
         date: Date
         reference: Reference
 travel:
-    pageTitles:
-        travel: Travels
-        list: List
-        summary: Summary
-        extraCommunity: Extra community
-        travelCreate: New travel
-        basicData: Basic data
-        history: Log
-        thermographs: Thermograph
+    travelList:
+        tableVisibleColumns:
+            id: Id
+            ref: Reference
+            agency: Agency
+            shipped: Shipped
+            landed: Landed
+            warehouseIn: Warehouse in
+            warehouseOut: Warehouse out
+            totalEntries: Total entries
     summary:
         confirmed: Confirmed
         entryId: Entry Id
@@ -1182,24 +1165,6 @@ travel:
         travelFileDescription: 'Travel id { travelId }'
         file: File
 item:
-    pageTitles:
-        items: Items
-        list: List
-        diary: Diary
-        tags: Tags
-        create: Create
-        buyRequest: Buy requests
-        fixedPrice: Fixed prices
-        wasteBreakdown: Waste breakdown
-        itemCreate: New item
-        barcode: Barcodes
-        tax: Tax
-        log: Log
-        botanical: Botanical
-        shelving: Shelving
-        itemTypeCreate: New item type
-        family: Item Type
-        lastEntries: Last entries
     descriptor:
         item: Item
         buyer: Buyer
@@ -1285,22 +1250,6 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
-item/itemType:
-    pageTitles:
-        itemType: Item type
-        basicData: Basic data
-        summary: Summary
-monitor:
-    pageTitles:
-        monitors: Monitors
-        list: List
-zone:
-    pageTitles:
-        zones: Zones
-        zonesList: Zones
-        deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
-
 components:
     topbar: {}
     itemsFilterPanel:

src/i18n/locale/es.yml

@@ -45,6 +45,7 @@ globals:
     noPinnedModules: No has fijado ningún módulo
     summary:
         basicData: Datos básicos
+    daysOnward: Días adelante
     today: Hoy
     yesterday: Ayer
     dateFormat: es-ES
@@ -90,6 +91,7 @@ globals:
     send: Enviar
     code: Código
     pageTitles:
+        logIn: Inicio de sesión
         summary: Resumen
         basicData: Datos básicos
         log: Historial
@@ -100,14 +102,152 @@ globals:
         modes: Modos
         zones: Zonas
         zonesList: Zonas
-        deliveryList: Días de entrega
-        upcomingList: Próximos repartos
+        deliveryDays: Días de entrega
+        upcomingDeliveries: Próximos repartos
         role: Role
         alias: Alias
         aliasUsers: Usuarios
         subRoles: Subroles
         inheritedRoles: Roles heredados
+        customers: Clientes
+        customerCreate: Nuevo cliente
+        list: Listado
+        webPayments: Pagos Web
+        extendedList: Listado extendido
+        notifications: Notificaciones
+        defaulter: Morosos
+        createCustomer: Crear cliente
+        fiscalData: Datos fiscales
+        billingData: Forma de pago
+        consignees: Consignatarios
+        notes: Notas
+        credits: Créditos
+        greuges: Greuges
+        balance: Balance
+        recoveries: Recobros
+        webAccess: Acceso web
+        sms: Sms
+        creditManagement: Gestión de crédito
+        creditContracts: Contratos de crédito
+        creditOpinion: Opinión de crédito
+        others: Otros
+        samples: Plantillas
+        consumption: Consumo
+        mandates: Mandatos
+        contacts: Contactos
+        webPayment: Pago web
+        fileManagement: Gestión documental
+        unpaid: Impago
+        entries: Entradas
+        buys: Compras
+        dms: Gestión documental
+        entryCreate: Nueva entrada
+        latestBuys: Últimas compras
+        tickets: Tickets
+        ticketCreate: Nuevo ticket
+        boxing: Encajado
+        sale: Lineas del pedido
+        claims: Reclamaciones
+        claimCreate: Crear reclamación
+        lines: Líneas
+        development: Trazabilidad
+        photos: Fotos
+        action: Acción
+        invoiceOuts: Fact. emitidas
+        negativeBases: Bases Negativas
+        globalInvoicing: Facturación global
+        invoiceOutCreate: Crear fact. emitida
+        order: Cesta
+        orderList: Listado
+        orderCreate: Nueva orden
+        catalog: Catálogo
+        volume: Volumen
+        shelving: Carros
+        shelvingList: Listado de carros
+        shelvingCreate: Nuevo carro
+        invoiceIns: Fact. recibidas
+        invoiceInCreate: Crear fact. recibida
+        vat: IVA
+        labeler: Etiquetas
+        dueDay: Vencimiento
+        intrastat: Intrastat
+        corrective: Rectificativa
         workers: Trabajadores
+        workerCreate: Nuevo trabajador
+        department: Departamentos
+        pda: PDA
+        pbx: Centralita
+        calendar: Calendario
+        timeControl: Control de horario
+        locker: Taquilla
+        wagons: Vagones
+        wagonsList: Listado vagones
+        wagonCreate: Crear tipo
+        wagonEdit: Editar tipo
+        typesList: Listado tipos
+        typeCreate: Crear tipo
+        typeEdit: Editar tipo
+        wagonCounter: Contador de carros
+        roadmap: Troncales
+        stops: Paradas
+        routes: Rutas
+        cmrsList: Listado de CMRs
+        RouteList: Listado
+        routeCreate: Nueva ruta
+        RouteRoadmap: Troncales
+        RouteRoadmapCreate: Crear troncal
+        autonomous: Autónomos
+        suppliers: Proveedores
+        supplier: Proveedor
+        supplierCreate: Nuevo proveedor
+        accounts: Cuentas
+        addresses: Direcciones
+        agencyTerm: Acuerdo agencia
+        travel: Envíos
+        create: Crear
+        extraCommunity: Extra comunitarios
+        travelCreate: Nuevo envío
+        history: Historial
+        thermographs: Termógrafos
+        items: Artículos
+        diary: Histórico
+        tags: Etiquetas
+        fixedPrice: Precios fijados
+        buyRequest: Peticiones de compra
+        wasteBreakdown: Deglose de mermas
+        itemCreate: Nuevo artículo
+        tax: 'IVA'
+        botanical: 'Botánico'
+        barcode: 'Código de barras'
+        itemTypeCreate: Nueva familia
+        family: Familia
+        lastEntries: Últimas entradas
+        itemType: Familia
+        monitors: Monitores
+        dashboard: Tablón
+        users: Usuarios
+        createTicket: Crear ticket
+        ticketAdvance: Adelantar tickets
+        futureTickets: Tickets a futuro
+        purchaseRequest: Petición de compra
+        weeklyTickets: Tickets programados
+        formation: Formación
+        locations: Ubicaciones
+        warehouses: Almacenes
+        roles: Roles
+        connections: Conexiones
+        acls: ACLs
+        mailForwarding: Reenvío de correo
+        mailAlias: Alias de correo
+        privileges: Privilegios
+        observation: Notas
+        expedition: Expedición
+        saleTracking: Líneas preparadas
+        services: Servicios
+        tracking: Estados
+        components: Componentes
+        pictures: Fotos
+        packages: Bultos
     created: Fecha creación
     worker: Trabajador
     now: Ahora
@@ -115,6 +255,7 @@ globals:
     new: Nuevo
     comment: Comentario
     observations: Observaciones
+    goToModuleIndex: Ir al índice del módulo
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -133,8 +274,6 @@ login:
     loginError: Nombre de usuario o contraseña incorrectos
     fieldRequired: Este campo es obligatorio
     twoFactorRequired: Verificación de doble factor requerida
-    pageTitles:
-        logIn: Inicio de sesión
 twoFactor:
     code: Código
     validate: Validar
@@ -147,41 +286,8 @@ verifyEmail:
         verifyEmail: Verificación de correo
 dashboard:
     pageTitles:
-        dashboard: Tablón
+
 customer:
-    pageTitles:
-        customers: Clientes
-        customerCreate: Nuevo cliente
-        list: Listado
-        webPayments: Pagos Web
-        extendedList: Listado extendido
-        notifications: Notificaciones
-        defaulter: Morosos
-        createCustomer: Crear cliente
-        summary: Resumen
-        basicData: Datos básicos
-        fiscalData: Datos fiscales
-        billingData: Forma de pago
-        consignees: Consignatarios
-        notes: Notas
-        credits: Créditos
-        greuges: Greuges
-        balance: Balance
-        recoveries: Recobros
-        webAccess: Acceso web
-        log: Historial
-        sms: Sms
-        creditManagement: Gestión de crédito
-        creditContracts: Contratos de crédito
-        creditOpinion: Opinión de crédito
-        others: Otros
-        samples: Plantillas
-        consumption: Consumo
-        mandates: Mandatos
-        contacts: Contactos
-        webPayment: Pago web
-        fileManagement: Gestión documental
-        unpaid: Impago
     list:
         phone: Teléfono
         email: Email
@@ -310,17 +416,6 @@ customer:
             hasCoreVnl: Recibido core VNL
             hasSepaVnl: Recibido B2B VNL
 entry:
-    pageTitles:
-        entries: Entradas
-        list: Listado
-        summary: Resumen
-        basicData: Datos básicos
-        buys: Compras
-        notes: Notas
-        dms: Gestión documental
-        log: Historial
-        entryCreate: Nueva entrada
-        latestBuys: Últimas compras
     list:
         newEntry: Nueva entrada
         landed: F. entrega
@@ -329,6 +424,18 @@ entry:
         booked: Asentado
         confirmed: Confirmado
         ordered: Pedida
+        tableVisibleColumns:
+            id: Id
+            reference: Referencia
+            created: Creación
+            supplierFk: Proveedor
+            isBooked: Asentado
+            isConfirmed: Confirmado
+            isOrdered: Pedida
+            companyFk: Empresa
+            travelFk: Envio
+            isExcludedFromAvailable: Inventario
+            isRaid: Redada
     summary:
         commission: Comisión
         currency: Moneda
@@ -404,9 +511,10 @@ entry:
         landed: F. entrega
         warehouseOut: Alm. salida
     latestBuys:
-        picture: Foto
-        itemFk: ID Artículo
-        packing: Packing
+        tableVisibleColumns:
+            image: Foto
+            itemFk: Id Artículo
+            packing: packing
             grouping: Grouping
             quantity: Cantidad
             size: Medida
@@ -432,6 +540,8 @@ entry:
             packagingFk: Embalaje
             packingOut: Embalaje envíos
             landing: Llegada
+            isExcludedFromAvailable: Es inventario
+            isRaid: Redada
 ticket:
     pageTitles:
         tickets: Tickets
@@ -443,10 +553,20 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        dms: Gestión documental
+        volume: Volumen
+        observation: Notas
         ticketAdvance: Adelantar tickets
         futureTickets: Tickets a futuro
+        expedition: Expedición
         purchaseRequest: Petición de compra
         weeklyTickets: Tickets programados
+        saleTracking: Líneas preparadas
+        services: Servicios
+        tracking: Estados
+        components: Componentes
+        pictures: Fotos
+        packages: Bultos
     list:
         nickname: Alias
         state: Estado
@@ -520,90 +640,7 @@ ticket:
         landed: F. entrega
         warehouse: Almacén
         agency: Agencia
-claim:
-    pageTitles:
-        claims: Reclamaciones
-        list: Listado
-        claimCreate: Crear reclamación
-        summary: Resumen
-        basicData: Datos básicos
-        lines: Líneas
-        development: Trazabilidad
-        photos: Fotos
-        log: Historial
-        notes: Notas
-        action: Acción
-    list:
-        customer: Cliente
-        assignedTo: Asignada a
-        created: Creada
-        state: Estado
-    rmaList:
-        code: Código
-        records: registros
-    card:
-        claimId: ID reclamación
-        attendedBy: Atendida por
-        created: Creada
-        state: Estado
-        ticketId: ID ticket
-        customerSummary: Resumen del cliente
-        claimedTicket: Ticket reclamado
-        saleTracking: Líneas preparadas
-        ticketTracking: Estados del ticket
-        commercial: Comercial
-        province: Provincia
-        zone: Zona
-        customerId: ID del cliente
-    summary:
-        customer: Cliente
-        assignedTo: Asignada a
-        attendedBy: Atendida por
-        created: Creada
-        state: Estado
-        details: Detalles
-        item: Artículo
-        landed: Entregado
-        quantity: Cantidad
-        claimed: Reclamado
-        price: Precio
-        discount: Descuento
-        total: Total
-        actions: Acciones
-        responsibility: Responsabilidad
-        company: Empresa
-        person: Comercial/Cliente
-        notes: Observaciones
-        photos: Fotos
-        development: Trazabilidad
-        reason: Motivo
-        result: Consecuencias
-        responsible: Responsable
-        worker: Trabajador
-        redelivery: Devolución
-        changeState: Cambiar estado
-    basicData:
-        customer: Cliente
-        assignedTo: Asignada a
-        created: Creada
-        state: Estado
-        pickup: Recogida
-        null: No
-        agency: Agencia
-        delivery: Reparto
-    photo:
-        fileDescription: 'Reclamacion ID {claimId} del cliente {clientName} id {clientId}'
-        noData: No hay imágenes/videos haz click aquí o arrastra y suelta el archivo
-        dragDrop: Arrástralo y sueltalo aquí
 invoiceOut:
-    pageTitles:
-        invoiceOuts: Fact. emitidas
-        list: Listado
-        negativeBases: Bases Negativas
-        globalInvoicing: Facturación global
-        invoiceOutCreate: Crear fact. emitida
-        summary: Resumen
-        basicData: Datos básicos
     list:
         ref: Referencia
         issued: Fecha emisión
@@ -671,15 +708,6 @@ invoiceOut:
         errors:
             downloadCsvFailed: Error al descargar CSV
 order:
-    pageTitles:
-        order: Cesta
-        orderList: Listado
-        orderCreate: Nueva orden
-        summary: Resumen
-        basicData: Datos básicos
-        catalog: Catálogo
-        volume: Volumen
-        lines: Líneas
     field:
         salesPersonFk: Comercial
         clientFk: Cliente
@@ -721,13 +749,6 @@ order:
         price: Precio
         amount: Monto
 shelving:
-    pageTitles:
-        shelving: Carros
-        shelvingList: Listado de carros
-        shelvingCreate: Nuevo carro
-        summary: Resumen
-        basicData: Datos básicos
-        log: Historial
     list:
         parking: Parking
         priority: Prioridad
@@ -753,17 +774,6 @@ parking:
         info: Puedes buscar por código de parking
         label: Buscar parking...
 invoiceIn:
-    pageTitles:
-        invoiceIns: Fact. recibidas
-        list: Listado
-        invoiceInCreate: Crear fact. recibida
-        summary: Resumen
-        basicData: Datos básicos
-        vat: IVA
-        dueDay: Vencimiento
-        intrastat: Intrastat
-        corrective: Rectificativa
-        log: Historial
     list:
         ref: Referencia
         supplier: Proveedor
@@ -845,7 +855,7 @@ worker:
         calendar: Calendario
         timeControl: Control de horario
         locker: Taquilla
-        formation: Formación
+        balance: Balance
     list:
         name: Nombre
         email: Email
@@ -917,16 +927,14 @@ worker:
             remark: Bonficado
             hasDiploma: Diploma
     imageNotFound: No se ha encontrado la imagen
+    balance:
+        tableVisibleColumns:
+            paymentDate: Fecha
+            incomeType: Tipo
+            debit: Debe
+            credit: Haber
+            concept: Concepto
 wagon:
-    pageTitles:
-        wagons: Vagones
-        wagonsList: Listado vagones
-        wagonCreate: Crear tipo
-        wagonEdit: Editar tipo
-        typesList: Listado tipos
-        typeCreate: Crear tipo
-        typeEdit: Editar tipo
-        wagonCounter: Contador de carros
     type:
         name: Nombre
         submit: Guardar
@@ -955,36 +963,12 @@ wagon:
         minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
         maxWagonHeight: 'La altura máxima del vagón es '
         uncompleteTrays: Hay bandejas sin completar
-route/roadmap:
-    pageTitles:
-        roadmap: Troncales
-        summary: Resumen
-        basicData: Datos básicos
-        stops: Paradas
-roadmap:
-    pageTitles:
-        roadmap: Troncales
-        summary: Resumen
-        basicData: Datos básicos
-        stops: Paradas
 route:
-    pageTitles:
-        routes: Rutas
-        cmrsList: Listado de CMRs
-        RouteList: Listado
-        routeCreate: Nueva ruta
-        basicData: Datos básicos
-        summary: Resumen
-        RouteRoadmap: Troncales
-        RouteRoadmapCreate: Crear troncal
-        tickets: Tickets
-        log: Historial
-        autonomous: Autónomos
     cmr:
         list:
             results: resultados
             cmrFk: Id CMR
-            hasCmrDms: Adjuntado en gestdoc
+            hasCmrDms: Gestdoc
             'true': Sí
             'false': 'No'
             ticketFk: Id ticket
@@ -1007,28 +991,20 @@ route:
         volume: Volumen
         finished: Finalizada
 supplier:
-    pageTitles:
-        suppliers: Proveedores
-        supplier: Proveedor
-        list: Listado
-        supplierCreate: Nuevo proveedor
-        summary: Resumen
-        basicData: Datos básicos
-        fiscalData: Datos fiscales
-        billingData: Forma de pago
-        log: Historial
-        accounts: Cuentas
-        contacts: Contactos
-        addresses: Direcciones
-        consumption: Consumo
-        agencyTerm: Acuerdo agencia
-        dms: Gestión documental
     list:
         payMethod: Método de pago
         payDeadline: Plazo de pago
         payDay: Día de pago
         account: Cuenta
         newSupplier: Nuevo proveedor
+        tableVisibleColumns:
+            id: Id
+            name: Nombre
+            nif: NIF/CIF
+            nickname: Alias
+            account: Cuenta
+            payMethod: Método de pago
+            payDay: Dia de pago
     summary:
         responsible: Responsable
         notes: Notas
@@ -1114,16 +1090,16 @@ supplier:
         date: Fecha
         reference: Referencia
 travel:
-    pageTitles:
-        travel: Envíos
-        list: Listado
-        create: Crear
-        summary: Resumen
-        extraCommunity: Extra comunitarios
-        travelCreate: Nuevo envío
-        basicData: Datos básicos
-        history: Historial
-        thermographs: Termógrafos
+    travelList:
+        tableVisibleColumns:
+            id: Id
+            ref: Referencia
+            agency: Agencia
+            shipped: Enviado
+            landed: Llegada
+            warehouseIn: Almacén de salida
+            warehouseOut: Almacén de entrada
+            totalEntries: Total de entradas
     summary:
         confirmed: Confirmado
         entryId: Id entrada
@@ -1170,24 +1146,6 @@ travel:
         travelFileDescription: 'Id envío { travelId }'
         file: Fichero
 item:
-    pageTitles:
-        items: Artículos
-        list: Listado
-        diary: Histórico
-        tags: Etiquetas
-        fixedPrice: Precios fijados
-        buyRequest: Peticiones de compra
-        wasteBreakdown: Deglose de mermas
-        itemCreate: Nuevo artículo
-        basicData: 'Datos básicos'
-        tax: 'IVA'
-        botanical: 'Botánico'
-        barcode: 'Código de barras'
-        log: Historial
-        shelving: Carros
-        itemTypeCreate: Nueva familia
-        family: Familia
-        lastEntries: Últimas entradas
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -1273,27 +1231,6 @@ item:
         achieved: 'Conseguido'
         concept: 'Concepto'
         state: 'Estado'
-item/itemType:
-    pageTitles:
-        itemType: Familia
-        basicData: Datos básicos
-        summary: Resumen
-zone:
-    pageTitles:
-        zones: Zonas
-        list: Zonas
-        deliveryList: Días de entrega
-        upcomingList: Próximos repartos
-role:
-    pageTitles:
-        zones: Zonas
-        list: Zonas
-        deliveryList: Días de entrega
-        upcomingList: Próximos repartos
-monitor:
-    pageTitles:
-        monitors: Monitores
-        list: Listado
 components:
     topbar: {}
     itemsFilterPanel:

src/pages/Account/Card/AccountDescriptor.vue

@@ -49,20 +49,6 @@ const hasAccount = ref(false);
         :title="data.title"
         :subtitle="data.subtitle"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                size="md"
-                color="white"
-                icon="face"
-                :to="{ name: 'AccountList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu>
             <AccountDescriptorMenu :has-account="hasAccount" />
         </template>

src/pages/Account/Role/Card/RoleDescriptor.vue

@@ -15,6 +15,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -60,14 +64,14 @@ const removeRole = () => {
 
 <template>
     <CardDescriptor
-        ref="descriptor"
-        :url="`VnRoles`"
+        :url="`VnRoles/${entityId}`"
         :filter="filter"
         module="Role"
         @on-fetch="setData"
         data-key="accountData"
         :title="data.title"
         :subtitle="data.subtitle"
+        :summary="$props.summary"
     >
         <template #menu>
             <QItem v-ripple clickable @click="removeRole()">

src/pages/Account/Role/Card/RoleDescriptorProxy.vue

@@ -0,0 +1,17 @@
+<script setup>
+import RoleDescriptor from './RoleDescriptor.vue';
+import RoleSummary from './RoleSummary.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <QPopupProxy>
+        <RoleDescriptor v-if="$props.id" :id="$props.id" :summary="RoleSummary" />
+    </QPopupProxy>
+</template>

src/pages/Account/Role/Card/RoleSummary.vue

@@ -30,6 +30,7 @@ const filter = {
         :url="`VnRoles`"
         :filter="filter"
         @on-fetch="(data) => (role = data)"
+        data-key="RoleSummary"
     >
         <template #header> {{ role.id }} - {{ role.name }} </template>
         <template #body>

src/pages/Agency/AgencyList.vue

@@ -1,72 +0,0 @@
-<script setup>
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import { useRouter } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-
-const { t } = useI18n();
-const router = useRouter();
-function navigate(id) {
-    router.push({ path: `/agency/${id}` });
-}
-function exprBuilder(param, value) {
-    if (!value) return;
-    if (param !== 'search') return;
-
-    if (!isNaN(value)) return { id: value };
-
-    return { name: { like: `%${value}%` } };
-}
-</script>
-<template>
-    <VnSearchbar
-        :info="t('You can search by name')"
-        :label="t('Search agency')"
-        data-key="AgencyList"
-        url="Agencies"
-    />
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="AgencyList"
-                url="Agencies"
-                order="name"
-                :expr-builder="exprBuilder"
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.name"
-                        @click="navigate(row.id)"
-                        v-for="row of rows"
-                    >
-                        <template #list-items>
-                            <QCheckbox
-                                :label="t('isOwn')"
-                                v-model="row.isOwn"
-                                :disable="true"
-                            />
-                            <QCheckbox
-                                :label="t('isAnyVolumeAllowed')"
-                                v-model="row.isAnyVolumeAllowed"
-                                :disable="true"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-</template>
-<i18n>
-    es: 
-        isOwn: Tiene propietario
-        isAnyVolumeAllowed: Permite cualquier volumen
-        Search agency: Buscar agencia
-        You can search by name: Puedes buscar por nombre
-    en:
-        isOwn: Has owner
-        isAnyVolumeAllowed: Allows any volume
-</i18n>

src/pages/Claim/Card/ClaimAction.vue

@@ -33,8 +33,8 @@ const DEFAULT_MAX_RESPONSABILITY = 5;
 const DEFAULT_MIN_RESPONSABILITY = 1;
 const arrayData = useArrayData('claimData');
 const marker_labels = [
-    { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.summary.company') },
-    { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
+    { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.company') },
+    { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.person') },
 ];
 const multiplicatorValue = ref();
 const loading = ref(false);
@@ -209,12 +209,12 @@ async function post(query, params) {
             <QItem class="justify-between">
                 <QItemLabel class="slider-container">
                     <p class="text-primary">
-                        {{ t('claim.summary.actions') }}
+                        {{ t('claim.actions') }}
                     </p>
                     <QSlider
                         class="responsibility { 'background-color:primary': quasar.platform.is.mobile }"
                         v-model="claim.responsibility"
-                        :label-value="t('claim.summary.responsibility')"
+                        :label-value="t('claim.responsibility')"
                         @change="(value) => save({ responsibility: value })"
                         label-always
                         color="primary"

src/pages/Claim/Card/ClaimBasicData.vue

@@ -30,7 +30,7 @@ function setClaimStates(data) {
 }
 
 async function getEnumValues() {
-    optionsList.value = [{ id: null, description: t('claim.basicData.null') }];
+    optionsList.value = [{ id: null, description: t('claim.null') }];
     const { data } = await axios.get(`Applications/get-enum-values`, {
         params: {
             schema: 'vn',
@@ -39,7 +39,7 @@ async function getEnumValues() {
         },
     });
     for (let value of data)
-        optionsList.value.push({ id: value, description: t(`claim.basicData.${value}`) });
+        optionsList.value.push({ id: value, description: t(`claim.${value}`) });
 }
 
 getEnumValues();
@@ -77,17 +77,14 @@ const statesFilter = {
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
                     v-model="data.client.name"
-                    :label="t('claim.basicData.customer')"
+                    :label="t('claim.customer')"
                     disable
                 />
-                <VnInputDate
-                    v-model="data.created"
-                    :label="t('claim.basicData.created')"
-                />
+                <VnInputDate v-model="data.created" :label="t('claim.created')" />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnSelect
-                    :label="t('claim.basicData.assignedTo')"
+                    :label="t('claim.assignedTo')"
                     v-model="data.workerFk"
                     :options="workersOptions"
                     option-value="id"
@@ -114,7 +111,7 @@ const statesFilter = {
                     option-value="id"
                     option-label="description"
                     emit-value
-                    :label="t('claim.basicData.state')"
+                    :label="t('claim.state')"
                     map-options
                     use-input
                     @filter="(value, update) => filter(value, update, statesFilter)"
@@ -136,7 +133,7 @@ const statesFilter = {
                     option-value="id"
                     option-label="description"
                     emit-value
-                    :label="t('claim.basicData.pickup')"
+                    :label="t('claim.pickup')"
                     map-options
                     use-input
                     :input-debounce="0"

src/pages/Claim/Card/ClaimDescriptor.vue

@@ -2,7 +2,7 @@
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toDate, toPercentage } from 'src/filters';
+import { toDateHourMinSec, toPercentage } from 'src/filters';
 import { useState } from 'src/composables/useState';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
@@ -42,7 +42,7 @@ function stateColor(code) {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.client.name, entity.id);
+    data.value = useCardDescription(entity?.client?.name, entity.id);
     state.set('ClaimDescriptor', entity);
 };
 onMounted(async () => {
@@ -52,12 +52,10 @@ onMounted(async () => {
 
 <template>
     <CardDescriptor
-        ref="descriptor"
         :url="`Claims/${entityId}`"
         :filter="filter"
         module="Claim"
-        :title="data.title"
-        :subtitle="data.subtitle"
+        title="client.name"
         @on-fetch="setData"
         data-key="Claim"
     >
@@ -65,7 +63,7 @@ onMounted(async () => {
             <ClaimDescriptorMenu :claim="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv v-if="entity.claimState" :label="t('claim.card.state')">
+            <VnLv v-if="entity.claimState" :label="t('claim.state')">
                 <template #value>
                     <QBadge
                         :color="stateColor(entity.claimState.code)"
@@ -76,8 +74,8 @@ onMounted(async () => {
                     </QBadge>
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.card.created')" :value="toDate(entity.created)" />
-            <VnLv :label="t('claim.card.commercial')">
+            <VnLv :label="t('claim.created')" :value="toDateHourMinSec(entity.created)" />
+            <VnLv :label="t('claim.commercial')">
                 <template #value>
                     <VnUserLink
                         :name="entity.client?.salesPersonUser?.name"
@@ -87,17 +85,17 @@ onMounted(async () => {
             </VnLv>
             <VnLv
                 v-if="entity.worker"
-                :label="t('claim.card.attendedBy')"
+                :label="t('claim.attendedBy')"
                 :value="entity.worker.user.name"
             >
                 <template #value>
                     <VnUserLink
-                        :name="entity.worker.user.nickname"
+                        :name="entity.worker.user.name"
                         :worker-id="entity.worker.id"
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.card.zone')">
+            <VnLv :label="t('claim.zone')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticket?.zone?.name }}
@@ -106,10 +104,10 @@ onMounted(async () => {
                 </template>
             </VnLv>
             <VnLv
-                :label="t('claim.card.province')"
+                :label="t('claim.province')"
                 :value="entity.ticket?.address?.province?.name"
             />
-            <VnLv :label="t('claim.card.ticketId')">
+            <VnLv :label="t('claim.ticketId')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticketFk }}
@@ -131,7 +129,7 @@ onMounted(async () => {
                     color="primary"
                     :to="{ name: 'CustomerCard', params: { id: entity.clientFk } }"
                 >
-                    <QTooltip>{{ t('claim.card.customerSummary') }}</QTooltip>
+                    <QTooltip>{{ t('claim.customerSummary') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -139,7 +137,7 @@ onMounted(async () => {
                     color="primary"
                     :to="{ name: 'TicketCard', params: { id: entity.ticketFk } }"
                 >
-                    <QTooltip>{{ t('claim.card.claimedTicket') }}</QTooltip>
+                    <QTooltip>{{ t('claim.claimedTicket') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -147,7 +145,7 @@ onMounted(async () => {
                     color="primary"
                     :href="salixUrl + 'ticket/' + entity.ticketFk + '/sale-tracking'"
                 >
-                    <QTooltip>{{ t('claim.card.saleTracking') }}</QTooltip>
+                    <QTooltip>{{ t('claim.saleTracking') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -155,7 +153,7 @@ onMounted(async () => {
                     color="primary"
                     :href="salixUrl + 'ticket/' + entity.ticketFk + '/tracking/index'"
                 >
-                    <QTooltip>{{ t('claim.card.ticketTracking') }}</QTooltip>
+                    <QTooltip>{{ t('claim.ticketTracking') }}</QTooltip>
                 </QBtn>
             </QCardActions>
         </template>

src/pages/Claim/Card/ClaimNotes.vue

@@ -9,7 +9,7 @@ const state = useState();
 const user = state.getUser();
 
 const $props = defineProps({
-    id: { type: Number, default: null },
+    id: { type: [Number, String], default: null },
     addNote: { type: Boolean, default: true },
 });
 const claimId = computed(() => $props.id || route.params.id);

src/pages/Claim/Card/ClaimPhoto.vue

@@ -18,7 +18,7 @@ const claimId = computed(() => router.currentRoute.value.params.id);
 
 const claimDms = ref([
     {
-        dmsFk: 1,
+        dmsFk: claimId,
     },
 ]);
 const client = ref({});
@@ -113,7 +113,7 @@ async function create() {
         warehouseId: config.value.warehouseFk,
         companyId: config.value.companyFk,
         dmsTypeId: dmsType.value.id,
-        description: t('claim.photo.fileDescription', {
+        description: t('claim.fileDescription', {
             claimId: claimId.value,
             clientName: client.value.name,
             clientId: client.value.id,
@@ -177,7 +177,7 @@ function onDrag() {
         >
             <QIcon size="xl" name="file_download" />
             <h5>
-                {{ t('claim.photo.dragDrop') }}
+                {{ t('claim.dragDrop') }}
             </h5>
         </div>
         <div
@@ -188,7 +188,7 @@ function onDrag() {
             <QIcon size="xl" name="image"></QIcon>
             <QIcon size="xl" name="movie"></QIcon>
             <h5>
-                {{ t('claim.photo.noData') }}
+                {{ t('claim.noData') }}
             </h5>
         </div>
         <div class="multimediaParent bg-transparent" v-if="claimDms?.length && !dragFile">

src/pages/Claim/Card/ClaimSummary.vue

@@ -1,20 +1,25 @@
 <script setup>
+import axios from 'axios';
 import { onMounted, ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
-import CardSummary from 'components/ui/CardSummary.vue';
-import FetchData from 'components/FetchData.vue';
+import dashIfEmpty from 'src/filters/dashIfEmpty';
 import { getUrl } from 'src/composables/getUrl';
 import { useSession } from 'src/composables/useSession';
+
 import VnLv from 'src/components/ui/VnLv.vue';
-import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import FetchData from 'components/FetchData.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
+
+import ClaimSummaryAction from 'src/pages/Claim/Card/ClaimSummaryAction.vue';
+import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
+
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import axios from 'axios';
-import dashIfEmpty from 'src/filters/dashIfEmpty';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -34,6 +39,9 @@ const ClaimStates = ref([]);
 const claimUrl = ref();
 const salixUrl = ref();
 const claimDmsRef = ref();
+const claimDms = ref([]);
+const multimediaDialog = ref();
+const multimediaSlide = ref();
 const claimDmsFilter = ref({
     include: [
         {
@@ -42,34 +50,29 @@ const claimDmsFilter = ref({
     ],
 });
 
-onMounted(async () => {
-    salixUrl.value = await getUrl('');
-    claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
-});
-
 const detailsColumns = ref([
     {
         name: 'item',
-        label: 'claim.summary.item',
+        label: 'claim.item',
         field: (row) => row.sale.itemFk,
         sortable: true,
     },
     {
         name: 'landed',
-        label: 'claim.summary.landed',
+        label: 'claim.landed',
         field: (row) => row.sale.ticket.landed,
         format: (value) => toDate(value),
         sortable: true,
     },
     {
         name: 'quantity',
-        label: 'claim.summary.quantity',
+        label: 'claim.quantity',
         field: (row) => row.sale.quantity,
         sortable: true,
     },
     {
         name: 'claimed',
-        label: 'claim.summary.claimed',
+        label: 'claim.claimed',
         field: (row) => row.quantity,
         sortable: true,
     },
@@ -80,32 +83,38 @@ const detailsColumns = ref([
     },
     {
         name: 'price',
-        label: 'claim.summary.price',
+        label: 'claim.price',
         field: (row) => row.sale.price,
         sortable: true,
     },
     {
         name: 'discount',
-        label: 'claim.summary.discount',
+        label: 'claim.discount',
         field: (row) => row.sale.discount,
         format: (value) => `${value} %`,
         sortable: true,
     },
     {
         name: 'total',
-        label: 'claim.summary.total',
+        label: 'claim.total',
         field: ({ sale }) =>
             toCurrency(sale.quantity * sale.price * ((100 - sale.discount) / 100)),
         sortable: true,
     },
 ]);
 
+const markerLabels = [
+    { value: 1, label: t('claim.company') },
+    { value: 5, label: t('claim.person') },
+];
+
 const STATE_COLOR = {
     pending: 'warning',
     incomplete: 'info',
     resolved: 'positive',
     canceled: 'negative',
 };
+
 function stateColor(code) {
     return STATE_COLOR[code];
 }
@@ -113,38 +122,40 @@ function stateColor(code) {
 const developmentColumns = ref([
     {
         name: 'claimReason',
-        label: 'claim.summary.reason',
+        label: 'claim.reason',
         field: (row) => row.claimReason.description,
         sortable: true,
     },
     {
         name: 'claimResult',
-        label: 'claim.summary.result',
+        label: 'claim.result',
         field: (row) => row.claimResult.description,
         sortable: true,
     },
     {
         name: 'claimResponsible',
-        label: 'claim.summary.responsible',
+        label: 'claim.responsible',
         field: (row) => row.claimResponsible.description,
         sortable: true,
     },
     {
         name: 'worker',
-        label: 'claim.summary.worker',
+        label: 'claim.worker',
         field: (row) => row.worker?.user.nickname,
         sortable: true,
     },
     {
         name: 'claimRedelivery',
-        label: 'claim.summary.redelivery',
+        label: 'claim.redelivery',
         field: (row) => row.claimRedelivery.description,
         sortable: true,
     },
 ]);
-const claimDms = ref([]);
-const multimediaDialog = ref();
-const multimediaSlide = ref();
+
+onMounted(async () => {
+    salixUrl.value = await getUrl('');
+    claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
+});
 
 async function getClaimDms() {
     claimDmsFilter.value.where = { claimFk: entityId.value };
@@ -200,7 +211,7 @@ async function changeState(value) {
             >
                 <QList>
                     <QVirtualScroll
-                        style="max-height: 300px"
+                        class="max-container-height"
                         :items="ClaimStates"
                         separator
                         v-slot="{ item, index }"
@@ -221,16 +232,13 @@ async function changeState(value) {
             </QBtnDropdown>
         </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
-            <QCard class="vn-one">
+            <QCard class="vn-one" v-if="$route.name != 'ClaimSummary'">
                 <VnTitle
                     :url="`#/claim/${entityId}/basic-data`"
-                    :text="t('claim.pageTitles.basicData')"
+                    :text="t('globals.pageTitles.basicData')"
                 />
-                <VnLv
-                    :label="t('claim.summary.created')"
-                    :value="toDate(claim.created)"
-                />
-                <VnLv :label="t('claim.summary.state')">
+                <VnLv :label="t('claim.created')" :value="toDate(claim.created)" />
+                <VnLv :label="t('claim.state')">
                     <template #value>
                         <QChip :color="stateColor(claim.claimState.code)" dense>
                             {{ claim.claimState.description }}
@@ -245,7 +253,7 @@ async function changeState(value) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.summary.attendedBy')">
+                <VnLv :label="t('claim.attendedBy')">
                     <template #value>
                         <VnUserLink
                             :name="claim.worker?.user?.nickname"
@@ -253,7 +261,7 @@ async function changeState(value) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.summary.customer')">
+                <VnLv :label="t('claim.customer')">
                     <template #value>
                         <span class="link cursor-pointer">
                             {{ claim.client?.name }}
@@ -262,27 +270,63 @@ async function changeState(value) {
                     </template>
                 </VnLv>
                 <VnLv
-                    :label="t('claim.basicData.pickup')"
+                    :label="t('claim.pickup')"
                     :value="`${dashIfEmpty(claim.pickup)}`"
                 />
             </QCard>
-            <QCard class="vn-three">
-                <VnTitle
-                    :url="`#/claim/${entityId}/notes`"
-                    :text="t('claim.summary.notes')"
-                />
+            <QCard class="vn-two">
+                <VnTitle :url="`#/claim/${entityId}/notes`" :text="t('claim.notes')" />
                 <ClaimNotes
                     :id="entityId"
                     :add-note="false"
-                    style="max-height: 300px"
+                    class="max-container-height"
                     order="created ASC"
                 />
             </QCard>
-            <QCard class="vn-two" v-if="salesClaimed.length > 0">
-                <VnTitle
-                    :url="`#/claim/${entityId}/lines`"
-                    :text="t('claim.summary.details')"
+            <QCard class="vn-two" v-if="claimDms?.length">
+                <VnTitle :url="`#/claim/${entityId}/photos`" :text="t('claim.photos')" />
+                <div class="container max-container-height" style="overflow: auto">
+                    <div
+                        class="multimedia-container"
+                        v-for="(media, index) of claimDms"
+                        :key="index"
+                    >
+                        <div class="relative-position">
+                            <QIcon
+                                name="play_circle"
+                                color="primary"
+                                size="xl"
+                                class="absolute-center zindex"
+                                v-if="media.isVideo"
+                                @click.stop="openDialog(media.dmsFk)"
+                            >
+                                <QTooltip>Video</QTooltip>
+                            </QIcon>
+                            <QCard
+                                class="multimedia relative-position"
+                                style="max-height: 128px"
+                            >
+                                <QImg
+                                    :src="media.url"
+                                    class="rounded-borders cursor-pointer fit"
+                                    @click="openDialog(media.dmsFk)"
+                                    v-if="!media.isVideo"
+                                >
+                                </QImg>
+                                <video
+                                    :src="media.url"
+                                    class="rounded-borders cursor-pointer fit"
+                                    muted="muted"
+                                    v-if="media.isVideo"
+                                    @click="openDialog(media.dmsFk)"
                                 />
+                            </QCard>
+                        </div>
+                    </div>
+                </div>
+            </QCard>
+            <QCard class="vn-max" v-if="salesClaimed.length > 0">
+                <VnTitle :url="`#/claim/${entityId}/lines`" :text="t('claim.details')" />
                 <QTable
                     :columns="detailsColumns"
                     :rows="salesClaimed"
@@ -320,53 +364,8 @@ async function changeState(value) {
                     </template>
                 </QTable>
             </QCard>
-            <QCard class="vn-two" v-if="claimDms.length > 0">
-                <VnTitle
-                    :url="`#/claim/${entityId}/photos`"
-                    :text="t('claim.summary.photos')"
-                />
-                <div class="container">
-                    <div
-                        class="multimedia-container"
-                        v-for="(media, index) of claimDms"
-                        :key="index"
-                    >
-                        <div class="relative-position">
-                            <QIcon
-                                name="play_circle"
-                                color="primary"
-                                size="xl"
-                                class="absolute-center zindex"
-                                v-if="media.isVideo"
-                                @click.stop="openDialog(media.dmsFk)"
-                            >
-                                <QTooltip>Video</QTooltip>
-                            </QIcon>
-                            <QCard class="multimedia relative-position">
-                                <QImg
-                                    :src="media.url"
-                                    class="rounded-borders cursor-pointer fit"
-                                    @click="openDialog(media.dmsFk)"
-                                    v-if="!media.isVideo"
-                                >
-                                </QImg>
-                                <video
-                                    :src="media.url"
-                                    class="rounded-borders cursor-pointer fit"
-                                    muted="muted"
-                                    v-if="media.isVideo"
-                                    @click="openDialog(media.dmsFk)"
-                                />
-                            </QCard>
-                        </div>
-                    </div>
-                </div>
-            </QCard>
-            <QCard class="vn-two" v-if="developments.length > 0">
-                <VnTitle
-                    :url="claimUrl + 'development'"
-                    :text="t('claim.summary.development')"
-                />
+            <QCard class="vn-max" v-if="developments.length > 0">
+                <VnTitle :url="claimUrl + 'development'" :text="t('claim.development')" />
                 <QTable
                     :columns="developmentColumns"
                     :rows="developments"
@@ -382,27 +381,31 @@ async function changeState(value) {
                             </QTh>
                         </QTr>
                     </template>
+                    <template #body-cell-worker="props">
+                        <QTd :props="props" class="link">
+                            {{ props.value }}
+                            <WorkerDescriptorProxy :id="props.row.worker.id" />
+                        </QTd>
+                    </template>
                 </QTable>
             </QCard>
             <QCard class="vn-max">
-                <VnTitle :url="claimUrl + 'action'" :text="t('claim.summary.actions')" />
+                <VnTitle :url="claimUrl + 'action'" :text="t('claim.actions')" />
                 <div id="slider-container" class="q-px-xl q-py-md">
                     <QSlider
                         v-model="claim.responsibility"
                         label
-                        :label-value="t('claim.summary.responsibility')"
+                        :label-value="t('claim.responsibility')"
                         label-always
                         color="var()"
                         markers
-                        :marker-labels="[
-                            { value: 1, label: t('claim.summary.company') },
-                            { value: 5, label: t('claim.summary.person') },
-                        ]"
+                        :marker-labels="markerLabels"
                         :min="1"
                         :max="5"
                         readonly
                     />
                 </div>
+                <ClaimSummaryAction :id="entityId" />
             </QCard>
             <QDialog
                 v-model="multimediaDialog"
@@ -458,7 +461,7 @@ async function changeState(value) {
     gap: 15px;
 }
 .multimedia-container {
-    flex: 1 0 21%;
+    flex: 0 0 128px;
 }
 .multimedia {
     transition: all 0.5s;
@@ -491,4 +494,8 @@ async function changeState(value) {
 .change-state {
     width: 10%;
 }
+
+.max-container-height {
+    max-height: 300px;
+}
 </style>

src/pages/Claim/Card/ClaimSummaryAction.vue

@@ -0,0 +1,97 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { toDate, toPercentage } from 'filters/index';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: [Number, String],
+        required: true,
+    },
+});
+
+const columns = [
+    {
+        name: 'itemFk',
+        label: t('Id item'),
+        columnFilter: false,
+        align: 'left',
+    },
+    {
+        name: 'ticketFk',
+        label: t('Ticket'),
+        columnFilter: false,
+        align: 'left',
+    },
+    {
+        name: 'claimDestinationFk',
+        label: t('Destination'),
+        columnFilter: false,
+        align: 'left',
+    },
+    {
+        name: 'landed',
+        label: t('Landed'),
+        format: (row) => toDate(row.landed),
+        align: 'left',
+    },
+    {
+        name: 'quantity',
+        label: t('Quantity'),
+        align: 'left',
+    },
+    {
+        name: 'concept',
+        label: t('Description'),
+        align: 'left',
+    },
+    {
+        name: 'price',
+        label: t('Price'),
+        align: 'left',
+    },
+    {
+        name: 'discount',
+        label: t('Discount'),
+        format: ({ discount }) => toPercentage(discount / 100),
+        align: 'left',
+    },
+    {
+        name: 'total',
+        label: t('Total'),
+        align: 'left',
+    },
+];
+</script>
+<template>
+    <VnTable
+        data-key="ClaimEndsTable"
+        url="ClaimEnds/filter"
+        :right-search="false"
+        :column-search="false"
+        :disable-option="{ card: true, table: true }"
+        search-url="actions"
+        :filter="{ where: { claimFk: $props.id } }"
+        :columns="columns"
+        :limit="0"
+        :without-header="true"
+        auto-load
+    >
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+    </VnTable>
+</template>

src/pages/Claim/ClaimFilter.vue

@@ -16,19 +16,14 @@ const props = defineProps({
     },
 });
 
-const workers = ref();
-const states = ref();
+const states = ref([]);
+
+defineExpose({ states });
 </script>
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -36,156 +31,110 @@ const states = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QItem class="q-my-sm">
-                <QItemSection>
+            <div class="q-pa-sm q-gutter-y-sm">
                 <VnInput
-                        :label="t('Customer ID')"
+                    :label="t('claim.customerId')"
                     v-model="params.clientFk"
                     lazy-rules
                     is-outlined
                 >
-                        <template #prepend>
-                            <QIcon name="badge" size="xs"></QIcon> </template
-                    ></VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection>
+                    <template #prepend> <QIcon name="badge" size="xs" /></template>
+                </VnInput>
                 <VnInput
                     :label="t('Client Name')"
                     v-model="params.clientName"
                     lazy-rules
                     is-outlined
                 />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
                 <VnSelect
                     :label="t('Salesperson')"
                     v-model="params.salesPersonFk"
                     @update:model-value="searchFn()"
-                        :options="workers"
+                    url="Workers/activeWithInheritedRole"
+                    :filter="{ where: { role: 'salesPerson' } }"
+                    :use-like="false"
                     option-value="id"
                     option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
+                    option-filter="firstName"
                     dense
                     outlined
                     rounded
-                        :input-debounce="0"
                 />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
                 <VnSelect
-                        :label="t('Attender')"
+                    :label="t('claim.attendedBy')"
                     v-model="params.attenderFk"
                     @update:model-value="searchFn()"
-                        :options="workers"
+                    url="Workers/activeWithInheritedRole"
+                    :filter="{ where: { role: 'salesPerson' } }"
+                    :use-like="false"
                     option-value="id"
                     option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
+                    option-filter="firstName"
                     dense
                     outlined
                     rounded
-                        :input-debounce="0"
                 />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
                 <VnSelect
-                        :label="t('Responsible')"
-                        v-model="params.claimResponsibleFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!states">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="states">
-                    <VnSelect
-                        :label="t('State')"
+                    :label="t('claim.state')"
                     v-model="params.claimStateFk"
                     @update:model-value="searchFn()"
                     :options="states"
                     option-value="id"
                     option-label="description"
-                        emit-value
-                        map-options
-                        hide-selected
                     dense
                     outlined
                     rounded
                 />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        v-model="params.myTeam"
-                        :label="t('myTeam')"
-                        toggle-indeterminate
-                    />
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-            <QExpansionItem :label="t('More options')" expand-separator>
-                <!-- <QItem>
-                        <QItemSection>
-                            <qSelect
-                                :label="t('Item')"
-                                v-model="params.itemFk"
-                                :options="items"
-                                :loading="loading"
-                                @filter="filterFn"
-                                @virtual-scroll="onScroll"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                            />
-                        </QItemSection>
-                    </QItem> -->
-                <QItem>
-                    <QItemSection>
                 <VnInputDate
                     v-model="params.created"
-                            :label="t('Created')"
-                            is-outlined
+                    @update:model-value="searchFn()"
+                    :label="t('claim.created')"
+                    outlined
+                    rounded
+                    dense
                 />
+                <VnSelect
+                    :label="t('Item')"
+                    v-model="params.itemFk"
+                    @update:model-value="searchFn()"
+                    url="Items/withName"
+                    option-value="id"
+                    option-label="name"
+                    sort-by="id DESC"
+                    outlined
+                    rounded
+                    dense
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
                             </QItemSection>
                         </QItem>
-            </QExpansionItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('claim.responsible')"
+                    v-model="params.claimResponsibleFk"
+                    @update:model-value="searchFn()"
+                    url="Workers/activeWithInheritedRole"
+                    :filter="{ where: { role: 'salesPerson' } }"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="firstName"
+                    dense
+                    outlined
+                    rounded
+                />
+                <QCheckbox
+                    v-model="params.myTeam"
+                    :label="t('params.myTeam')"
+                    @update:model-value="searchFn()"
+                    toggle-indeterminate
+                />
+            </div>
         </template>
     </VnFilterPanel>
 </template>
@@ -202,6 +151,7 @@ en:
         claimStateFk: State
         created: Created
         myTeam: My team
+        itemFk: Item
 es:
     params:
         search: Contiene
@@ -212,14 +162,9 @@ es:
         claimResponsibleFk: Responsable
         claimStateFk: Estado
         created: Creada
-    Customer ID: ID cliente
+        myTeam: Mi equipo
+        itemFk: Artículo
     Client Name: Nombre del cliente
     Salesperson: Comercial
-    Attender: Asistente
-    Responsible: Responsable
-    State: Estado
     Item: Artículo
-    Created: Creada
-    More options: Más opciones
-    myTeam: Mi equipo
 </i18n>

src/pages/Claim/ClaimList.vue

@@ -1,38 +1,114 @@
 <script setup>
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 import { toDate } from 'filters/index';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import ClaimFilter from './ClaimFilter.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
-const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 
+const claimFilterRef = ref();
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.name'),
+        name: 'clientName',
+        isTitle: true,
+        visible: false,
+    },
+    {
+        align: 'left',
+        label: t('claim.customer'),
+        name: 'clientFk',
+        cardVisible: true,
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'name'],
+            },
+        },
+        class: 'expand',
+    },
+    {
+        align: 'left',
+        label: t('claim.attendedBy'),
+        name: 'attendedBy',
+        cardVisible: true,
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Workers/activeWithInheritedRole',
+                fields: ['id', 'name'],
+                where: { role: 'salesPerson' },
+                useLike: false,
+                optionValue: 'id',
+                optionLabel: 'name',
+                optionFilter: 'firstName',
+            },
+        },
+    },
+    {
+        align: 'left',
+        label: t('claim.created'),
+        name: 'created',
+        format: ({ created }) => toDate(created),
+        cardVisible: true,
+        columnFilter: {
+            component: 'date',
+        },
+    },
+    {
+        align: 'left',
+        label: t('claim.state'),
+        name: 'stateCode',
+        chip: {
+            condition: () => true,
+            color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
+        },
+        columnFilter: {
+            name: 'claimStateFk',
+            component: 'select',
+            attrs: {
+                options: claimFilterRef.value?.states,
+                optionLabel: 'description',
+            },
+        },
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Client ticket list'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, ClaimSummary),
+            },
+        ],
+    },
+]);
+
 const STATE_COLOR = {
-    pending: 'warning',
-    managed: 'info',
-    resolved: 'positive',
+    pending: 'bg-warning',
+    managed: 'bg-info',
+    resolved: 'bg-positive',
 };
-function getApiUrl() {
-    return new URL(window.location).origin;
-}
-function stateColor(code) {
-    return STATE_COLOR[code];
-}
-function navigate(event, id) {
-    if (event.ctrlKey || event.metaKey)
-        return window.open(`${getApiUrl()}/#/claim/${id}/summary`);
-    router.push({ path: `/claim/${id}` });
-}
 </script>
 
 <template>
@@ -43,85 +119,39 @@ function navigate(event, id) {
     />
     <RightMenu>
         <template #right-panel>
-            <ClaimFilter data-key="ClaimList" />
+            <ClaimFilter data-key="ClaimList" ref="claimFilterRef" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
+    <VnTable
         data-key="ClaimList"
         url="Claims/filter"
         :order="['priority ASC', 'created DESC']"
+        :columns="columns"
+        redirect="claim"
+        :right-search="false"
         auto-load
     >
-                <template #body="{ rows }">
-                    <CardList
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.clientName"
-                        @click="navigate($event, row.id)"
-                        v-for="row of rows"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('claim.list.customer')">
-                                <template #value>
+        <template #column-clientFk="{ row }">
             <span class="link" @click.stop>
                 {{ row.clientName }}
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
-                            </VnLv>
-                            <VnLv :label="t('claim.list.assignedTo')">
-                                <template #value>
+        <template #column-attendedBy="{ row }">
             <span @click.stop>
-                                        <VnUserLink
-                                            :name="row.workerName"
-                                            :worker-id="row.workerFk"
-                                        />
+                <VnUserLink :name="row.workerName" :worker-id="row.workerFk" />
             </span>
         </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('claim.list.created')"
-                                :value="toDate(row.created)"
-                            />
-                            <VnLv :label="t('claim.list.state')">
-                                <template #value>
-                                    <QBadge
-                                        text-color="black"
-                                        :color="stateColor(row.stateCode)"
-                                        dense
-                                    >
-                                        {{ row.stateDescription }}
-                                    </QBadge>
-                                </template>
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('globals.description')"
-                                @click.stop
-                                outline
-                                style="margin-top: 15px"
-                            >
-                                <CustomerDescriptorProxy :id="row.clientFk" />
-                            </QBtn>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, ClaimSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
+    </VnTable>
 </template>
 
 <i18n>
 es:
     Search claim: Buscar reclamación
     You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
+    params:
+        stateCode: Estado
+en:
+    params:
+        stateCode: State
 </i18n>

src/pages/Claim/locale/en.yml

@@ -0,0 +1,46 @@
+claim:
+    customer: Customer
+    code: Code
+    records: records
+    claimId: Claim ID
+    attendedBy: Attended by
+    ticketId: Ticket ID
+    customerSummary: Customer summary
+    claimedTicket: Claimed ticket
+    saleTracking: Sale tracking
+    ticketTracking: Ticket tracking
+    commercial: Commercial
+    province: Province
+    zone: Zone
+    customerId: client ID
+    assignedTo: Assigned
+    created: Created
+    details: Details
+    item: Item
+    landed: Landed
+    quantity: Quantity
+    claimed: Claimed
+    price: Price
+    discount: Discount
+    total: Total
+    actions: Actions
+    responsibility: Responsibility
+    company: Company
+    person: Employee/Customer
+    notes: Notes
+    photos: Photos
+    development: Development
+    reason: Reason
+    result: Result
+    responsible: Responsible
+    worker: Worker
+    redelivery: Redelivery
+    changeState: Change state
+    state: State
+    pickup: Pick up
+    null: No
+    agency: Agency
+    delivery: Delivery
+    fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
+    noData: 'There are no images/videos, click here or drag and drop the file'
+    dragDrop: Drag and drop it here

src/pages/Claim/locale/es.yml

@@ -1,2 +1,48 @@
 Search claim: Buscar reclamación
 You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
+claim:
+    customer: Cliente
+    code: Código
+    records: Registros
+    claimId: ID de reclamación
+    attendedBy: Atendido por
+    ticketId: ID de ticket
+    customerSummary: Resumen del cliente
+    claimedTicket: Ticket reclamado
+    saleTracking: Seguimiento de ventas
+    ticketTracking: Seguimiento de tickets
+    commercial: Comercial
+    province: Provincia
+    zone: Zona
+    customerId: ID de cliente
+    assignedTo: Asignado a
+    created: Creado
+    details: Detalles
+    item: Artículo
+    landed: Llegado
+    quantity: Cantidad
+    claimed: Reclamado
+    price: Precio
+    discount: Descuento
+    total: Total
+    actions: Acciones
+    responsibility: Responsabilidad
+    company: Empresa
+    person: Empleado/Cliente
+    notes: Notas
+    photos: Fotos
+    development: Trazabilidad
+    reason: Razón
+    result: Resultado
+    responsible: Responsable
+    worker: Trabajador
+    redelivery: Reentrega
+    changeState: Cambiar estado
+    state: Estado
+    pickup: Recoger
+    null: No
+    agency: Agencia
+    delivery: Entrega
+    fileDescription: 'ID de reclamación {claimId} del cliente {clientName} con ID {clientId}'
+    noData: 'No hay imágenes/videos, haz clic aquí o arrastra y suelta el archivo'
+    dragDrop: Arrastra y suelta aquí

src/pages/Customer/Card/CustomerBasicData.vue

@@ -69,7 +69,7 @@ const filterOptions = {
         <template #form="{ data, validate, filter }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
-                    :label="t('Comercial name')"
+                    :label="t('globals.name')"
                     :rules="validate('client.socialName')"
                     autofocus
                     clearable

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -32,7 +32,7 @@ const entityId = computed(() => {
 });
 
 const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
+const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
 </script>
 
 <template>
@@ -45,20 +45,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
         :summary="$props.summary"
         data-key="customerData"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                size="sm"
-                icon="vn:Person"
-                color="white"
-                :to="{ name: 'CustomerList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu="{ entity }">
             <CustomerDescriptorMenu :customer="entity" />
         </template>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -147,6 +147,7 @@ function handleLocation(data, location) {
                     :label="t('Electronic invoice')"
                     v-model="data.hasElectronicInvoice"
                 />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
             </VnRow>
         </template>
     </FormModel>
@@ -176,6 +177,7 @@ es:
     onlyLetters: Sólo se pueden usar letras, números y espacios
     whenActivatingIt: Al activarlo, no informar el código del país en el campo nif
     inOrderToInvoice: Para facturar no se consulta este campo, sino el RE de consignatario. Al modificar este campo si no esta marcada la casilla Facturar por consignatario, se propagará automaticamente el cambio a todos lo consignatarios, en caso contrario preguntará al usuario si quiere o no propagar
+    Daily invoice: Facturación diaria
 en:
     onlyLetters: Only letters, numbers and spaces can be used
     whenActivatingIt: When activating it, do not enter the country code in the ID field

src/pages/Customer/Card/CustomerGreuges.vue

@@ -13,7 +13,7 @@ const { t } = useI18n();
 const route = useRoute();
 const stateStore = computed(() => useStateStore());
 const rows = ref([]);
-const totalAmount = ref(0);
+const totalAmount = ref();
 
 const filter = {
     include: [
@@ -75,7 +75,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: (value) => value.user.name,
+        field: (value) => value?.user?.name,
         label: t('Created by'),
         name: 'createdBy',
     },
@@ -87,7 +87,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: (value) => value.greugeType.name,
+        field: (value) => value?.greugeType?.name,
         label: t('Type'),
         name: 'type',
     },
@@ -108,26 +108,9 @@ const setRows = (data) => {
 
 <template>
     <FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
         <QCard class="full-width q-pa-sm">
-            <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount">
+            <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount !== undefined">
                 <span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
                 {{ toCurrency(totalAmount) }}
             </h6>

src/pages/Customer/Card/CustomerSummary.vue

@@ -73,7 +73,7 @@ const creditWarning = computed(() => {
                     :text="t('customer.summary.basicData')"
                 />
                 <VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
-                <VnLv :label="t('customer.summary.name')" :value="entity.name" />
+                <VnLv :label="t('globals.name')" :value="entity.name" />
                 <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
                 <VnLv :value="entity.phone">
                     <template #label>

src/pages/Customer/CustomerList.vue

@@ -38,10 +38,13 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.name'),
+        label: t('globals.name'),
         name: 'name',
         isTitle: true,
         create: true,
+        columnField: {
+            class: 'expand',
+        },
     },
     {
         align: 'left',
@@ -49,6 +52,9 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.socialName'),
         isTitle: true,
         create: true,
+        columnField: {
+            class: 'expand',
+        },
     },
     {
         align: 'left',
@@ -65,6 +71,8 @@ const columns = computed(() => [
             url: 'Workers/activeWithInheritedRole',
             fields: ['id', 'name'],
             where: { role: 'salesPerson' },
+            optionFilter: 'firstName',
+            useLike: false,
         },
         create: true,
         columnField: {
@@ -76,8 +84,8 @@ const columns = computed(() => [
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.credit'),
         name: 'credit',
-        component: 'number',
         columnFilter: {
+            component: 'number',
             inWhere: true,
         },
     },
@@ -85,8 +93,8 @@ const columns = computed(() => [
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
         name: 'creditInsurance',
-        component: 'number',
         columnFilter: {
+            component: 'number',
             inWhere: true,
         },
     },
@@ -128,6 +136,9 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
+        columnField: {
+            class: 'expand',
+        },
     },
     {
         align: 'left',
@@ -177,8 +188,8 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.created'),
         name: 'created',
         format: ({ created }) => toDate(created),
-        component: 'date',
         columnFilter: {
+            component: 'date',
             alias: 'c',
             inWhere: true,
         },
@@ -403,7 +414,6 @@ function handleLocation(data, location) {
         }"
         order="id DESC"
         :columns="columns"
-        default-mode="table"
         redirect="customer"
         auto-load
     >

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -91,7 +91,6 @@ const tableColumnComponents = {
         props: (prop) => ({
             disable: true,
             'model-value': prop.value,
-            class: 'disabled-checkbox',
         }),
         event: () => {},
     },

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

@@ -119,7 +119,7 @@ const departments = ref();
                         emit-value
                         hide-selected
                         map-options
-                        option-label="country"
+                        option-label="name"
                         option-value="id"
                         outlined
                         rounded

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -24,7 +24,7 @@ const $props = defineProps({
 
 const route = useRoute();
 const router = useRouter();
-
+const DepartmentDescriptorRef = ref();
 const { t } = useI18n();
 const { notify } = useNotify();
 
@@ -55,18 +55,20 @@ const { openConfirmationModal } = useVnConfirm();
 </script>
 <template>
     <CardDescriptor
+        ref="DepartmentDescriptorRef"
         module="Department"
-        data-key="departmentData"
         :url="`Departments/${entityId}`"
         :title="data.title"
         :subtitle="data.subtitle"
         :summary="$props.summary"
+        :to-module="{ name: 'WorkerDepartment' }"
         @on-fetch="
             (data) => {
                 department = data;
                 setData(data);
             }
         "
+        data-key="department"
     >
         <template #menu="{}">
             <QItem

src/pages/Entry/Card/EntryDescriptor.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, watch } from 'vue';
+import { ref, computed, watch, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -10,6 +10,7 @@ import useCardDescription from 'src/composables/useCardDescription';
 import { useState } from 'src/composables/useState';
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
+import { getUrl } from 'src/composables/getUrl';
 
 const $props = defineProps({
     id: {
@@ -17,10 +18,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -28,6 +25,7 @@ const { t } = useI18n();
 const { openReport } = usePrintService();
 const state = useState();
 const entryDescriptorRef = ref(null);
+const url = ref();
 
 const entryFilter = {
     include: [
@@ -69,10 +67,13 @@ const entryFilter = {
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+onMounted(async () => {
+    url.value = await getUrl('');
+});
 
 const data = ref(useCardDescription());
 const setData = (entity) =>
-    (data.value = useCardDescription(entity.supplier.nickname, entity.id));
+    (data.value = useCardDescription(entity.supplier?.nickname, entity.id));
 
 const currentEntry = computed(() => state.get('entry'));
 

src/pages/Entry/Card/EntryDescriptorProxy.vue

@@ -1,5 +1,6 @@
 <script setup>
 import EntryDescriptor from './EntryDescriptor.vue';
+import EntrySummary from './EntrySummary.vue';
 
 const $props = defineProps({
     id: {
@@ -11,6 +12,6 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <EntryDescriptor v-if="$props.id" :id="$props.id" />
+        <EntryDescriptor v-if="$props.id" :id="$props.id" :summary="EntrySummary" />
     </QPopupProxy>
 </template>

src/pages/Entry/Card/EntrySummary.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, onUpdated } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -11,8 +11,6 @@ import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 
-onUpdated(() => summaryRef.value.fetch());
-
 const route = useRoute();
 const { t } = useI18n();
 
@@ -185,15 +183,10 @@ const fetchEntryBuys = async () => {
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" />
                 </router-link>
-
                 <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
-
                 <VnLv :label="t('entry.summary.currency')" :value="entry.currency.name" />
-
                 <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
-
                 <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
-
                 <VnLv
                     :label="t('entry.summary.invoiceNumber')"
                     :value="entry.invoiceNumber"
@@ -207,7 +200,6 @@ const fetchEntryBuys = async () => {
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" />
                 </router-link>
-
                 <VnLv :label="t('entry.summary.travelReference')">
                     <template #value>
                         <span class="link">
@@ -216,31 +208,25 @@ const fetchEntryBuys = async () => {
                         </span>
                     </template>
                 </VnLv>
-
                 <VnLv
                     :label="t('entry.summary.travelAgency')"
                     :value="entry.travel.agency.name"
                 />
-
                 <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
-
                 <VnLv
                     :label="t('entry.summary.travelWarehouseOut')"
                     :value="entry.travel.warehouseOut.name"
                 />
-
                 <QCheckbox
                     :label="t('entry.summary.travelDelivered')"
                     v-model="entry.travel.isDelivered"
                     :disable="true"
                 />
                 <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
-
                 <VnLv
                     :label="t('entry.summary.travelWarehouseIn')"
                     :value="entry.travel.warehouseIn.name"
                 />
-
                 <QCheckbox
                     :label="t('entry.summary.travelReceived')"
                     v-model="entry.travel.isReceived"

src/pages/Entry/EntryBuysTableDialog.vue

@@ -0,0 +1,120 @@
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { QBtn } from 'quasar';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import { usePrintService } from 'composables/usePrintService';
+const { openReport } = usePrintService();
+
+const route = useRoute();
+const { t } = useI18n();
+const $props = defineProps({
+    id: {
+        type: String,
+        required: false,
+        default: null,
+    },
+});
+const entityId = computed(() => $props.id || route.params.id);
+
+const entriesTableColumns = computed(() => [
+    {
+        align: 'left',
+        name: 'itemFk',
+        field: 'itemFk',
+        label: t('globals.id'),
+    },
+    {
+        align: 'left',
+        name: 'item',
+        label: t('entry.summary.item'),
+        field: (row) => row.item.name,
+    },
+    {
+        align: 'left',
+        name: 'packagingFk',
+        label: t('entry.summary.package'),
+        field: 'packagingFk',
+    },
+    {
+        align: 'left',
+        name: 'stickers',
+        label: t('entry.summary.stickers'),
+        field: 'stickers',
+    },
+    {
+        align: 'left',
+        name: 'packing',
+        label: t('entry.summary.packing'),
+        field: 'packing',
+    },
+    {
+        align: 'left',
+        name: 'grouping',
+        label: t('entry.summary.grouping'),
+        field: 'grouping',
+    },
+]);
+</script>
+
+<template>
+    <QDialog ref="dialogRef">
+        <QCard style="min-width: 800px">
+            <QCardSection class="row items-center q-pb-none">
+                <QAvatar
+                    :icon="icon"
+                    color="primary"
+                    text-color="white"
+                    size="xl"
+                    v-if="icon"
+                />
+                <span class="text-h6 text-grey">{{ title }}</span>
+                <QSpace />
+                <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
+            </QCardSection>
+            <QCardActions align="right">
+                <QBtn
+                    :label="t('Print buys')"
+                    color="primary"
+                    icon="print"
+                    :loading="isLoading"
+                    @click="openReport(`Entries/${entityId}/buy-label`)"
+                    unelevated
+                    autofocus
+                />
+            </QCardActions>
+            <QCardSection class="row items-center">
+                <VnPaginate
+                    ref="entryBuysPaginateRef"
+                    :limit="0"
+                    data-key="EntryBuys"
+                    :url="`Entries/${entityId}/getBuys`"
+                    auto-load
+                >
+                    <template #body="{ rows }">
+                        <QTable
+                            :rows="rows"
+                            :columns="entriesTableColumns"
+                            row-key="id"
+                            flat
+                            dense
+                            class="q-ml-lg"
+                            :grid="$q.screen.lt.md"
+                            :no-data-label="t('globals.noResults')"
+                        >
+                            <template #body="props">
+                                <QTr>
+                                    <QTd v-for="col in props.cols" :key="col.name">
+                                        {{ col.value }}
+                                    </QTd>
+                                </QTr>
+                            </template>
+                        </QTable>
+                    </template>
+                </VnPaginate>
+            </QCardSection>
+        </QCard>
+    </QDialog>
+</template>

src/pages/Entry/EntryCreate.vue

@@ -63,7 +63,7 @@ const redirectToEntryBasicData = (_, { id }) => {
             <VnSearchbar
                 url="Entries/filter"
                 custom-route-redirect-name="EntrySummary"
-                data-key="EntrySummary"
+                data-key="Entry"
                 :label="t('Search entries')"
                 :info="t('You can search by entry reference')"
             />

src/pages/Entry/EntryLatestBuys.vue

@@ -1,759 +1,199 @@
 <script setup>
-import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
+import { onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import FetchData from 'components/FetchData.vue';
-import FetchedTags from 'components/ui/FetchedTags.vue';
-import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
-import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
-import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
-import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-import { toDate, toCurrency } from 'src/filters';
-// import { useSession } from 'composables/useSession';
-import { dashIfEmpty } from 'src/filters';
-import { useArrayData } from 'composables/useArrayData';
 import RightMenu from 'src/components/common/RightMenu.vue';
-import VnImg from 'src/components/ui/VnImg.vue';
-
-const router = useRouter();
-// const { getTokenMultimedia } = useSession();
-// const token = getTokenMultimedia();
+import VnTable from 'components/VnTable/VnTable.vue';
+import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
+import { useStateStore } from 'stores/useStateStore';
 const stateStore = useStateStore();
 const { t } = useI18n();
+import { toDate } from 'src/filters';
+import VnImg from 'src/components/ui/VnImg.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
-const rowsFetchDataRef = ref(null);
-const itemTypesOptions = ref([]);
-const originsOptions = ref([]);
-const itemFamiliesOptions = ref([]);
-const intrastatOptions = ref([]);
-const packagingsOptions = ref([]);
-const editTableCellDialogRef = ref(null);
-const visibleColumns = ref([]);
-const allColumnNames = ref([]);
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'id':
-        case 'size':
-        case 'weightByPiece':
-        case 'isActive':
-        case 'family':
-        case 'minPrice':
-        case 'packingOut':
-            return { [`i.${param}`]: value };
-        case 'name':
-        case 'description':
-            return { [`i.${param}`]: { like: `%${value}%` } };
-        case 'code':
-            return { 'it.code': value };
-        case 'intrastat':
-            return { 'intr.description': value };
-        case 'origin':
-            return { 'ori.code': value };
-        case 'landing':
-            return { [`lb.${param}`]: value };
-        case 'packing':
-        case 'grouping':
-        case 'quantity':
-        case 'entryFk':
-        case 'buyingValue':
-        case 'freightValue':
-        case 'comissionValue':
-        case 'packageValue':
-        case 'isIgnored':
-        case 'price2':
-        case 'price3':
-        case 'ektFk':
-        case 'weight':
-        case 'packagingFk':
-            return { [`b.${param}`]: value };
-    }
-};
-
-const params = reactive({});
-const arrayData = useArrayData('EntryLatestBuys', {
-    url: 'Buys/latestBuysFilter',
-    order: ['itemFk DESC'],
-    exprBuilder: exprBuilder,
-});
-const store = arrayData.store;
-const rows = computed(() => store.data);
-const rowsSelected = ref([]);
-
-const getInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
-
-const columns = computed(() => [
+const columns = [
     {
-        label: t('entry.latestBuys.picture'),
-        name: 'picture',
-        align: 'left',
+        align: 'center',
+        label: t('entry.latestBuys.tableVisibleColumns.image'),
+        name: 'image',
+        columnField: {
+            component: VnImg,
+            attrs: (id) => {
+                return {
+                    id,
+                    width: '50px',
+                };
+            },
+        },
+        columnFilter: false,
     },
     {
-        label: t('entry.latestBuys.itemFk'),
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.itemFk'),
         name: 'itemFk',
-        field: 'itemFk',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
+        isTitle: true,
     },
     {
-        label: t('entry.latestBuys.packing'),
-        field: 'packing',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.packing'),
         name: 'packing',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('entry.latestBuys.grouping'),
-        field: 'grouping',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.grouping'),
         name: 'grouping',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('entry.latestBuys.quantity'),
-        field: 'quantity',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.quantity'),
         name: 'quantity',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.description'),
-        field: 'description',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.description'),
         name: 'description',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('entry.latestBuys.size'),
-        field: 'size',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.size'),
         name: 'size',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.tags'),
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.tags'),
         name: 'tags',
-        align: 'left',
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.type'),
-        field: 'code',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.type'),
         name: 'type',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: itemTypesOptions.value,
-                'option-value': 'code',
-                'option-label': 'code',
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.intrastat'),
-        field: 'intrastat',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.intrastat'),
         name: 'intrastat',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: intrastatOptions.value,
-                'option-value': 'description',
-                'option-label': 'description',
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.origin'),
-        field: 'origin',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.origin'),
         name: 'origin',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: originsOptions.value,
-                'option-value': 'code',
-                'option-label': 'code',
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.weightByPiece'),
-        field: 'weightByPiece',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
         name: 'weightByPiece',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('entry.latestBuys.isActive'),
-        field: 'isActive',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.isActive'),
         name: 'isActive',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.family'),
-        field: 'family',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.family'),
         name: 'family',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: itemFamiliesOptions.value,
-                'option-value': 'code',
-                'option-label': 'code',
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.entryFk'),
-        field: 'entryFk',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.entryFk'),
         name: 'entryFk',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.buyingValue'),
-        field: 'buyingValue',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.buyingValue'),
         name: 'buyingValue',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
     },
     {
-        label: t('entry.latestBuys.freightValue'),
-        field: 'freightValue',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.freightValue'),
         name: 'freightValue',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
     },
     {
-        label: t('entry.latestBuys.comissionValue'),
-        field: 'comissionValue',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.comissionValue'),
         name: 'comissionValue',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
     },
     {
-        label: t('entry.latestBuys.packageValue'),
-        field: 'packageValue',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
         name: 'packageValue',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
     },
     {
-        label: t('entry.latestBuys.isIgnored'),
-        field: 'isIgnored',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.isIgnored'),
         name: 'isIgnored',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.price2'),
-        field: 'price2',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.price2'),
         name: 'price2',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-
-        format: (val) => toCurrency(val),
     },
     {
-        label: t('entry.latestBuys.price3'),
-        field: 'price3',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.price3'),
         name: 'price3',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
     },
     {
-        label: t('entry.latestBuys.minPrice'),
-        field: 'minPrice',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.minPrice'),
         name: 'minPrice',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => toCurrency(val),
     },
     {
-        label: t('entry.latestBuys.ektFk'),
-        field: 'ektFk',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.ektFk'),
         name: 'ektFk',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('entry.latestBuys.weight'),
-        field: 'weight',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.weight'),
         name: 'weight',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.packagingFk'),
-        field: 'packagingFk',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.packagingFk'),
         name: 'packagingFk',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: packagingsOptions.value,
-                'option-value': 'id',
-                'option-label': 'id',
-                dense: true,
-            },
-        },
     },
     {
-        label: t('entry.latestBuys.packingOut'),
-        field: 'packingOut',
+        align: 'left',
+        label: t('entry.latestBuys.tableVisibleColumns.packingOut'),
         name: 'packingOut',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('entry.latestBuys.landing'),
-        field: 'landing',
-        name: 'landing',
         align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
+        label: t('entry.latestBuys.tableVisibleColumns.landing'),
+        name: 'landing',
+        component: 'date',
+        columnField: {
+            component: null,
         },
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing)),
     },
-        format: (val) => toDate(val),
-    },
-]);
-
-const editTableCellFormFieldsOptions = [
-    { field: 'packing', label: t('entry.latestBuys.packing') },
-    { field: 'grouping', label: t('entry.latestBuys.grouping') },
-    { field: 'packageValue', label: t('entry.latestBuys.packageValue') },
-    { field: 'weight', label: t('entry.latestBuys.weight') },
-    { field: 'description', label: t('globals.description') },
-    { field: 'size', label: t('entry.latestBuys.size') },
-    { field: 'weightByPiece', label: t('entry.latestBuys.weightByPiece') },
-    { field: 'packingOut', label: t('entry.latestBuys.packingOut') },
-    { field: 'landing', label: t('entry.latestBuys.landing') },
 ];
 
-const openEditTableCellDialog = () => {
-    editTableCellDialogRef.value.show();
-};
-
-const onEditCellDataSaved = async () => {
-    rowsSelected.value = [];
-    await rowsFetchDataRef.value.fetch();
-};
-
-const redirectToEntryBuys = (entryFk) => {
-    router.push({ name: 'EntryBuys', params: { id: entryFk } });
-};
-
-const applyColumnFilter = async (col) => {
-    try {
-        params[col.field] = col.columnFilter.filterValue;
-        await arrayData.addFilter({ params });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
-
 onMounted(async () => {
     stateStore.rightDrawer = true;
-    const filteredColumns = columns.value.filter((col) => col.name !== 'picture');
-    allColumnNames.value = filteredColumns.map((col) => col.name);
-    await arrayData.fetch({ append: false });
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <FetchData
-        url="ItemTypes"
-        :filter="{ fields: ['code'], order: 'code ASC', limit: 30 }"
-        auto-load
-        @on-fetch="(data) => (itemTypesOptions = data)"
-    />
-    <FetchData
-        url="Origins"
-        :filter="{ fields: ['code'], order: 'code ASC', limit: 30 }"
-        auto-load
-        @on-fetch="(data) => (originsOptions = data)"
-    />
-    <FetchData
-        url="ItemFamilies"
-        :filter="{ fields: ['code'], order: 'code ASC', limit: 30 }"
-        auto-load
-        @on-fetch="(data) => (itemFamiliesOptions = data)"
-    />
-    <FetchData
-        url="Packagings"
-        :filter="{ fields: ['id'], order: 'id ASC', limit: 30 }"
-        auto-load
-        @on-fetch="(data) => (packagingsOptions = data)"
-    />
-    <FetchData
-        url="Intrastats"
-        :filter="{ fields: ['description'], order: 'description ASC', limit: 30 }"
-        auto-load
-        @on-fetch="(data) => (intrastatOptions = data)"
-    />
-    <VnSubToolbar>
-        <template #st-data>
-            <TableVisibleColumns
-                :all-columns="allColumnNames"
-                table-code="latestBuys"
-                labels-traductions-path="entry.latestBuys"
-                @on-config-saved="visibleColumns = ['picture', ...$event]"
-            />
-        </template>
-    </VnSubToolbar>
     <RightMenu>
         <template #right-panel>
-            <EntryLatestBuysFilter data-key="EntryLatestBuys" />
+            <EntryLatestBuysFilter data-key="LatestBuys" />
         </template>
     </RightMenu>
-    <Teleport to="#actions-append">
-        <div class="row q-gutter-x-sm">
-            <QBtn flat @click="stateStore.toggleRightDrawer()" round dense icon="menu">
-                <QTooltip bottom anchor="bottom right">
-                    {{ t('globals.collapseMenu') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-    </Teleport>
-    <QPage class="column items-center q-pa-md">
-        <QTable
-            :rows="rows"
+    <VnSubToolbar />
+    <VnTable
+        ref="tableRef"
+        data-key="LatestBuys"
+        url="Buys/latestBuysFilter"
+        order="id DESC"
         :columns="columns"
-            selection="multiple"
-            row-key="id"
-            class="full-width q-mt-md"
-            :visible-columns="visibleColumns"
-            v-model:selected="rowsSelected"
-            :no-data-label="t('globals.noResults')"
-            @row-click="(_, row) => redirectToEntryBuys(row.entryFk)"
-        >
-            <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.name !== 'picture'"
-                            v-model="col.columnFilter.filterValue"
-                            v-bind="col.columnFilter.attrs"
-                            v-on="col.columnFilter.event(col)"
-                            dense
+        redirect="entry"
+        auto-load
+        :right-search="false"
     />
-                    </QTd>
-                </QTr>
-            </template>
-            <template #body-cell-picture="{ row }">
-                <QTd>
-                    <VnImg :id="row.itemFk" size="50x50" class="image" />
-                </QTd>
-            </template>
-            <template #body-cell-itemFk="{ row }">
-                <QTd @click.stop>
-                    <QBtn flat color="primary">
-                        {{ row.itemFk }}
-                    </QBtn>
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </QTd>
-            </template>
-            <template #body-cell-tags="{ row }">
-                <QTd>
-                    <FetchedTags :item="row" :max-length="6" />
-                </QTd>
-            </template>
-            <template #body-cell-entryFk="{ row }">
-                <QTd @click.stop>
-                    <QBtn flat color="primary">
-                        <EntryDescriptorProxy :id="row.entryFk" />
-                        {{ row.entryFk }}
-                    </QBtn>
-                </QTd>
-            </template>
-            <template #body-cell-isIgnored="{ row }">
-                <QTd>
-                    <QIcon
-                        :name="row.isIgnored ? `check` : `close`"
-                        :color="row.isIgnored ? `positive` : `negative`"
-                        size="sm"
-                    />
-                </QTd>
-            </template>
-            <template #body-cell-isActive="{ row }">
-                <QTd>
-                    <QIcon
-                        :name="row.isActive ? `check` : `close`"
-                        :color="row.isActive ? `positive` : `negative`"
-                        size="sm"
-                    />
-                </QTd>
-            </template>
-        </QTable>
-        <QPageSticky v-if="rowsSelected.length > 0" :offset="[20, 20]">
-            <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
-            <QTooltip>
-                {{ t('Edit buy(s)') }}
-            </QTooltip>
-        </QPageSticky>
-        <QDialog ref="editTableCellDialogRef">
-            <EditTableCellValueForm
-                edit-url="Buys/editLatestBuys"
-                :rows="rowsSelected"
-                :fields-options="editTableCellFormFieldsOptions"
-                @on-data-saved="onEditCellDataSaved()"
-            />
-        </QDialog>
-    </QPage>
 </template>
 
 <i18n>

src/pages/Entry/EntryList.vue

@@ -1,31 +1,174 @@
 <script setup>
-import { onMounted } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import EntrySummary from './Card/EntrySummary.vue';
 import EntryFilter from './EntryFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
-import { toDate } from 'src/filters/index';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import VnTable from 'components/VnTable/VnTable.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import { toDate } from 'src/filters';
 
 const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
+const tableRef = ref();
 
-function navigate(id) {
-    router.push({ path: `/entry/${id}` });
-}
-
-const redirectToCreateView = () => {
-    router.push({ name: 'EntryCreate' });
+const entryFilter = {
+    include: [
+        {
+            relation: 'suppliers',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+        {
+            relation: 'travels',
+            scope: {
+                fields: ['id', 'ref'],
+            },
+        },
+        {
+            relation: 'companies',
+            scope: {
+                fields: ['id', 'code'],
+            },
+        },
+    ],
 };
 
+const columns = computed(() => [
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.id'),
+        name: 'id',
+        isTitle: true,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.reference'),
+        name: 'reference',
+        isTitle: true,
+        component: 'input',
+        columnField: {
+            component: null,
+        },
+        create: true,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.created'),
+        name: 'created',
+        create: true,
+        cardVisible: true,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.created)),
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.supplierFk'),
+        name: 'supplierFk',
+        create: true,
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'suppliers',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.supplierName),
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.isBooked'),
+        name: 'isBooked',
+        cardVisible: true,
+        create: true,
+        component: 'checkbox',
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.isConfirmed'),
+        name: 'isConfirmed',
+        cardVisible: true,
+        create: true,
+        component: 'checkbox',
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.isOrdered'),
+        name: 'isOrdered',
+        cardVisible: true,
+        create: true,
+        component: 'checkbox',
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.companyFk'),
+        name: 'companyFk',
+        component: 'select',
+        attrs: {
+            url: 'companies',
+            fields: ['id', 'code'],
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+        create: true,
+
+        format: (row, dashIfEmpty) => dashIfEmpty(row.companyCode),
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.travelFk'),
+        name: 'travelFk',
+        component: 'select',
+        attrs: {
+            url: 'travels',
+            fields: ['id', 'ref'],
+            optionLabel: 'ref',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+        create: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'),
+        name: 'isExcludedFromAvailable',
+        chip: {
+            color: null,
+            condition: (value) => value,
+            icon: 'vn:inventory',
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        label: t('entry.list.tableVisibleColumns.isRaid'),
+        name: 'isRaid',
+        chip: {
+            color: null,
+            condition: (value) => value,
+            icon: 'vn:net',
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+]);
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
@@ -42,83 +185,23 @@ onMounted(async () => {
             <EntryFilter data-key="EntryList" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
+    <VnTable
+        ref="tableRef"
         data-key="EntryList"
         url="Entries/filter"
-                :order="['landed DESC', 'id DESC']"
+        :filter="entryFilter"
+        :create="{
+            urlCreate: 'Entries',
+            title: 'Create entry',
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
+        }"
+        order="id DESC"
+        :columns="columns"
+        redirect="entry"
         auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="row.reference"
-                        @click="navigate(row.id)"
-                        :id="row.id"
-                        :has-info-icons="!!row.isExcludedFromAvailable || !!row.isRaid"
-                    >
-                        <template #info-icons>
-                            <QIcon
-                                v-if="row.isExcludedFromAvailable"
-                                name="vn:inventory"
-                                color="primary"
-                                size="xs"
-                            >
-                                <QTooltip>{{ t('Inventory entry') }}</QTooltip>
-                            </QIcon>
-                            <QIcon
-                                v-if="row.isRaid"
-                                name="vn:net"
-                                color="primary"
-                                size="xs"
-                            >
-                                <QTooltip>{{ t('Virtual entry') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                        <template #list-items>
-                            <VnLv :label="t('landed')" :value="toDate(row.landed)" />
-                            <VnLv
-                                :label="t('entry.list.booked')"
-                                :value="!!row.isBooked"
+        :right-search="false"
     />
-                            <VnLv
-                                :label="t('entry.list.invoiceNumber')"
-                                :value="row.invoiceNumber"
-                            />
-                            <VnLv
-                                :label="t('entry.list.confirmed')"
-                                :value="!!row.isConfirmed"
-                            />
-                            <VnLv
-                                :label="t('entry.list.supplier')"
-                                :value="row.supplierName"
-                            />
-                            <VnLv
-                                :label="t('entry.list.ordered')"
-                                :value="!!row.isOrdered"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, EntrySummary)"
-                                color="primary"
-                                type="submit"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-    <QPageSticky :offset="[20, 20]">
-        <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
-        <QTooltip>
-            {{ t('entry.list.newEntry') }}
-        </QTooltip>
-    </QPageSticky>
 </template>
 
 <i18n>

src/pages/Entry/MyEntries.vue

@@ -0,0 +1,123 @@
+<script setup>
+import { computed, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters/index';
+import { useQuasar } from 'quasar';
+import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+const quasar = useQuasar();
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+        isTitle: false,
+    },
+    {
+        align: 'left',
+        label: t('shipped'),
+        name: 'shipped',
+        isTitle: false,
+        create: true,
+        cardVisible: true,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: ({ shipped }) => toDate(shipped),
+    },
+    {
+        align: 'left',
+        label: t('landed'),
+        name: 'landed',
+        isTitle: false,
+        create: true,
+        cardVisible: false,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: ({ landed }) => toDate(landed),
+    },
+    {
+        align: 'left',
+        label: t('globals.wareHouseIn'),
+        name: 'warehouseInName',
+        isTitle: false,
+        cardVisible: true,
+        create: false,
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        computed,
+        actions: [
+            {
+                title: t('printBuys'),
+                icon: 'print',
+                action: (row) => printBuys(row.id),
+            },
+        ],
+    },
+]);
+
+const printBuys = (rowId) => {
+    quasar.dialog({
+        component: EntryBuysTableDialog,
+        componentProps: {
+            id: rowId,
+        },
+    });
+};
+</script>
+<template>
+    <VnSearchbar
+        data-key="EntryList"
+        url="Entries/filter"
+        :label="t('Search entries')"
+        :info="t('You can search by entry reference')"
+    />
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnTable
+                ref="myEntriesRef"
+                data-key="myEntriesList"
+                url="Entries/filter"
+                :columns="columns"
+                default-mode="card"
+                auto-load
+                :right-search="true"
+            >
+                <template #moreFilterPanel="{ params }">
+                    <VnInput
+                        :label="t('globals.daysOnward')"
+                        v-model="params.days"
+                        class="q-px-xs row"
+                        dense
+                        filled
+                        outlined
+                    ></VnInput>
+                </template>
+            </VnTable>
+        </div>
+    </QPage>
+</template>
+
+<i18n>
+    You can search by entry reference: Puedes buscar por referencia de la entrada
+</i18n>

src/pages/Entry/locale/en.yml

@@ -8,3 +8,4 @@ entryFilter:
         reference: Reference
 landed: Landed
 shipped: Shipped
+printBuys: Print buys

src/pages/Entry/locale/es.yml

@@ -1,5 +1,6 @@
 Search entries: Buscar entradas
 You can search by entry reference: Puedes buscar por referencia de la entrada
+
 entryList:
     list:
         inventoryEntry: Es inventario
@@ -11,3 +12,4 @@ entryFilter:
 
 landed: F. llegada
 shipped: F. salida
+Print buys: Imprimir etiquetas

src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue

@@ -1,5 +1,6 @@
 <script setup>
-import InvoiceInDescriptor from "pages/InvoiceIn/Card/InvoiceInDescriptor.vue";
+import InvoiceInDescriptor from 'pages/InvoiceIn/Card/InvoiceInDescriptor.vue';
+import InvoiceInSummary from './InvoiceInSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,10 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <InvoiceInDescriptor v-if="$props.id" :id="$props.id" />
+        <InvoiceInDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="InvoiceInSummary"
+        />
     </QPopupProxy>
 </template>

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -209,7 +209,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv
@@ -240,7 +240,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv
@@ -265,7 +265,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv
@@ -289,7 +289,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <QCardSection class="q-pa-none">

src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue

@@ -63,8 +63,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         @on-fetch="setData"
         data-key="invoiceOutData"
     >
-        <template #menu="{ entity }">
-            <InvoiceOutDescriptorMenu :invoice-out-data="entity" />
+        <template #menu="{ entity, menuRef }">
+            <InvoiceOutDescriptorMenu :invoice-out-data="entity" :menu-ref="menuRef" />
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoiceOut.card.issued')" :value="toDate(entity.issued)" />
@@ -84,7 +84,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
             />
         </template>
         <template #actions="{ entity }">
-            <QCardActions>
+            <QCardActions class="flex justify-center">
                 <QBtn
                     v-if="entity.client"
                     size="md"

src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
@@ -11,13 +11,20 @@ import useNotify from 'src/composables/useNotify';
 import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
 import { useVnConfirm } from 'composables/useVnConfirm';
+import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 
+onBeforeMount(async () => (salixUrl.value = await getUrl('')));
+
 const $props = defineProps({
     invoiceOutData: {
         type: Object,
         default: () => {},
     },
+    menuRef: {
+        type: Object,
+        default: () => {},
+    },
 });
 
 const { notify } = useNotify();
@@ -28,8 +35,7 @@ const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const { openConfirmationModal } = useVnConfirm();
 const quasar = useQuasar();
-
-const transferInvoiceDialogRef = ref();
+const salixUrl = ref();
 const invoiceFormType = ref('pdf');
 const defaultEmailAddress = ref($props.invoiceOutData.client?.email);
 
@@ -115,6 +121,7 @@ const refundInvoice = async (withWarehouse) => {
     try {
         const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse };
         const { data } = await axios.post('InvoiceOuts/refund', params);
+        location.href = window.origin + `/#/ticket/${data[0].id}/sale`;
         notify(
             t('refundInvoiceSuccessMessage', {
                 refundTicket: data[0].id,
@@ -125,11 +132,22 @@ const refundInvoice = async (withWarehouse) => {
         console.error('Error generating invoice out pdf', err);
     }
 };
+
+const showTransferInvoiceForm = async () => {
+    quasar.dialog({
+        component: TransferInvoiceForm,
+        componentProps: {
+            invoiceOutData: $props.invoiceOutData,
+        },
+    });
+};
 </script>
 
 <template>
-    <QItem v-ripple clickable @click="transferInvoiceDialogRef.show()">
-        <QItemSection>{{ t('Transfer invoice to...') }}</QItemSection>
+    <QItem v-ripple clickable>
+        <QItemSection @click="showTransferInvoiceForm()">{{
+            t('Transfer invoice to...')
+        }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
         <QItemSection>{{ t('Show invoice...') }}</QItemSection>
@@ -222,10 +240,6 @@ const refundInvoice = async (withWarehouse) => {
             {{ t('Create a single ticket with all the content of the current invoice') }}
         </QTooltip>
     </QItem>
-
-    <QDialog ref="transferInvoiceDialogRef">
-        <TransferInvoiceForm :invoice-out-data="invoiceOutData" />
-    </QDialog>
 </template>
 
 <i18n>

src/pages/InvoiceOut/Card/InvoiceOutSummary.vue

@@ -3,7 +3,7 @@ import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import { toCurrency, toDate } from 'src/filters';
+import { toCurrency, toDate, toPercentage } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { getUrl } from 'src/composables/getUrl';
@@ -57,12 +57,14 @@ const taxColumns = ref([
         name: 'quantity',
         label: 'invoiceOut.summary.rate',
         field: (row) => row.rate,
+        format: (value) => toPercentage(value / 100),
         sortable: true,
     },
     {
         name: 'invoiceOuted',
         label: 'invoiceOut.summary.fee',
         field: (row) => row.vat,
+        format: (value) => toCurrency(value),
         sortable: true,
     },
 ]);
@@ -113,7 +115,7 @@ const ticketsColumns = ref([
         </template>
         <template #body="{ entity: { invoiceOut } }">
             <QCard class="vn-one">
-                <VnTitle :text="t('invoiceOut.pageTitles.basicData')" />
+                <VnTitle :text="t('globals.pageTitles.basicData')" />
                 <VnLv
                     :label="t('invoiceOut.summary.issued')"
                     :value="toDate(invoiceOut.issued)"
@@ -164,7 +166,7 @@ const ticketsColumns = ref([
                     </template>
                     <template #body-cell-item="{ value }">
                         <QTd>
-                            <QBtn flat color="primary">
+                            <QBtn flat class="link">
                                 {{ value }}
                                 <TicketDescriptorProxy :id="value" />
                             </QBtn>
@@ -172,7 +174,7 @@ const ticketsColumns = ref([
                     </template>
                     <template #body-cell-quantity="{ value, row }">
                         <QTd>
-                            <QBtn class="no-uppercase" flat color="primary" dense>
+                            <QBtn class="no-uppercase link" flat dense>
                                 {{ value }}
                                 <CustomerDescriptorProxy :id="row.id" />
                             </QBtn>

src/pages/InvoiceOut/InvoiceOutFilter.vue

@@ -41,7 +41,7 @@ function setWorkers(data) {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -93,7 +93,6 @@ function setWorkers(data) {
                 <QItemSection>
                     <QCheckbox
                         :label="t('Has PDF')"
-                        @update:model-value="searchFn()"
                         toggle-indeterminate
                         v-model="params.hasPdf"
                     />

src/pages/InvoiceOut/InvoiceOutGlobal.vue

@@ -30,7 +30,7 @@ const selectedCustomerId = ref(null);
 const tableColumnComponents = {
     clientId: {
         component: QBtn,
-        props: { flat: true, color: 'blue' },
+        props: { flat: true, class: 'link' },
         event: (prop) => selectCustomerId(prop.value),
     },
     clientName: {
@@ -52,7 +52,12 @@ const tableColumnComponents = {
 };
 
 const columns = computed(() => [
-    { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
+    {
+        align: 'left',
+        name: 'clientId',
+        label: 'Id',
+        field: 'clientId',
+    },
     {
         label: t('invoiceOut.globalInvoices.table.client'),
         field: 'clientName',

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -48,7 +48,7 @@ const getStatus = computed({
 
 onMounted(async () => {
     await invoiceOutGlobalStore.init();
-    formData.value = { ...formInitialData.value };
+    formData.value = formInitialData.value.invoiceDate;
 });
 </script>
 

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -1,96 +1,177 @@
 <script setup>
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onMounted, onUnmounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
-import CreateManualInvoiceForm from 'src/components/CreateManualInvoiceForm.vue';
-
-import InvoiceOutFilter from './InvoiceOutFilter.vue';
-import { toDate, toCurrency } from 'src/filters/index';
-import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useSession } from 'src/composables/useSession';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import { usePrintService } from 'composables/usePrintService';
+import VnTable from 'components/VnTable/VnTable.vue';
+import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
+import { toCurrency, toDate } from 'src/filters/index';
+import { useStateStore } from 'stores/useStateStore';
+import { QBtn } from 'quasar';
+import { watchEffect } from 'vue';
 
 const { t } = useI18n();
-const router = useRouter();
 const stateStore = useStateStore();
-const session = useSession();
-const tokenMultimedia = session.getTokenMultimedia();
 const { viewSummary } = useSummaryDialog();
+const tableRef = ref();
+const invoiceOutSerialsOptions = ref([]);
+const ticketsOptions = ref([]);
+const customerOptions = ref([]);
+const selectedRows = ref([]);
+const hasSelectedCards = computed(() => selectedRows.value.length > 0);
+const MODEL = 'InvoiceOuts';
+const { openReport } = usePrintService();
 
-const manualInvoiceDialogRef = ref(null);
-const selectedCards = ref(new Map());
-
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('invoiceOutList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        name: 'ref',
+        label: t('invoiceOutList.tableVisibleColumns.ref'),
+        isTitle: true,
+        component: 'select',
+        attrs: {
+            url: MODEL,
+            optionLabel: 'ref',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'Issued',
+        label: t('invoiceOutList.tableVisibleColumns.issued'),
+        component: 'date',
+        format: (row) => toDate(row.issued),
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'clientSocialName',
+        label: t('invoiceOutModule.customer'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'companyCode',
+        label: t('invoiceOutModule.company'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Companies',
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'amount',
+        label: t('invoiceOutModule.amount'),
+        cardVisible: true,
+        format: (row) => toCurrency(row.amount),
+    },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('invoiceOutList.tableVisibleColumns.created'),
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row) => toDate(row.created),
+    },
+    {
+        align: 'left',
+        name: 'dued',
+        label: t('invoiceOutList.tableVisibleColumns.dueDate'),
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row) => toDate(row.dued),
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('InvoiceOutSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, InvoiceOutSummary),
+            },
+            {
+                title: t('DownloadPdf'),
+                icon: 'vn:ticket',
+                isPrimary: true,
+                action: (row) => openPdf(row.id),
+            },
+        ],
+    },
+]);
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
-function navigate(id) {
-    router.push({ path: `/invoice-out/${id}` });
-}
-
-const toggleIndividualCard = (cardData) => {
-    if (selectedCards.value.has(cardData.id)) {
-        selectedCards.value.delete(cardData.id);
-        return;
-    }
-    selectedCards.value.set(cardData.id, cardData);
-};
-
-const toggleAllCards = (cardsData) => {
-    const allSelected = selectedCards.value.size === cardsData.length;
-
-    if (!allSelected) {
-        // Si no todas las tarjetas están seleccionadas, selecciónalas todas
-        cardsData.forEach((data) => {
-            if (!selectedCards.value.has(data.id)) {
-                selectedCards.value.set(data.id, data);
-            }
-        });
-    } else {
-        // Si todas las tarjetas están seleccionadas, deselecciónalas todas
-        selectedCards.value.clear();
-    }
-};
-
-const openPdf = () => {
+function openPdf(id) {
     try {
-        if (selectedCards.value.size === 0) return;
-        const selectedCardsArray = Array.from(selectedCards.value.values());
+        openReport(`${MODEL}/${id}/download`);
+    } catch (err) {
+        console.error('Error opening PDF', err);
+    }
+}
 
-        if (selectedCards.value.size === 1) {
+function downloadPdf() {
+    try {
+        if (selectedRows.value.size === 0) return;
+        const selectedCardsArray = Array.from(selectedRows.value.values());
+
+        if (selectedRows.value.size === 1) {
             const [invoiceOut] = selectedCardsArray;
-            const url = `api/InvoiceOuts/${invoiceOut.id}/download?access_token=${tokenMultimedia}`;
-            window.open(url, '_blank');
+            openPdf(invoiceOut.id);
         } else {
             const invoiceOutIdsArray = selectedCardsArray.map(
                 (invoiceOut) => invoiceOut.id
             );
             const invoiceOutIds = invoiceOutIdsArray.join(',');
 
-            const params = new URLSearchParams({
-                access_token: tokenMultimedia,
+            const params = {
                 ids: invoiceOutIds,
-            });
+            };
 
-            const url = `api/InvoiceOuts/downloadZip?${params}`;
-            window.open(url, '_blank');
+            openReport(`${MODEL}/downloadZip`, params);
         }
     } catch (err) {
         console.error('Error opening PDF');
     }
-};
+}
 
-const openCreateInvoiceModal = () => {
-    manualInvoiceDialogRef.value.show();
-};
+watchEffect(selectedRows);
 </script>
 
 <template>
@@ -99,115 +180,83 @@ const openCreateInvoiceModal = () => {
         :label="t('searchInvoice')"
         data-key="InvoiceOutList"
     />
-    <RightMenu>
-        <template #right-panel>
-            <InvoiceOutFilter data-key="InvoiceOutList" />
-        </template>
-    </RightMenu>
-    <QPage>
-        <VnPaginate
-            auto-load
-            data-key="InvoiceOutList"
-            :order="['issued DESC', 'id DESC']"
-            url="InvoiceOuts/filter"
-        >
-            <template #body="{ rows }">
-                <VnSubToolbar class="justify-end">
+    <VnSubToolbar>
         <template #st-actions>
             <QBtn
-                            @click="openPdf()"
-                            class="q-mr-md"
                 color="primary"
-                            icon="cloud_download"
-                            :disable="selectedCards.size === 0"
+                icon-right="cloud_download"
+                @click="downloadPdf()"
+                :disable="!hasSelectedCards"
             >
                 <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
             </QBtn>
-                        <QCheckbox
-                            left-label
-                            :label="t('globals.markAll')"
-                            @click="toggleAllCards(rows)"
-                            :model-value="selectedCards.size === rows.length"
-                            class="q-mr-md"
-                        />
         </template>
     </VnSubToolbar>
-                <div class="flex flex-center q-pa-md">
-                    <div class="vn-card-list">
-                        <CardList
-                            :element="row"
-                            :id="row.id"
-                            :show-checkbox="true"
-                            :is-selected="selectedCards.has(row.id)"
-                            :key="row.id"
-                            :title="row.ref"
-                            @click="navigate(row.id)"
-                            @toggle-card-check="toggleIndividualCard(row)"
-                            v-for="row of rows"
+    <VnTable
+        ref="tableRef"
+        data-key="invoiceOut"
+        :url="`${MODEL}/filter`"
+        :create="{
+            urlCreate: 'InvoiceOuts/createManualInvoice',
+            title: t('Create Manual Invoice'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {
+                active: true,
+            },
+        }"
+        v-model:selected="selectedRows"
+        order="id DESC"
+        :columns="columns"
+        redirect="invoice-out"
+        auto-load
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
     >
-                            <template #list-items>
-                                <VnLv
-                                    :label="t('invoiceOut.list.issued')"
-                                    :value="toDate(row.issued)"
+        <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Tickets"
+                v-model="data.ticketFk"
+                :label="t('invoiceOutList.tableVisibleColumns.ticket')"
+                :options="ticketsOptions"
+                option-label="nickname"
+                option-value="id"
             />
-                                <VnLv
-                                    :label="t('invoiceOut.list.amount')"
-                                    :value="toCurrency(row.amount)"
+            <VnSelect
+                url="Clients"
+                v-model="data.clientFk"
+                :label="t('invoiceOutModule.customer')"
+                :options="customerOptions"
+                option-label="name"
+                option-value="id"
             />
-                                <VnLv :label="t('invoiceOut.list.client')">
-                                    <template #value>
-                                        <span class="link" @click.stop>
-                                            {{ row?.clientSocialName }}
-                                            <CustomerDescriptorProxy
-                                                :id="row?.clientFk"
+            <VnInputDate
+                :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
+                v-model="data.maxShipped"
             />
-                                        </span>
-                                    </template>
-                                </VnLv>
-                                <VnLv
-                                    :label="t('invoiceOut.list.shortCreated')"
-                                    :title-label="t('invoiceOut.list.created')"
-                                    :value="toDate(row.created)"
+            <VnSelect
+                url="InvoiceOutSerials"
+                v-model="data.invoiceOutSerial"
+                :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
+                :options="invoiceOutSerialsOptions"
+                option-label="description"
+                option-value="code"
             />
-                                <VnLv
-                                    :label="t('invoiceOut.list.company')"
-                                    :value="row.companyCode"
+            <VnSelect
+                url="TaxAreas"
+                v-model="data.area"
+                :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
+                :options="taxAreasOptions"
+                option-label="code"
+                option-value="code"
             />
-                                <VnLv
-                                    :label="t('invoiceOut.list.shortDued')"
-                                    :title-label="t('invoiceOut.list.dued')"
-                                    :value="toDate(row.dued)"
+            <QInput
+                v-model="data.reference"
+                :label="t('invoiceOutList.tableVisibleColumns.ref')"
             />
         </template>
-                            <template #actions>
-                                <QBtn
-                                    :label="t('components.smartCard.openSummary')"
-                                    @click.stop="viewSummary(row.id, InvoiceOutSummary)"
-                                    color="primary"
-                                    style="margin-top: 15px"
-                                    type="submit"
-                                />
-                            </template>
-                        </CardList>
-                    </div>
-                </div>
-            </template>
-        </VnPaginate>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="openCreateInvoiceModal()" />
-            <QTooltip>
-                {{ t('createInvoice') }}
-            </QTooltip>
-        </QPageSticky>
-
-        <QDialog
-            ref="manualInvoiceDialogRef"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <CreateManualInvoiceForm />
-        </QDialog>
-    </QPage>
+    </VnTable>
 </template>
 
 <i18n>

src/pages/InvoiceOut/InvoiceOutNegativeBases.vue

@@ -1,29 +1,158 @@
 <script setup>
-import { computed, onBeforeMount } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import InvoiceOutNegativeFilter from './InvoiceOutNegativeBasesFilter.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { toCurrency } from 'src/filters';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
-import { useStateStore } from 'stores/useStateStore';
-import { useArrayData } from 'composables/useArrayData';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
-const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
-const stateStore = useStateStore();
 const { t } = useI18n();
-
-const arrayData = useArrayData('InvoiceOutNegative', {
-    url: 'InvoiceOuts/negativeBases',
-    limit: 0,
-    userParams: {
+const tableRef = ref();
+const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
+const userParams = {
     from: Date.vnFirstDayOfMonth().toISOString(),
     to: Date.vnLastDayOfMonth().toISOString(),
+};
+useArrayData('InvoiceOutNegative', { userParams });
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'company',
+        label: t('invoiceOutModule.company'),
+        component: 'select',
+        cardVisible: true,
+        attrs: {
+            url: 'Companies',
+            optionLabel: 'code',
+            optionValue: 'id',
         },
-    exprBuilder: (param, value) => {
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'country',
+        label: t('negativeBases.country'),
+        component: 'select',
+        attrs: {
+            url: 'Countries',
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'clientId',
+        label: t('negativeBases.clientId'),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'clientSocialName',
+        label: t('invoiceOutModule.customer'),
+        component: 'select',
+        isTitle: true,
+        cardVisible: true,
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'amount',
+        label: t('invoiceOutModule.amount'),
+        format: (row) => toCurrency(row.amount),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'taxableBase',
+        label: t('negativeBases.base'),
+    },
+    {
+        align: 'left',
+        name: 'ticketFk',
+        label: t('negativeBases.ticketId'),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'isActive',
+        label: t('negativeBases.active'),
+    },
+    {
+        align: 'left',
+        name: 'hasToInvoice',
+        label: t('negativeBases.hasToInvoice'),
+    },
+    {
+        align: 'left',
+        name: 'hasVerifiedData',
+        label: t('negativeBases.verifiedData'),
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'workerName',
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'salesPerson' },
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.workerName),
+    },
+]);
+
+const downloadCSV = async () => {
+    const filterParams = {
+        limit: 20,
+        where: {
+            and: [],
+        },
+    };
+
+    for (const [key, value] of Object.entries(userParams)) {
+        if (value) {
+            filterParams.where.and.push({ [key]: value });
+        }
+    }
+
+    await invoiceOutGlobalStore.getNegativeBasesCsv(
+        userParams.from,
+        userParams.to,
+        filterParams
+    );
+};
+</script>
+<template>
+    <VnSubToolbar>
+        <template #st-actions>
+            <QBtn color="primary" icon-right="download" @click="downloadCSV()">
+                <QTooltip>{{ t('Download as CSV') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnSubToolbar>
+    <VnTable
+        ref="tableRef"
+        data-key="negativeFilter"
+        url="InvoiceOuts/negativeBases"
+        :user-params="userParams"
+        :expr-builder="
+            (param, value) => {
                 switch (param) {
                     case 'from':
                     case 'to':
@@ -31,171 +160,16 @@ const arrayData = useArrayData('InvoiceOutNegative', {
                     default:
                         return { [param]: value };
                 }
-    },
-});
-
-onBeforeMount(async () => {
-    await arrayData.fetch({ append: false });
-    stateStore.rightDrawer = true;
-});
-
-const columns = computed(() => [
-    {
-        label: t('invoiceOut.negativeBases.company'),
-        field: 'company',
-        name: 'company',
-        align: 'left',
-    },
-    {
-        label: t('invoiceOut.negativeBases.country'),
-        field: 'country',
-        name: 'country',
-        align: 'left',
-    },
-    {
-        label: t('invoiceOut.negativeBases.clientId'),
-        field: 'clientId',
-        name: 'clientId',
-        align: 'left',
-    },
-    {
-        label: t('invoiceOut.negativeBases.client'),
-        field: 'clientSocialName',
-        name: 'client',
-        align: 'left',
-    },
-    {
-        label: t('invoiceOut.negativeBases.amount'),
-        field: 'amount',
-        name: 'amount',
-        align: 'left',
-        format: (value) => toCurrency(value),
-    },
-    {
-        label: t('invoiceOut.negativeBases.base'),
-        field: 'taxableBase',
-        name: 'base',
-        align: 'left',
-    },
-    {
-        label: t('invoiceOut.negativeBases.ticketId'),
-        field: 'ticketFk',
-        name: 'ticketId',
-        align: 'left',
-    },
-    {
-        label: t('invoiceOut.negativeBases.active'),
-        field: 'isActive',
-        name: 'active',
-        align: 'left',
-    },
-    {
-        label: t('invoiceOut.negativeBases.hasToInvoice'),
-        field: 'hasToInvoice',
-        name: 'hasToInvoice',
-        align: 'left',
-    },
-    {
-        label: t('invoiceOut.negativeBases.verifiedData'),
-        field: 'isTaxDataChecked',
-        name: 'verifiedData',
-        align: 'left',
-    },
-    {
-        label: t('invoiceOut.negativeBases.comercial'),
-        field: 'workerName',
-        name: 'worker',
-        align: 'left',
-    },
-]);
-
-const downloadCSV = async () => {
-    const params = {}; // filter.value;
-    const filterParams = {
-        limit: 20,
-        where: {
-            and: [],
-        },
-    };
-    for (const param in params) {
-        if (params[param]) filterParams.where.and.push({ [param]: params[param] });
             }
-
-    await invoiceOutGlobalStore.getNegativeBasesCsv(
-        arrayData.value.store.userParams.from,
-        arrayData.value.store.userParams.to,
-        params
-    );
-};
-</script>
-<template>
-    <VnSubToolbar>
-        <template #st-actions>
-            <QBtn color="primary" icon-right="download" no-caps @click="downloadCSV()">
-                <QTooltip>{{ t('Download as CSV') }}</QTooltip>
-            </QBtn>
-        </template>
-    </VnSubToolbar>
-    <RightMenu>
-        <template #right-panel>
-            <InvoiceOutNegativeFilter data-key="InvoiceOutNegative" />
-        </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <QTable
+        "
+        :limit="0"
         :columns="columns"
-            :rows="arrayData.store.data"
-            row-key="clientId"
-            class="full-width q-mt-md"
+        auto-load
+        :is-editable="false"
+        :use-model="true"
     >
-            <template #body-cell-clientId="{ row }">
-                <QTd>
-                    <QBtn flat dense color="blue"> {{ row.clientId }}</QBtn>
-                    <CustomerDescriptorProxy :id="row.clientId" />
-                </QTd>
+    </VnTable>
 </template>
-            <template #body-cell-ticketId="{ row }">
-                <QTd>
-                    <QBtn flat dense color="blue"> {{ row.ticketFk }}</QBtn>
-                    <TicketDescriptorProxy :id="row.ticketFk" />
-                </QTd>
-            </template>
-            <template #body-cell-worker="{ row }">
-                <QTd>
-                    <QBtn class="no-uppercase" flat dense color="blue">{{
-                        row.workerName
-                    }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.comercialId" />
-                </QTd>
-            </template>
-            <template #body-cell-active="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.isActive" disable />
-                </QTd>
-            </template>
-            <template #body-cell-hasToInvoice="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.hasToInvoice" disable />
-                </QTd>
-            </template>
-            <template #body-cell-verifiedData="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.isTaxDataChecked" disable />
-                </QTd>
-            </template>
-        </QTable>
-    </QPage>
-</template>
-
-<style lang="scss" scoped>
-.col-content {
-    border-radius: 4px;
-    padding: 6px;
-}
-.no-uppercase {
-    text-transform: none;
-}
-</style>
 
 <i18n>
 es:

src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue

@@ -20,6 +20,7 @@ const props = defineProps({
         :data-key="props.dataKey"
         :search-button="true"
         :unremovable-params="['from', 'to']"
+        :hidden-tags="['from', 'to']"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">

src/pages/InvoiceOut/locale/en.yml

@@ -0,0 +1,25 @@
+invoiceOutModule:
+    customer: Client
+    amount: Amount
+    company: Company
+invoiceOutList:
+    tableVisibleColumns:
+        id: ID
+        ref: Reference
+        issued: Issued
+        created: Created
+        dueDate: Max date
+        invoiceOutSerial: Serial
+        ticket: Ticket
+        taxArea: Tax area
+DownloadPdf: Download PDF
+InvoiceOutSummary: Summary
+negativeBases:
+        country: Country
+        clientId: Client ID
+        base: Base
+        ticketId: Ticket
+        active: Active
+        hasToInvoice: Has to invoice
+        verifiedData: Verified data
+        commercial: Commercial

src/pages/InvoiceOut/locale/es.yml

@@ -1,2 +1,31 @@
 Search invoice: Buscar factura emitida
 You can search by invoice reference: Puedes buscar por referencia de la factura
+invoiceOutModule:
+    customer: Cliente
+    amount: Importe
+    company: Empresa
+invoiceOutList:
+    tableVisibleColumns:
+        id: ID
+        ref: Referencia
+        issued: Fecha emisión
+        customer: Cliente
+        company: Empresa
+        amount: Importe
+        created: F. creación
+        dueDate: F. máxima
+        invoiceOutSerial: Serial
+        ticket: Ticket
+        taxArea: Area
+DownloadPdf: Descargar PDF
+InvoiceOutSummary: Resumen
+negativeBases:
+        country: País
+        clientId: ID del cliente
+        client: Cliente
+        base: Base
+        ticketId: Ticket
+        active: Activo
+        hasToInvoice: Debe facturar
+        verifiedData: Datos verificados
+        commercial: Comercial

src/pages/Item/Card/ItemDiary.vue

@@ -5,7 +5,9 @@ import { useRoute } from 'vue-router';
 
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import OrderDescriptorProxy from 'src/pages/Order/Card/OrderDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -45,8 +47,8 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        label: t('itemDiary.id'),
-        name: 'id',
+        label: t('itemDiary.origin'),
+        name: 'originId',
         align: 'left',
     },
     {
@@ -65,8 +67,8 @@ const columns = computed(() => [
     },
 
     {
-        label: t('itemDiary.client'),
-        name: 'client',
+        label: t('itemDiary.entity'),
+        name: 'entityId',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
@@ -111,10 +113,28 @@ const getBadgeAttrs = (_date) => {
     return attrs;
 };
 
-const getIdDescriptor = (row) => {
-    let descriptor = EntryDescriptorProxy;
-    if (row.isTicket) descriptor = TicketDescriptorProxy;
-    return descriptor;
+const originTypeMap = {
+    entry: {
+        descriptor: EntryDescriptorProxy,
+        icon: 'vn:entry',
+    },
+    ticket: {
+        descriptor: TicketDescriptorProxy,
+        icon: 'vn:ticket',
+    },
+    order: {
+        descriptor: OrderDescriptorProxy,
+        icon: 'vn:basket',
+    },
+};
+
+const entityTypeMap = {
+    client: {
+        descriptor: CustomerDescriptorProxy,
+    },
+    supplier: {
+        descriptor: SupplierDescriptorProxy,
+    },
 };
 
 onMounted(async () => {
@@ -206,21 +226,28 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QBadge>
                 </QTd>
             </template>
-            <template #body-cell-id="{ row }">
+            <template #body-cell-originId="{ row }">
                 <QTd @click.stop>
                     <component
-                        :is="getIdDescriptor(row)"
-                        :id="row.origin"
+                        :is="originTypeMap[row.originType]?.descriptor"
+                        :id="row.originId"
                         class="q-ma-none"
                         dense
                         style="font-size: 14px"
                     >
-                        {{ row.origin }}
+                        {{ row.originId }}
                     </component>
-                    <span class="link">{{ row.origin }}</span>
+                    <span class="link">
+                        <QIcon
+                            :name="originTypeMap[row.originType]?.icon"
+                            class="fill-icon q-mr-sm"
+                            size="xs"
+                        />
+                        {{ row.originId }}
+                    </span>
                 </QTd>
             </template>
-            <template #body-cell-client="{ row }">
+            <template #body-cell-entityId="{ row }">
                 <QTd @click.stop>
                     <QBadge
                         :color="row.highlighted ? 'warning' : 'transparent'"
@@ -228,11 +255,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         dense
                         style="font-size: 14px"
                     >
-                        <span v-if="row.isTicket" class="link">
-                            {{ dashIfEmpty(row.name) }}
-                            <CustomerDescriptorProxy :id="row.clientFk" />
+                        <component
+                            :is="entityTypeMap[row.entityType]?.descriptor"
+                            :id="row.entityId"
+                            class="q-ma-none"
+                            dense
+                            style="font-size: 14px"
+                        >
+                            {{ row.entityId }}
+                        </component>
+                        <span class="link">
+                            {{ dashIfEmpty(row.entityName) }}
                         </span>
-                        <span v-else>{{ dashIfEmpty(row.name) }}</span>
                     </QBadge>
                 </QTd>
             </template>