From ccda0a53c06f93d2d47133e01cdef781ad40b645 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Tue, 25 Feb 2025 13:21:47 +0100
Subject: [PATCH 1/4] feat: refs #8664 add CmrFilter component and integrate it
 into CmrList for enhanced filtering options

---
 src/pages/Route/Cmr/CmrFilter.vue | 128 ++++++++++++++++++++++++++
 src/pages/Route/Cmr/CmrList.vue   | 144 +++++++++++++++++-------------
 2 files changed, 209 insertions(+), 63 deletions(-)
 create mode 100644 src/pages/Route/Cmr/CmrFilter.vue

diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
new file mode 100644
index 000000000..f81fcb5b3
--- /dev/null
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -0,0 +1,128 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
+import FetchData from 'src/components/FetchData.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const countriesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="Countries"
+        auto-load
+        @on-fetch="(data) => (countriesOptions = data)"
+    />
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`route.cmr.params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.cmrFk"
+                        type="number"
+                        :label="t('route.cmr.params.cmrFk')"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
+            <QCheckbox
+                :label="t('route.cmr.params.hasCmrDms')"
+                v-model="params.hasCmrDms"
+                @update:model-value="searchFn()"
+                toggle-indeterminate
+            />
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.ticketFk"
+                        type="number"
+                        :label="t('route.cmr.params.ticketFk')"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.routeFk"
+                        type="number"
+                        :label="t('route.cmr.params.routeFk')"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.clientFk"
+                        type="number"
+                        :label="t('route.cmr.params.clientFk')"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('route.cmr.params.countryFk')"
+                        v-model="params.countryFk"
+                        @update:model-value="searchFn()"
+                        :options="countriesOptions"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.shipped"
+                        :label="t('route.cmr.params.shipped')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('route.cmr.params.warehouseFk')"
+                        v-model="params.warehouseFk"
+                        @update:model-value="searchFn()"
+                        url="warehouses"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index b3eaf3b48..5f72b736d 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -1,29 +1,30 @@
 <script setup>
-import { onBeforeMount, onMounted, computed, ref } from 'vue';
+import { onMounted, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
 import { useSession } from 'src/composables/useSession';
 import { toDateHourMin } from 'filters/index';
 import { useStateStore } from 'src/stores/useStateStore';
 
-import axios from 'axios';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
+import CmrFilter from './CmrFilter.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 const state = useStateStore();
-const warehouses = ref([]);
 const selectedRows = ref([]);
+const dataKey = 'CmrList';
 const columns = computed(() => [
     {
         align: 'left',
         name: 'cmrFk',
-        label: t('route.cmr.list.cmrFk'),
+        label: t('route.cmr.params.cmrFk'),
         chip: {
             condition: () => true,
         },
@@ -32,62 +33,69 @@ const columns = computed(() => [
     {
         align: 'center',
         name: 'hasCmrDms',
-        label: t('route.cmr.list.hasCmrDms'),
+        label: t('route.cmr.params.hasCmrDms'),
         component: 'checkbox',
         cardVisible: true,
     },
     {
         align: 'left',
-        label: t('route.cmr.list.ticketFk'),
+        label: t('route.cmr.params.ticketFk'),
         name: 'ticketFk',
     },
     {
         align: 'left',
-        label: t('route.cmr.list.routeFk'),
+        label: t('route.cmr.params.routeFk'),
         name: 'routeFk',
     },
     {
         align: 'left',
-        label: t('route.cmr.list.clientFk'),
+        label: t('route.cmr.params.clientFk'),
         name: 'clientFk',
     },
     {
         align: 'right',
-        label: t('route.cmr.list.country'),
+        label: t('route.cmr.params.countryFk'),
         name: 'countryFk',
-        cardVisible: true,
+        component: 'select',
         attrs: {
             url: 'countries',
             fields: ['id', 'name'],
-            optionLabel: 'name',
-            optionValue: 'id',
         },
         columnFilter: {
-            inWhere: true,
-            component: 'select',
+            name: 'countryFk',
+            attrs: {
+                url: 'countries',
+                fields: ['id', 'name'],
+            },
         },
         format: ({ countryName }) => countryName,
     },
     {
         align: 'right',
-        label: t('route.cmr.list.shipped'),
+        label: t('route.cmr.params.shipped'),
         name: 'shipped',
         cardVisible: true,
+        component: 'date',
         columnFilter: {
-            component: 'date',
             inWhere: true,
         },
         format: ({ shipped }) => toDateHourMin(shipped),
     },
     {
         align: 'right',
+        label: t('route.cmr.params.warehouseFk'),
         name: 'warehouseFk',
-        label: t('globals.warehouse'),
-        columnFilter: {
-            component: 'select',
-        },
+        component: 'select',
         attrs: {
-            options: warehouses.value,
+            url: 'warehouses',
+            fields: ['id', 'name'],
+        },
+        columnFilter: {
+            name: 'warehouseFk',
+            attrs: {
+                url: 'warehouses',
+                fields: ['id', 'name'],
+            },
         },
         format: ({ warehouseName }) => warehouseName,
     },
@@ -96,7 +104,7 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('Ver cmr'),
+                title: t('route.cmr.params.viewCmr'),
                 icon: 'visibility',
                 isPrimary: true,
                 action: (row) => window.open(getCmrUrl(row?.cmrFk), '_blank'),
@@ -105,11 +113,6 @@ const columns = computed(() => [
     },
 ]);
 
-onBeforeMount(async () => {
-    const { data } = await axios.get('Warehouses');
-    warehouses.value = data;
-});
-
 onMounted(() => (state.rightDrawer = true));
 
 function getApiUrl() {
@@ -133,45 +136,60 @@ function downloadPdfs() {
 }
 </script>
 <template>
-    <VnSubToolbar>
-        <template #st-actions>
-            <QBtn
-                icon="cloud_download"
-                color="primary"
-                class="q-mr-sm"
-                :disable="!selectedRows?.length"
-                @click="downloadPdfs"
-            >
-                <QTooltip>{{ t('route.cmr.list.downloadCmrs') }}</QTooltip>
-            </QBtn>
-        </template>
-    </VnSubToolbar>
-    <VnTable
-        ref="tableRef"
-        data-key="CmrList"
-        url="Cmrs/filter"
+    <VnSection
+        :data-key
         :columns="columns"
-        :right-search="true"
-        default-mode="table"
-        v-model:selected="selectedRows"
-        table-height="85vh"
-        :table="{
-            'row-key': 'cmrFk',
-            selection: 'multiple',
+        prefix="route.cmr"
+        :right-filter="true"
+        :array-data-props="{
+            url: 'Cmrs/filter',
         }"
-        :disable-option="{ card: true }"
     >
-        <template #column-ticketFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.ticketFk }}
-                <TicketDescriptorProxy :id="row.ticketFk" />
-            </span>
+        <template #advanced-menu>
+            <CmrFilter :data-key />
         </template>
-        <template #column-clientFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.clientFk }}
-                <CustomerDescriptorProxy :id="row.clientFk" />
-            </span>
+        <template #body>
+            <VnSubToolbar>
+                <template #st-actions>
+                    <QBtn
+                        icon="cloud_download"
+                        color="primary"
+                        class="q-mr-sm"
+                        :disable="!selectedRows?.length"
+                        @click="downloadPdfs"
+                    >
+                        <QTooltip>{{ t('route.cmr.params.downloadCmrs') }}</QTooltip>
+                    </QBtn>
+                </template>
+            </VnSubToolbar>
+            <VnTable
+                ref="tableRef"
+                :data-key
+                url="Cmrs/filter"
+                :columns="columns"
+                :right-search="false"
+                default-mode="table"
+                v-model:selected="selectedRows"
+                table-height="85vh"
+                :table="{
+                    'row-key': 'cmrFk',
+                    selection: 'multiple',
+                }"
+                :disable-option="{ card: true }"
+            >
+                <template #column-ticketFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.ticketFk }}
+                        <TicketDescriptorProxy :id="row.ticketFk" />
+                    </span>
+                </template>
+                <template #column-clientFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.clientFk }}
+                        <CustomerDescriptorProxy :id="row.clientFk" />
+                    </span>
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>

From 5d809999cf307e670e12430cb2eccb7fc7ac4e4c Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Tue, 25 Feb 2025 13:22:34 +0100
Subject: [PATCH 2/4] refactor: refs #8664 localization files

---
 src/pages/Route/locale/en.yml | 17 ++++++++++++-----
 src/pages/Route/locale/es.yml | 12 ++++++++----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml
index cc445f412..ec7f5287a 100644
--- a/src/pages/Route/locale/en.yml
+++ b/src/pages/Route/locale/en.yml
@@ -3,16 +3,19 @@ route:
         search: Search roadmap
         searchInfo: You can search by roadmap reference
     params:
+        id: Id
+        name: Name
         etd: ETD
         tractorPlate: Plate
         price: Price
         observations: Observations
-        id: ID
-        name: Name
         cmrFk: CMR id
         hasCmrDms: Attached in gestdoc
         ticketFk: Ticketd id
         routeFk: Route id
+        clientFk: Client id
+        countryFk: Country
+        warehouseFk: Warehouse
         shipped: Shipped
         agencyAgreement: Agency agreement
         agencyModeName: Agency route
@@ -42,7 +45,9 @@ route:
     search: Search route
     searchInfo: You can search by route reference
     cmr:
-        list:
+        search: Search Cmr
+        searchInfo: You can search Cmr by Id
+        params:
             results: results
             cmrFk: CMR id
             hasCmrDms: Attached in gestdoc
@@ -50,8 +55,10 @@ route:
             'false': 'No'
             ticketFk: Ticketd id
             routeFk: Route id
-            country: Country
+            countryFk: Country
             clientFk: Client id
+            warehouseFk: Warehouse
             shipped: Preparation date
             viewCmr: View CMR
-            downloadCmrs: Download CMRs
\ No newline at end of file
+            downloadCmrs: Download CMRs
+            search: General search
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
index 51d43774a..1e247ab68 100644
--- a/src/pages/Route/locale/es.yml
+++ b/src/pages/Route/locale/es.yml
@@ -3,8 +3,6 @@ route:
         search: Buscar troncales
         searchInfo: Puedes buscar por referencia del troncal
     params:
-        agencyModeName: Agencia Ruta
-        agencyAgreement: Agencia Acuerdo
         id: Id
         name: Troncal
         etd: ETD
@@ -13,9 +11,15 @@ route:
         observations: Observaciones
         cmrFk: Id CMR
         hasCmrDms: Gestdoc
+        search: Búsqueda general
         ticketFk: Id ticket
-        routeFK: Id ruta
+        routeFk: Id ruta
+        clientFk: Id cliente
+        countryFk: Pais
+        warehouseFk: Almacén
         shipped: Fecha preparación
+        agencyModeName: Agencia Ruta
+        agencyAgreement: Agencia Acuerdo
     Worker: Trabajador
     Agency: Agencia
     Vehicle: Vehículo
@@ -55,4 +59,4 @@ route:
             clientFk: Id cliente
             shipped: Fecha preparación
             viewCmr: Ver CMR
-            downloadCmrs: Descargar CMRs
\ No newline at end of file
+            downloadCmrs: Descargar CMRs

From b73f97bf97592557a0d9fee2aa1e8e110a20ae3e Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Tue, 25 Feb 2025 14:03:22 +0100
Subject: [PATCH 3/4] refactor: refs #8664 remove CmrFilter and replace with
 VnSearchbar in CmrList

---
 src/pages/Route/Cmr/CmrFilter.vue | 128 ------------------------------
 src/pages/Route/Cmr/CmrList.vue   |  98 ++++++++++-------------
 2 files changed, 43 insertions(+), 183 deletions(-)
 delete mode 100644 src/pages/Route/Cmr/CmrFilter.vue

diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
deleted file mode 100644
index f81fcb5b3..000000000
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'components/common/VnInput.vue';
-import FetchData from 'src/components/FetchData.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const countriesOptions = ref([]);
-</script>
-
-<template>
-    <FetchData
-        url="Countries"
-        auto-load
-        @on-fetch="(data) => (countriesOptions = data)"
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`route.cmr.params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params, searchFn }">
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInput
-                        v-model="params.cmrFk"
-                        type="number"
-                        :label="t('route.cmr.params.cmrFk')"
-                        is-outlined
-                        clearable
-                    />
-                </QItemSection>
-            </QItem>
-            <QCheckbox
-                :label="t('route.cmr.params.hasCmrDms')"
-                v-model="params.hasCmrDms"
-                @update:model-value="searchFn()"
-                toggle-indeterminate
-            />
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInput
-                        v-model="params.ticketFk"
-                        type="number"
-                        :label="t('route.cmr.params.ticketFk')"
-                        is-outlined
-                        clearable
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInput
-                        v-model="params.routeFk"
-                        type="number"
-                        :label="t('route.cmr.params.routeFk')"
-                        is-outlined
-                        clearable
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInput
-                        v-model="params.clientFk"
-                        type="number"
-                        :label="t('route.cmr.params.clientFk')"
-                        is-outlined
-                        clearable
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnSelect
-                        :label="t('route.cmr.params.countryFk')"
-                        v-model="params.countryFk"
-                        @update:model-value="searchFn()"
-                        :options="countriesOptions"
-                        option-value="id"
-                        option-label="name"
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInputDate
-                        v-model="params.shipped"
-                        :label="t('route.cmr.params.shipped')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnSelect
-                        :label="t('route.cmr.params.warehouseFk')"
-                        v-model="params.warehouseFk"
-                        @update:model-value="searchFn()"
-                        url="warehouses"
-                        option-value="id"
-                        option-label="name"
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 5f72b736d..66447a0a6 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -11,8 +11,7 @@ import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy
 
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import CmrFilter from './CmrFilter.vue';
-import VnSection from 'src/components/common/VnSection.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
@@ -136,60 +135,49 @@ function downloadPdfs() {
 }
 </script>
 <template>
