quasar.config.js

@@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar'],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar.defaults'],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
@@ -117,6 +117,7 @@ module.exports = configure(function (/* ctx */) {
                     secure: false,
                 },
             },
+            open: false,
         },
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework

src/boot/defaults/qTable.js

@@ -0,0 +1,5 @@
+import { QTable } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QTable, 'pagination', { rowsPerPage: 0 });
+setDefault(QTable, 'hidePagination', true);

src/boot/defaults/setDefault.js

@@ -0,0 +1,18 @@
+export default function (component, key, value) {
+    const prop = component.props[key];
+    switch (typeof prop) {
+        case 'object':
+            prop.default = value;
+            break;
+        case 'function':
+            component.props[key] = {
+                type: prop,
+                default: value,
+            };
+            break;
+        case 'undefined':
+            throw new Error('unknown prop: ' + key);
+        default:
+            throw new Error('unhandled type: ' + typeof prop);
+    }
+}

src/boot/quasar.defaults.js

@@ -0,0 +1 @@
+export * from './defaults/qTable';

src/components/FetchData.vue

@@ -60,3 +60,6 @@ async function fetch(fetchFilter = {}) {
     }
 }
 </script>
+<template>
+    <template></template>
+</template>

src/components/FilterItemForm.vue

@@ -202,7 +202,6 @@ const selectItem = ({ id }) => {
             <QTable
                 :columns="tableColumns"
                 :rows="tableRows"
-                :pagination="{ rowsPerPage: 0 }"
                 :loading="loading"
                 :hide-header="!tableRows || !tableRows.length > 0"
                 :no-data-label="t('Enter a new search')"

src/components/FilterTravelForm.vue

@@ -200,7 +200,6 @@ const selectTravel = ({ id }) => {
             <QTable
                 :columns="tableColumns"
                 :rows="tableRows"
-                :pagination="{ rowsPerPage: 0 }"
                 :loading="loading"
                 :hide-header="!tableRows || !tableRows.length > 0"
                 :no-data-label="t('Enter a new search')"

src/components/UserPanel.vue

@@ -7,12 +7,16 @@ import axios from 'axios';
 import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
 import { localeEquivalence } from 'src/i18n/index';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FetchData from 'components/FetchData.vue';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
 import { useClipboard } from 'src/composables/useClipboard';
+import { ref } from 'vue';
 const { copyText } = useClipboard();
 const userLocale = computed({
     get() {
@@ -45,6 +49,9 @@ const darkMode = computed({
 
 const user = state.getUser();
 const token = session.getTokenMultimedia();
+const warehousesData = ref();
+const companiesData = ref();
+const accountBankData = ref();
 
 onMounted(async () => {
     updatePreferences();
@@ -87,10 +94,28 @@ function copyUserToken() {
 </script>
 
 <template>
+    <FetchData
+        url="Warehouses"
+        order="name"
+        @on-fetch="(data) => (warehousesData = data)"
+        auto-load
+    />
+    <FetchData
+        url="Companies"
+        order="name"
+        @on-fetch="(data) => (companiesData = data)"
+        auto-load
+    />
+    <FetchData
+        url="Accountings"
+        order="name"
+        @on-fetch="(data) => (accountBankData = data)"
+        auto-load
+    />
     <QMenu anchor="bottom left" class="bg-vn-section-color">
         <div class="row no-wrap q-pa-md">
-            <div class="column panel">
+            <div class="col column">
-                <div class="text-h6 q-mb-md">
+                <div class="text-h6 q-ma-sm q-mb-none">
                     {{ t('components.userPanel.settings') }}
                 </div>
                 <QToggle
@@ -114,7 +139,7 @@ function copyUserToken() {
 
             <QSeparator vertical inset class="q-mx-lg" />
 
-            <div class="column items-center panel">
+            <div class="col column items-center q-mb-sm">
                 <QAvatar size="80px">
                     <QImg
                         :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
@@ -131,7 +156,6 @@ function copyUserToken() {
                 >
                     @{{ user.name }}
                 </div>
-
                 <QBtn
                     id="logout"
                     color="orange"
@@ -141,17 +165,63 @@ function copyUserToken() {
                     icon="logout"
                     @click="logout()"
                     v-close-popup
+                    dense
                 />
             </div>
         </div>
+        <QSeparator inset class="q-mx-lg" />
+        <div class="col q-gutter-xs q-pa-md">
+            <VnRow>
+                <VnSelectFilter
+                    :label="t('components.userPanel.localWarehouse')"
+                    v-model="user.localWarehouseFk"
+                    :options="warehousesData"
+                    option-label="name"
+                    option-value="id"
+                />
+                <VnSelectFilter
+                    :label="t('components.userPanel.localBank')"
+                    hide-selected
+                    v-model="user.localBankFk"
+                    :options="accountBankData"
+                    option-label="bank"
+                    option-value="id"
+                ></VnSelectFilter>
+            </VnRow>
+            <VnRow>
+                <VnSelectFilter
+                    :label="t('components.userPanel.localCompany')"
+                    hide-selected
+                    v-model="user.companyFk"
+                    :options="companiesData"
+                    option-label="code"
+                    option-value="id"
+                />
+                <VnSelectFilter
+                    :label="t('components.userPanel.userWarehouse')"
+                    hide-selected
+                    v-model="user.warehouseFk"
+                    :options="warehousesData"
+                    option-label="name"
+                    option-value="id"
+                />
+            </VnRow>
+            <VnRow>
+                <VnSelectFilter
+                    :label="t('components.userPanel.userCompany')"
+                    hide-selected
+                    v-model="user.companyFk"
+                    :options="companiesData"
+                    option-label="code"
+                    option-value="id"
+                    style="flex: 0"
+                />
+            </VnRow>
+        </div>
     </QMenu>
 </template>
 
 <style lang="scss" scoped>
-.panel {
-    width: 150px;
-}
-
 .copyText {
     &:hover {
         cursor: alias;

src/components/common/VnDmsList.vue

@@ -218,7 +218,6 @@ function parseDms(data) {
     />
     <QTable
         :columns="columns"
-        :pagination="{ rowsPerPage: 0 }"
         :rows="rows"
         class="full-width q-mt-md"
         hide-bottom

src/components/common/VnSelectFilter.vue

@@ -51,8 +51,8 @@ const $props = defineProps({
         default: null,
     },
     limit: {
-        type: Number,
+        type: [Number, String],
-        default: 30,
+        default: '30',
     },
 });
 
@@ -151,7 +151,7 @@ watch(modelValue, (newValue) => {
         @on-fetch="(data) => setOptions(data)"
         :where="where || { [optionValue]: value }"
         :limit="limit"
-        :order-by="orderBy"
+        :sort-by="sortBy"
         :fields="fields"
     />
     <QSelect

src/i18n/en/index.js

@@ -857,6 +857,7 @@ export default {
             workerCreate: 'New worker',
             department: 'Department',
             pda: 'PDA',
+            log: 'Log',
         },
         list: {
             name: 'Name',
@@ -1223,6 +1224,11 @@ export default {
             copyToken: 'Token copied to clipboard',
             settings: 'Settings',
             logOut: 'Log Out',
+            localWarehouse: 'Local warehouse',
+            localBank: 'Local bank',
+            localCompany: 'Local company',
+            userWarehouse: 'User warehouse',
+            userCompany: 'User company',
         },
         smartCard: {
             downloadFile: 'Download file',

src/i18n/es/index.js

@@ -856,6 +856,7 @@ export default {
             workerCreate: 'Nuevo trabajador',
             department: 'Departamentos',
             pda: 'PDA',
+            log: 'Historial',
         },
         list: {
             name: 'Nombre',
@@ -1222,6 +1223,11 @@ export default {
             copyToken: 'Token copiado al portapapeles',
             settings: 'Configuración',
             logOut: 'Cerrar sesión',
+            localWarehouse: 'Almacén local',
+            localBank: 'Banco local',
+            localCompany: 'Empresa local',
+            userWarehouse: 'Almacén del usuario',
+            userCompany: 'Empresa del usuario',
         },
         smartCard: {
             downloadFile: 'Descargar archivo',

src/pages/Claim/Card/ClaimAction.vue

@@ -291,8 +291,6 @@ async function importToNewRefundTicket() {
                 selection="multiple"
                 v-model:selected="selectedRows"
                 :grid="$q.screen.lt.md"
-                :pagination="{ rowsPerPage: 0 }"
-                :hide-bottom="true"
             >
                 <template #body-cell-ticket="{ value }">
                     <QTd align="center">

src/pages/Claim/Card/ClaimDevelopment.vue

@@ -150,10 +150,8 @@ const columns = computed(() => [
             <QTable
                 :columns="columns"
                 :rows="rows"
-                :pagination="{ rowsPerPage: 0 }"
                 row-key="$index"
                 selection="multiple"
-                hide-pagination
                 v-model:selected="selected"
                 :grid="$q.screen.lt.md"
                 table-header-class="text-left"

src/pages/Claim/Card/ClaimLines.vue

@@ -201,11 +201,9 @@ function showImportDialog() {
                         :columns="columns"
                         :rows="rows"
                         :dense="$q.screen.lt.md"
-                        :pagination="{ rowsPerPage: 0 }"
                         row-key="id"
                         selection="multiple"
                         v-model:selected="selected"
-                        hide-pagination
                         :grid="$q.screen.lt.md"
                     >
                         <template #body-cell-claimed="{ row, value }">

src/pages/Claim/Card/ClaimLinesImport.vue

@@ -121,7 +121,6 @@ function cancel() {
                 class="my-sticky-header-table"
                 :columns="columns"
                 :rows="claimableSales"
-                :pagination="{ rowsPerPage: 10 }"
                 row-key="saleFk"
                 selection="multiple"
                 v-model:selected="selected"

src/pages/Customer/Card/CustomerBalance.vue

@@ -198,7 +198,6 @@ const updateCompanyId = (id) => {
 
     <QTable
         :columns="columns"
-        :pagination="{ rowsPerPage: 12 }"
         :rows="rows"
         class="full-width q-mt-md"
         row-key="id"

src/pages/Customer/Card/CustomerCredits.vue

@@ -97,13 +97,7 @@ const toCustomerCreditCreate = () => {
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <QTable
+        <QTable :columns="columns" :rows="rows" class="full-width q-mt-md" row-key="id">
-            :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-        >
             <template #body-cell="props">
                 <QTd :props="props">
                     <QTr :props="props" class="cursor-pointer">

src/pages/Customer/Card/CustomerGreuges.vue

@@ -140,7 +140,6 @@ const toCustomerGreugeCreate = () => {
 
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
             :rows="rows"
             class="full-width q-mt-md"
             row-key="id"

src/pages/Customer/Card/CustomerRecoveries.vue

@@ -97,7 +97,6 @@ const toCustomerRecoverieCreate = () => {
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
             :rows="rows"
             class="full-width q-mt-md"
             row-key="id"

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -224,10 +224,8 @@ const refreshData = () => {
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 0 }"
             :rows="rows"
             class="full-width q-mt-md"
-            hide-bottom
             row-key="clientFk"
             selection="multiple"
             v-model:selected="selected"

src/pages/Customer/ExtendedList/CustomerExtendedList.vue

@@ -510,7 +510,6 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
             :rows="rows"
             class="full-width q-mt-md"
             row-key="id"

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -108,10 +108,8 @@ const selectCustomerId = (id) => {
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 0 }"
             :rows="rows"
             class="full-width q-mt-md"
-            hide-bottom
             row-key="id"
             selection="multiple"
             v-model:selected="selected"

src/pages/Customer/Payments/CustomerPayments.vue

@@ -151,10 +151,8 @@ function stateColor(row) {
                         :columns="columns"
                         :rows="rows"
                         row-key="id"
-                        :pagination="{ rowsPerPage: 0 }"
                         :grid="grid || $q.screen.lt.sm"
                         class="q-mt-xs custom-table"
-                        hide-pagination
                     >
                         <template #body-cell-actions="{ row }">
                             <QTd auto-width class="text-center">

src/pages/Entry/Card/EntryBuysImport.vue

@@ -238,12 +238,7 @@ const redirectToBuysView = () => {
                     </div>
                 </VnRow>
                 <VnRow>
-                    <QTable
+                    <QTable :columns="columns" :rows="importData.buys">
-                        :columns="columns"
-                        :rows="importData.buys"
-                        :pagination="{ rowsPerPage: 0 }"
-                        hide-pagination
-                    >
                         <template #body-cell-item="{ row, col }">
                             <QTd auto-width>
                                 <VnSelectDialog

src/pages/Entry/EntryLatestBuys.vue

@@ -659,7 +659,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             :columns="columns"
             selection="multiple"
             row-key="id"
-            :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
             :visible-columns="visibleColumns"
             v-model:selected="rowsSelected"

src/pages/InvoiceIn/Card/InvoiceInCorrective.vue

@@ -111,7 +111,6 @@ const onSave = (data) => data.deletes && router.push(`/invoice-in/${invoiceId}/s
                 :rows="rows"
                 row-key="$index"
                 selection="single"
-                hide-pagination
                 :grid="$q.screen.lt.sm"
                 :pagination="{ rowsPerPage: 0 }"
             >

src/pages/InvoiceIn/Card/InvoiceInDueDay.vue

@@ -99,7 +99,6 @@ async function insert() {
                 :columns="columns"
                 :rows="rows"
                 row-key="$index"
-                hide-pagination
                 :grid="$q.screen.lt.sm"
             >
                 <template #body-cell-duedate="{ row }">

src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue

@@ -134,7 +134,6 @@ function getTotal(type) {
                     :columns="columns"
                     :rows="rows"
                     row-key="$index"
-                    hide-pagination
                     :grid="$q.screen.lt.sm"
                 >
                     <template #body-cell="{ row, col }">

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -356,7 +356,6 @@ function getLink(param) {
                     :columns="dueDayColumns"
                     :rows="invoiceIn.invoiceInDueDay"
                     flat
-                    hide-pagination
                 >
                     <template #header="props">
                         <QTr :props="props" class="bg">
@@ -385,7 +384,6 @@ function getLink(param) {
                     :columns="intrastatColumns"
                     :rows="invoiceIn.invoiceInIntrastat"
                     flat
-                    hide-pagination
                 >
                     <template #header="props">
                         <QTr :props="props" class="bg">

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -184,10 +184,8 @@ async function addExpense() {
                 selection="multiple"
                 :columns="columns"
                 :rows="rows"
-                row-key="$index"
+                row-key="$index"                
-                hide-pagination
                 :grid="$q.screen.lt.sm"
-                :pagination="{ rowsPerPage: 0 }"
             >
                 <template #body-cell-expense="{ row, col }">
                     <QTd auto-width>

src/pages/InvoiceOut/InvoiceOutGlobal.vue

@@ -133,9 +133,7 @@ onUnmounted(() => {
             v-if="rows.length > 0"
             :rows="rows"
             :columns="columns"
-            hide-bottom
             row-key="id"
-            :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
         >
             <template #body-cell="props">

src/pages/InvoiceOut/InvoiceOutNegativeBases.vue

@@ -166,9 +166,7 @@ const downloadCSV = async () => {
         <QTable
             :columns="columns"
             :rows="rows"
-            hide-bottom
             row-key="clientId"
-            :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
         >
             <template #body-cell-clientId="{ row }">

src/pages/Order/Card/OrderSummary.vue

@@ -162,7 +162,6 @@ const detailsColumns = ref([
                         :columns="detailsColumns"
                         :rows="entity?.rows"
                         flat
-                        hide-pagination
                     >
                         <template #header="props">
                             <QTr :props="props">

src/pages/Route/Card/RouteSummary.vue

@@ -205,10 +205,8 @@ const ticketColumns = ref([
                     <QTable
                         :columns="ticketColumns"
                         :rows="entity?.tickets"
-                        :rows-per-page-options="[0]"
                         row-key="id"
                         flat
-                        hide-pagination
                     >
                         <template #body-cell-city="{ value, row }">
                             <QTd auto-width>

src/pages/Route/Cmr/CmrList.vue

@@ -123,8 +123,6 @@ function downloadPdfs() {
                         :columns="columns"
                         :rows="rows"
                         :dense="$q.screen.lt.md"
-                        :pagination="{ rowsPerPage: null }"
-                        hide-pagination
                         row-key="cmrFk"
                         selection="multiple"
                         v-model:selected="selected"

src/pages/Route/RouteAutonomous.vue

@@ -204,7 +204,7 @@ function navigateToRouteSummary(event, row) {
     <QPage class="column items-center">
         <div class="route-list">
             <div class="q-pa-md">
-                <QCard class="vn-one q-py-sm q-px-lg">
+                <QCard class="vn-one q-py-sm q-px-lg flex justify-between">
                     <VnLv class="flex">
                         <template #label>
                             <span class="text-h6">{{ t('Total') }}</span>
@@ -213,6 +213,16 @@ function navigateToRouteSummary(event, row) {
                             <span class="text-h6 q-ml-md">{{ toCurrency(total) }}</span>
                         </template>
                     </VnLv>
+                    <QBtn
+                        icon="vn:invoice-in-create"
+                        color="primary"
+                        :disable="!selectedRows?.length"
+                        @click="openDmsUploadDialog"
+                    >
+                        <QTooltip>
+                            {{ t('Create invoiceIn') }}
+                        </QTooltip>
+                    </QBtn>
                 </QCard>
             </div>
             <VnPaginate
@@ -289,18 +299,6 @@ function navigateToRouteSummary(event, row) {
                 </template>
             </VnPaginate>
         </div>
-        <QPageSticky :offset="[20, 20]" v-if="selectedRows?.length">
-            <QBtn
-                fab
-                icon="vn:invoice-in-create"
-                color="primary"
-                @click="openDmsUploadDialog"
-            >
-                <QTooltip>
-                    {{ t('Create invoiceIn') }}
-                </QTooltip>
-            </QBtn>
-        </QPageSticky>
     </QPage>
     <QDialog v-model="dmsDialog.show">
         <VnDms

src/pages/Supplier/Card/SupplierConsumption.vue

@@ -151,7 +151,6 @@ onMounted(async () => {
             :rows="rows"
             row-key="id"
             hide-header
-            :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
             :no-data-label="t('No results')"
         >

src/pages/Travel/Card/TravelSummary.vue

@@ -289,7 +289,6 @@ async function setTravelData(travelData) {
                 <QTable
                     :rows="entriesTableRows"
                     :columns="entriesTableColumns"
-                    hide-bottom
                     row-key="id"
                     class="full-width q-mt-md"
                 >
@@ -354,7 +353,6 @@ async function setTravelData(travelData) {
                 <QTable
                     :rows="thermographs"
                     :columns="thermographsTableColumns"
-                    hide-bottom
                     row-key="id"
                     class="full-width q-mt-md"
                 />

src/pages/Travel/Card/TravelThermographs.vue

@@ -145,7 +145,6 @@ const removeThermograph = async (id) => {
                 :rows="rows"
                 :columns="TableColumns"
                 :no-data-label="t('No results')"
-                :rows-per-page-options="[0]"
                 row-key="id"
                 class="full-width q-mt-md"
             >

src/pages/Travel/ExtraCommunity.vue

@@ -453,9 +453,7 @@ const handleDragScroll = (event) => {
         <QTable
             :rows="rows"
             :columns="columns"
-            hide-bottom
             row-key="clientId"
-            :pagination="{ rowsPerPage: 0 }"
             class="full-width"
             table-style="user-select: none;"
             @drag="handleDragScroll($event)"

src/pages/Travel/TravelFilter.vue

@@ -60,15 +60,6 @@ const decrement = (paramsObj, key) => {
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        v-model="params.search"
-                        :label="t('params.search')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelectFilter

src/pages/Travel/TravelList.vue

@@ -8,6 +8,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import TravelSummary from './Card/TravelSummary.vue';
 import TravelFilter from './TravelFilter.vue';
 import FetchData from 'components/FetchData.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
@@ -59,6 +60,15 @@ onMounted(async () => {
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="TravelList"
+                :limit="20"
+                :label="t('searchByIdOrReference')"
+            />
+        </Teleport>
+    </template>
     <FetchData
         url="Warehouses"
         :filter="{ fields: ['id', 'name'] }"
@@ -172,7 +182,9 @@ onMounted(async () => {
 <i18n>
 en:
     addEntry: Add entry
+    searchByIdOrReference: Search by ID or reference
 
 es:
     addEntry: Añadir entrada
+    searchByIdOrReference: Buscar por ID o por referencia
 </i18n>

src/pages/Worker/Card/WorkerLog.vue

@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Worker" url="/WorkerLogs" />
+</template>

src/router/modules/worker.js

@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'WorkerMain' },
     menus: {
         main: ['WorkerList', 'WorkerDepartment'],
-        card: ['WorkerNotificationsManager', 'WorkerPda'],
+        card: ['WorkerNotificationsManager', 'WorkerPda', 'WorkerLog'],
         departmentCard: ['BasicData'],
     },
     children: [
@@ -85,6 +85,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/Card/WorkerPda.vue'),
                 },
+                {
+                    name: 'WorkerLog',
+                    path: 'log',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:History',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
+                },
             ],
         },
     ],