-    <VnSection
+    <VnSearchbar
         :data-key
-        :columns="columns"
-        prefix="route.cmr"
-        :right-filter="true"
-        :array-data-props="{
-            url: 'Cmrs/filter',
-        }"
-    >
-        <template #advanced-menu>
-            <CmrFilter :data-key />
-        </template>
-        <template #body>
-            <VnSubToolbar>
-                <template #st-actions>
-                    <QBtn
-                        icon="cloud_download"
-                        color="primary"
-                        class="q-mr-sm"
-                        :disable="!selectedRows?.length"
-                        @click="downloadPdfs"
-                    >
-                        <QTooltip>{{ t('route.cmr.params.downloadCmrs') }}</QTooltip>
-                    </QBtn>
-                </template>
-            </VnSubToolbar>
-            <VnTable
-                ref="tableRef"
-                :data-key
-                url="Cmrs/filter"
-                :columns="columns"
-                :right-search="false"
-                default-mode="table"
-                v-model:selected="selectedRows"
-                table-height="85vh"
-                :table="{
-                    'row-key': 'cmrFk',
-                    selection: 'multiple',
-                }"
-                :disable-option="{ card: true }"
+        :label="t('route.cmr.search')"
+        :info="t('route.cmr.searchInfo')"
+    />
+    <VnSubToolbar>
+        <template #st-actions>
+            <QBtn
+                icon="cloud_download"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="downloadPdfs"
             >
-                <template #column-ticketFk="{ row }">
-                    <span class="link" @click.stop>
-                        {{ row.ticketFk }}
-                        <TicketDescriptorProxy :id="row.ticketFk" />
-                    </span>
-                </template>
-                <template #column-clientFk="{ row }">
-                    <span class="link" @click.stop>
-                        {{ row.clientFk }}
-                        <CustomerDescriptorProxy :id="row.clientFk" />
-                    </span>
-                </template>
-            </VnTable>
+                <QTooltip>{{ t('route.cmr.params.downloadCmrs') }}</QTooltip>
+            </QBtn>
         </template>
-    </VnSection>
+    </VnSubToolbar>
+    <VnTable
+        ref="tableRef"
+        :data-key
+        url="Cmrs/filter"
+        :columns="columns"
+        default-mode="table"
+        v-model:selected="selectedRows"
+        table-height="85vh"
+        :table="{
+            'row-key': 'cmrFk',
+            selection: 'multiple',
+        }"
+        :disable-option="{ card: true }"
+    >
+        <template #column-ticketFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+        <template #column-clientFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.clientFk }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
+    </VnTable>
 </template>

From 393aebb06f7280eca3117cc9a8f43272681e14e2 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 26 Feb 2025 08:45:16 +0100
Subject: [PATCH 4/4] refactor: refs #8664 enhance CmrList component with query
 initialization and user parameters

---
 src/pages/Route/Cmr/CmrList.vue | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 66447a0a6..d0683e481 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -1,7 +1,8 @@
 <script setup>
-import { onMounted, computed, ref } from 'vue';
+import { onBeforeMount, onMounted, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
+import { useRoute } from 'vue-router';
 import { useSession } from 'src/composables/useSession';
 import { toDateHourMin } from 'filters/index';
 import { useStateStore } from 'src/stores/useStateStore';
@@ -13,12 +14,21 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
+const route = useRoute();
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 const state = useStateStore();
 const selectedRows = ref([]);
 const dataKey = 'CmrList';
+const shipped = Date.vnNew();
+shipped.setHours(0, 0, 0, 0);
+shipped.setDate(shipped.getDate() - 1);
+const userParams = {
+    shipped: null,
+};
+
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -75,9 +85,6 @@ const columns = computed(() => [
         name: 'shipped',
         cardVisible: true,
         component: 'date',
-        columnFilter: {
-            inWhere: true,
-        },
         format: ({ shipped }) => toDateHourMin(shipped),
     },
     {
@@ -90,6 +97,7 @@ const columns = computed(() => [
             fields: ['id', 'name'],
         },
         columnFilter: {
+            inWhere: true,
             name: 'warehouseFk',
             attrs: {
                 url: 'warehouses',
@@ -112,8 +120,17 @@ const columns = computed(() => [
     },
 ]);
 
+onBeforeMount(() => {
+    initializeFromQuery();
+});
+
 onMounted(() => (state.rightDrawer = true));
 
+const initializeFromQuery = () => {
+    const query = route.query.table ? JSON.parse(route.query.table) : {};
+    shipped.value = query.shipped || shipped.toISOString();
+    Object.assign(userParams, { shipped });
+};
 function getApiUrl() {
     return new URL(window.location).origin;
 }
@@ -158,6 +175,7 @@ function downloadPdfs() {
         :data-key
         url="Cmrs/filter"
         :columns="columns"
+        :user-params="userParams"
         default-mode="table"
         v-model:selected="selectedRows"
         table-height="85vh"