Merge branch 'dev' into 8387-itemTagCrudModelFront

2025-01-27 08:05:51 +00:00 · 2025-01-27 08:05:51 +00:00 · 9deb5bceea
parent 75ba4d4fd9 2b3ca85af4
commit 9deb5bceea
22 changed files with 441 additions and 341 deletions
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@ -75,6 +75,7 @@ const focus = () => {

 defineExpose({
    focus,
+    vnInputRef,
 });

 const mixinRules = [
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@ -94,8 +94,8 @@ function checkIsMain() {
        />
        <div :id="searchbarId"></div>
    </slot>
-    <RightAdvancedMenu :is-main-section="isMainSection">
-        <template #advanced-menu v-if="$slots[advancedMenuSlot] || rightFilter">
+    <RightAdvancedMenu :is-main-section="isMainSection && rightFilter">
+        <template #advanced-menu v-if="$slots[advancedMenuSlot]">
            <slot :name="advancedMenuSlot">
                <VnTableFilter
                    v-if="rightFilter && columns"
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue
@ -149,7 +149,7 @@ function sendPdfInvoice({ address }) {
 const createInvoiceInCorrection = async () => {
    const { data: correctingId } = await axios.post(
        'InvoiceIns/corrective',
-        Object.assign(correctionFormData, { id: entityId.value })
+        Object.assign(correctionFormData, { id: entityId.value }),
    );
    push({ path: `/invoice-in/${correctingId}/summary` });
 };
@ -272,7 +272,6 @@ const createInvoiceInCorrection = async () => {
                        >
                            <template #option="{ itemProps, opt }">
                                <QItem v-bind="itemProps">
-                                    {{ console.log('opt: ', opt) }}
                                    <QItemSection>
                                        <QItemLabel
                                            >{{ opt.id }} -
@ -311,11 +310,11 @@ const createInvoiceInCorrection = async () => {

 <i18n>
 en:
-    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries		
-    isLinked: The entry has been linked to Sage. Please contact administration for further information		
+    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries
+    isLinked: The entry has been linked to Sage. Please contact administration for further information
    assertAction: Are you sure you want to {action} this invoice?
 es:
-    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes		
-    isLinked: El asiento fue enlazado a Sage, por favor contacta con administración		
+    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes
+    isLinked: El asiento fue enlazado a Sage, por favor contacta con administración
    assertAction: Estas seguro de querer {action} esta factura?
 </i18n>
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@ -272,11 +272,12 @@ const onDenyAccept = (_, responseData) => {
        <template #column-achieved="{ row }">
            <span>
                <VnInput
+                    ref="achievedRef"
                    type="number"
                    v-model.number="row.saleQuantity"
                    :disable="!row.itemFk || row.isOk != null"
                    @blur="changeQuantity(row)"
-                    @keyup.enter="changeQuantity(row)"
+                    @keyup.enter="$refs.achievedRef.vnInputRef.blur()"
                    dense
                />
            </span>
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@ -2,11 +2,12 @@
 import { computed } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
+import VnSection from 'src/components/common/VnSection.vue';

 const { t } = useI18n();
 const router = useRouter();
+const dataKey = 'AgencyList';
 function navigate(id) {
    router.push({ path: `/agency/${id}` });
 }
@ -67,26 +68,28 @@ const columns = computed(() => [
 ]);
 </script>
 <template>
-    <VnSearchbar
-        :info="t('You can search by name')"
-        :label="t('Search agency')"
-        data-key="AgencyList"
-        :expr-builder="exprBuilder"
-    />
-    <div class="list-container">
-        <div class="list">
+    <VnSection
+        :data-key
+        :columns="columns"
+        prefix="agency"
+        :right-filter="false"
+        :array-data-props="{
+            url: 'Agencies',
+            order: 'name',
+            exprBuilder,
+        }"
+    >
+        <template #body>
            <VnTable
-                data-key="AgencyList"
-                url="Agencies"
-                order="name"
+                :data-key
                :columns="columns"
                :right-search="false"
                :use-model="true"
-                redirect="agency"
+                redirect="route/agency"
                default-mode="card"
            />
-        </div>
-    </div>
+        </template>
+    </VnSection>
 </template>
 <style lang="scss" scoped>
 .list {
@ -104,8 +107,6 @@ const columns = computed(() => [
    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
--- a/src/pages/Route/Agency/Card/AgencyCard.vue
+++ b/src/pages/Route/Agency/Card/AgencyCard.vue
@ -1,17 +1,7 @@
 <script setup>
 import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'src/components/common/VnCardBeta.vue';
 </script>
 <template>
-    <VnCard
-        data-key="Agency"
-        base-url="Agencies"
-        :descriptor="AgencyDescriptor"
-        search-data-key="AgencyList"
-        :searchbar-props="{
-            url: 'Agencies',
-            label: 'agency.searchBar.label',
-            info: 'agency.searchBar.info',
-        }"
-    />
+    <VnCardBeta data-key="Agency" base-url="Agencies" :descriptor="AgencyDescriptor" />
 </template>
--- a/src/pages/Route/Agency/locale/en.yml
+++ b/src/pages/Route/Agency/locale/en.yml
@ -1,4 +1,6 @@
 agency:
+    search: Search agency
+    searchInfo:    You can search by name
    isOwn: Own
    isAnyVolumeAllowed: Any volume allowed
    notification:
--- a/src/pages/Route/Agency/locale/es.yml
+++ b/src/pages/Route/Agency/locale/es.yml
@ -1,4 +1,6 @@
 agency:
+    search: Buscar agencia
+    searchInfo: Puedes buscar por nombre
    isOwn: Propio
    isAnyVolumeAllowed: Cualquier volumen
    removeItem: Agencia eliminada correctamente
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@ -1,19 +1,8 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
-import RouteFilter from './RouteFilter.vue';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+
 </script>
 <template>
-    <VnCard
-        data-key="Route"
-        base-url="Routes"
-        :descriptor="RouteDescriptor"
-        :filter-panel="RouteFilter"
-        search-data-key="RouteList"
-    >
-        <template #searchbar>
-            <RouteSearchbar />
-        </template>
-    </VnCard>
+    <VnCardBeta data-key="Route" base-url="Routes" :descriptor="RouteDescriptor" />
 </template>
--- a/src/pages/Route/Roadmap/RoadmapCard.vue
+++ b/src/pages/Route/Roadmap/RoadmapCard.vue
@ -1,19 +1,7 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
-import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
 </script>
 <template>
-    <VnCard
-        data-key="Roadmap"
-        base-url="Roadmaps"
-        :descriptor="RoadmapDescriptor"
-        :filter-panel="RoadmapFilter"
-        search-data-key="RoadmapList"
-        :searchbar-props="{
-            url: 'Roadmaps',
-            label: 'Search roadmap',
-            info: 'You can search by roadmap id or customer name',
-        }"
-    />
+    <VnCardBeta data-key="Roadmap" base-url="Roadmaps" :descriptor="RoadmapDescriptor" />
 </template>
--- a/src/pages/Route/Roadmap/RoadmapFilter.vue
+++ b/src/pages/Route/Roadmap/RoadmapFilter.vue
@ -18,22 +18,6 @@ const props = defineProps({
 const emit = defineEmits(['search']);

 const supplierList = ref([]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'tractorPlate':
-        case 'trailerPlate':
-        case 'driverName':
-        case 'phone':
-            return { [param]: { like: `%${value}%` } };
-        case 'supplierFk':
-        case 'price':
-            return { [param]: value };
-        case 'from':
-            return { etd: { gte: value } };
-        case 'to':
-            return { etd: { lte: value } };
-    }
-};
 </script>

 <template>
@ -48,7 +32,6 @@ const exprBuilder = (param, value) => {
    <VnFilterPanel
        :data-key="props.dataKey"
        :search-button="true"
-        :expr-builder="exprBuilder"
        @search="emit('search')"
    >
        <template #tags="{ tag, formatFn }">
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@ -3,17 +3,16 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toHour } from 'src/filters';
-
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';

 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref([]);
+const dataKey = 'RouteList';
 const routeFilter = {
    include: [
        {
@ -110,32 +109,39 @@ const columns = computed(() => [
 ]);
 </script>
 <template>
-    <RouteSearchbar />
-    <RightMenu>
-        <template #right-panel>
-            <RouteFilter data-key="RouteList" />
-        </template>
-    </RightMenu>
-    <VnTable
-        data-key="RouteList"
-        url="Routes/filter"
+    <VnSection
+        :data-key
        :columns="columns"
-        :right-search="false"
-        :filter="routeFilter"
-        redirect="route"
-        :create="{
-            urlCreate: 'Routes',
-            title: t('route.createRoute'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
+        prefix="route"
+        :array-data-props="{
+            url: 'Routes/filter',
+            userFilter: routeFilter,
        }"
-        table-height="85vh"
    >
-        <template #column-workerFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row?.workerUserName }}
-                <WorkerDescriptorProxy :id="row?.workerFk" v-if="row?.workerFk" />
-            </span>
+        <template #advanced-menu>
+            <RouteFilter :data-key />
        </template>
-    </VnTable>
+        <template #body>
+            <VnTable
+                :data-key
+                :columns="columns"
+                :right-search="false"
+                redirect="route"
+                :create="{
+                    urlCreate: 'Routes',
+                    title: t('route.createRoute'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: {},
+                }"
+                table-height="85vh"
+            >
+                <template #column-workerFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.workerUserName }}
+                        <WorkerDescriptorProxy :id="row?.workerFk" v-if="row?.workerFk" />
+                    </span>
+                </template>
+            </VnTable>
+        </template>
+    </VnSection>
 </template>
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@ -15,11 +15,14 @@ import RoadmapSummary from 'pages/Route/Roadmap/RoadmapSummary.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
+import VnSection from 'src/components/common/VnSection.vue';
+import RoadmapFilter from './Roadmap/RoadmapFilter.vue';

 const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 const quasar = useQuasar();
 const selectedRows = ref([]);
+const dataKey = 'RoadmapList';
 const columns = computed(() => [
    {
        align: 'left',
@ -128,14 +131,28 @@ function confirmRemove() {
        })
        .onOk(() => tableRef.value++);
 }
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value) ? { id: value } : { name: { like: `%${value}%` } };
+        case 'tractorPlate':
+        case 'trailerPlate':
+        case 'driverName':
+        case 'phone':
+            return { [param]: { like: `%${value}%` } };
+        case 'supplierFk':
+        case 'price':
+            return { [param]: value };
+        case 'from':
+            return { etd: { gte: value } };
+        case 'to':
+            return { etd: { lte: value } };
+    }
+}
 </script>

 <template>
-    <VnSearchbar
-        data-key="RoadmapList"
-        :label="t('Search roadmaps')"
-        :info="t('You can search by roadmap reference')"
-    />
    <QDialog v-model="isCloneDialogOpen">
        <QCard style="min-width: 350px">
            <QCardSection>
@ -177,39 +194,53 @@ function confirmRemove() {
            </QBtn>
        </template>
    </VnSubToolbar>
-    <VnTable
-        ref="tableRef"
-        data-key="RoadmapList"
-        url="roadmaps"
+    <VnSection
+        :data-key
        :columns="columns"
-        :right-search="true"
-        :use-model="true"
-        default-mode="table"
-        v-model:selected="selectedRows"
-        table-height="85vh"
-        :table="{
-            selection: 'multiple',
+        prefix="route.roadmap"
+        :array-data-props="{
+            url: 'roadmaps',
+            exprBuilder,
        }"
-        redirect="route/roadmap"
-        :create="{
-            urlCreate: 'Roadmaps',
-            title: t('Create routemap'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
-        }"
-        :disable-option="{ card: true }"
    >
-        <template #column-etd="{ row }">
-            {{ toDateHourMin(row.etd) }}
+        <template #advanced-menu>
+            <RoadmapFilter :dataKey />
        </template>
-        <template #column-supplierFk="{ row }">
-            {{ row.supplierFk }}
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key
+                :columns="columns"
+                :right-search="false"
+                :use-model="true"
+                default-mode="table"
+                v-model:selected="selectedRows"
+                table-height="85vh"
+                :table="{
+                    selection: 'multiple',
+                }"
+                redirect="route/roadmap"
+                :create="{
+                    urlCreate: 'Roadmaps',
+                    title: t('Create routemap'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: {},
+                }"
+                :disable-option="{ card: true }"
+            >
+                <template #column-etd="{ row }">
+                    {{ toDateHourMin(row.etd) }}
+                </template>
+                <template #column-supplierFk="{ row }">
+                    {{ row.supplierFk }}
+                </template>
+                <template #more-create-dialog="{ data }">
+                    <VnInputDate v-model="data.etd" />
+                    <VnInputTime v-model="data.etd" />
+                </template>
+            </VnTable>
        </template>
-        <template #more-create-dialog="{ data }">
-            <VnInputDate v-model="data.etd" />
-            <VnInputTime v-model="data.etd" />
-        </template>
-    </VnTable>
+    </VnSection>
 </template>

 <style lang="scss" scoped>
--- a/src/pages/Route/locale/en.yml
+++ b/src/pages/Route/locale/en.yml
@ -1,4 +1,7 @@
 route:
+    roadmap:
+        search: Search roadmap
+        searchInfo: You can search by roadmap reference
    params:
        etd: ETD
        tractorPlate: Plate
@ -36,6 +39,8 @@ route:
    Summary: Summary
    Route is closed: Route is closed
    Route is not served: Route is not served
+    search: Search route
+    searchInfo: You can search by route reference
    cmr:
        list:
            results: results
@ -49,4 +54,4 @@ route:
            clientFk: Client id
            shipped: Preparation date
            viewCmr: View CMR
-            downloadCmrs: Download CMRs
+            downloadCmrs: Download CMRs
--- a/src/pages/Route/locale/es.yml
+++ b/src/pages/Route/locale/es.yml
@ -1,4 +1,7 @@
 route:
+    roadmap:
+        search: Buscar troncales
+        searchInfo: Puedes buscar por referencia del troncal
    params:
        agencyModeName: Agencia Ruta
        agencyAgreement: Agencia Acuerdo
@ -37,6 +40,8 @@ route:
    Summary: Resumen
    Route is closed: La ruta está cerrada
    Route is not served: La ruta no está servida
+    search: Buscar rutas
+    searchInfo: Puedes buscar por referencia de la ruta
    cmr:
        list:
            results: resultados
@ -50,4 +55,4 @@ route:
            clientFk: Id cliente
            shipped: Fecha preparación
            viewCmr: Ver CMR
-            downloadCmrs: Descargar CMRs
+            downloadCmrs: Descargar CMRs
--- a/src/router/modules/agency.js
+++ b/src/router/modules/agency.js
@ -1,91 +1,112 @@
 import { RouterView } from 'vue-router';

+const agencyCard = {
+    path: ':id',
+    name: 'AgencyCard',
+    component: () => import('src/pages/Route/Agency/Card/AgencyCard.vue'),
+    redirect: { name: 'AgencySummary' },
+    meta: {
+        menu: ['AgencyBasicData', 'AgencyModes', 'AgencyWorkCenters', 'AgencyLog'],
+    },
+    children: [
+        {
+            name: 'AgencySummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+                icon: 'view_list',
+            },
+            component: () => import('src/pages/Route/Agency/Card/AgencySummary.vue'),
+        },
+        {
+            name: 'AgencyBasicData',
+            path: 'basic-data',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('pages/Route/Agency/Card/AgencyBasicData.vue'),
+        },
+        {
+            path: 'workCenter',
+            name: 'AgencyWorkCenterCard',
+            redirect: { name: 'AgencyWorkCenters' },
+            children: [
+                {
+                    path: '',
+                    name: 'AgencyWorkCenters',
+                    meta: {
+                        icon: 'apartment',
+                        title: 'workCenters',
+                    },
+                    component: () =>
+                        import('src/pages/Route/Agency/Card/AgencyWorkcenter.vue'),
+                },
+            ],
+        },
+        {
+            path: 'modes',
+            name: 'AgencyModesCard',
+            redirect: { name: 'AgencyModes' },
+            children: [
+                {
+                    path: '',
+                    name: 'AgencyModes',
+                    meta: {
+                        icon: 'format_list_bulleted',
+                        title: 'modes',
+                    },
+                    component: () =>
+                        import('src/pages/Route/Agency/Card/AgencyModes.vue'),
+                },
+            ],
+        },
+        {
+            name: 'AgencyLog',
+            path: 'log',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Route/Agency/Card/AgencyLog.vue'),
+        },
+    ],
+};
+
 export default {
-    path: '/agency',
    name: 'Agency',
+    path: '/agency',
    meta: {
        title: 'agency',
        icon: 'garage_home',
        moduleName: 'Agency',
    },
    component: RouterView,
-    redirect: { name: 'AgencyCard' },
-    menus: {
-        main: [],
-        card: ['AgencyBasicData', 'AgencyModes', 'AgencyWorkCenters', 'AgencyLog'],
-    },
+    redirect: { name: 'RouteMain' },
    children: [
        {
-            path: '/agency/:id',
-            name: 'AgencyCard',
-            component: () => import('src/pages/Route/Agency/Card/AgencyCard.vue'),
-            redirect: { name: 'AgencySummary' },
+            name: 'AgencyMain',
+            path: '',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'AgencyIndexMain' },
            children: [
                {
-                    name: 'AgencySummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'view_list',
-                    },
-                    component: () =>
-                        import('src/pages/Route/Agency/Card/AgencySummary.vue'),
-                },
-                {
-                    name: 'AgencyBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('pages/Route/Agency/Card/AgencyBasicData.vue'),
-                },
-                {
-                    path: 'workCenter',
-                    name: 'AgencyWorkCenterCard',
-                    redirect: { name: 'AgencyWorkCenters' },
+                    name: 'AgencyIndexMain',
+                    path: '',
+                    redirect: { name: 'AgencyList' },
+                    component: () => import('src/pages/Route/Agency/AgencyList.vue'),
                    children: [
                        {
-                            path: '',
-                            name: 'AgencyWorkCenters',
+                            name: 'AgencyList',
+                            path: 'list',
                            meta: {
-                                icon: 'apartment',
-                                title: 'workCenters',
+                                title: 'list',
+                                icon: 'view_list',
                            },
-                            component: () =>
-                                import(
-                                    'src/pages/Route/Agency/Card/AgencyWorkcenter.vue'
-                                ),
                        },
+                        agencyCard,
                    ],
                },
-                {
-                    path: 'modes',
-                    name: 'AgencyModesCard',
-                    redirect: { name: 'AgencyModes' },
-                    children: [
-                        {
-                            path: '',
-                            name: 'AgencyModes',
-                            meta: {
-                                icon: 'format_list_bulleted',
-                                title: 'modes',
-                            },
-                            component: () =>
-                                import('src/pages/Route/Agency/Card/AgencyModes.vue'),
-                        },
-                    ],
-                },
-                {
-                    name: 'AgencyLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Route/Agency/Card/AgencyLog.vue'),
-                },
            ],
        },
    ],
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@ -12,8 +12,6 @@ import Supplier from './supplier';
 import Travel from './travel';
 import Order from './order';
 import Entry from './entry';
-import roadmap from './roadmap';
-import Agency from './agency';
 import Zone from './zone';
 import Account from './account';
 import Monitor from './monitor';
@ -33,8 +31,6 @@ export default [
    Order,
    invoiceIn,
    Entry,
-    roadmap,
-    Agency,
    Zone,
    Account,
    Monitor,
--- a/src/router/modules/roadmap.js
+++ b/src/router/modules/roadmap.js
@ -1,53 +0,0 @@
-import { RouterView } from 'vue-router';
-
-export default {
-    path: '/route/roadmap',
-    name: 'Roadmap',
-    meta: {
-        title: 'roadmap',
-        icon: 'vn:troncales',
-        moduleName: 'Roadmap',
-    },
-    component: RouterView,
-    redirect: { name: 'RouteMain' },
-    menus: {
-        card: ['RoadmapBasicData', 'RoadmapStops'],
-    },
-    children: [
-        {
-            name: 'RouteRoadmapCard',
-            path: ':id',
-            component: () => import('src/pages/Route/Roadmap/RoadmapCard.vue'),
-            redirect: { name: 'RoadmapSummary' },
-            children: [
-                {
-                    name: 'RoadmapSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'open_in_new',
-                    },
-                    component: () => import('pages/Route/Roadmap/RoadmapSummary.vue'),
-                },
-                {
-                    name: 'RoadmapBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('pages/Route/Roadmap/RoadmapBasicData.vue'),
-                },
-                {
-                    name: 'RoadmapStops',
-                    path: 'stops',
-                    meta: {
-                        title: 'stops',
-                        icon: 'vn:lines',
-                    },
-                    component: () => import('pages/Route/Roadmap/RoadmapStops.vue'),
-                },
-            ],
-        },
-    ],
-};
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@ -1,17 +1,173 @@
 import { RouterView } from 'vue-router';

+const routeCard = {
+    name: 'RouteCard',
+    path: ':id',
+    component: () => import('src/pages/Route/Card/RouteCard.vue'),
+    redirect: { name: 'RouteSummary' },
+    meta: {
+        menu: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
+    },
+    children: [
+        {
+            name: 'RouteBasicData',
+            path: 'basic-data',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('pages/Route/Card/RouteForm.vue'),
+        },
+        {
+            name: 'RouteSummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+                icon: 'open_in_new',
+            },
+            component: () => import('pages/Route/Card/RouteSummary.vue'),
+        },
+        {
+            path: 'tickets',
+            name: 'RouteTickets',
+            meta: {
+                title: 'tickets',
+                icon: 'vn:ticket',
+            },
+            component: () => import('src/pages/Route/RouteTickets.vue'),
+        },
+        {
+            path: 'log',
+            name: 'RouteLog',
+            meta: {
+                title: 'log',
+                icon: 'vn:History',
+            },
+            component: () => import('src/pages/Route/RouteLog.vue'),
+        },
+    ],
+};
+
+const agencyCard = {
+    path: ':id',
+    name: 'AgencyCard',
+    component: () => import('src/pages/Route/Agency/Card/AgencyCard.vue'),
+    redirect: { name: 'AgencySummary' },
+    meta: {
+        menu: ['AgencyBasicData', 'AgencyModes', 'AgencyWorkCenters', 'AgencyLog'],
+    },
+    children: [
+        {
+            name: 'AgencySummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+                icon: 'view_list',
+            },
+            component: () => import('src/pages/Route/Agency/Card/AgencySummary.vue'),
+        },
+        {
+            name: 'AgencyBasicData',
+            path: 'basic-data',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('pages/Route/Agency/Card/AgencyBasicData.vue'),
+        },
+        {
+            path: 'workCenter',
+            name: 'AgencyWorkCenterCard',
+            redirect: { name: 'AgencyWorkCenters' },
+            children: [
+                {
+                    path: '',
+                    name: 'AgencyWorkCenters',
+                    meta: {
+                        icon: 'apartment',
+                        title: 'workCenters',
+                    },
+                    component: () =>
+                        import('src/pages/Route/Agency/Card/AgencyWorkcenter.vue'),
+                },
+            ],
+        },
+        {
+            path: 'modes',
+            name: 'AgencyModesCard',
+            redirect: { name: 'AgencyModes' },
+            children: [
+                {
+                    path: '',
+                    name: 'AgencyModes',
+                    meta: {
+                        icon: 'format_list_bulleted',
+                        title: 'modes',
+                    },
+                    component: () =>
+                        import('src/pages/Route/Agency/Card/AgencyModes.vue'),
+                },
+            ],
+        },
+        {
+            name: 'AgencyLog',
+            path: 'log',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Route/Agency/Card/AgencyLog.vue'),
+        },
+    ],
+};
+
+const roadmapCard = {
+    path: ':id',
+    name: 'RoadmapCard',
+    component: () => import('src/pages/Route/Roadmap/RoadmapCard.vue'),
+    redirect: { name: 'RoadmapSummary' },
+    meta: {
+        menu: ['RoadmapBasicData', 'RoadmapStops'],
+    },
+    children: [
+        {
+            name: 'RoadmapSummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+                icon: 'open_in_new',
+            },
+            component: () => import('pages/Route/Roadmap/RoadmapSummary.vue'),
+        },
+        {
+            name: 'RoadmapBasicData',
+            path: 'basic-data',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('pages/Route/Roadmap/RoadmapBasicData.vue'),
+        },
+        {
+            name: 'RoadmapStops',
+            path: 'stops',
+            meta: {
+                title: 'stops',
+                icon: 'vn:lines',
+            },
+            component: () => import('pages/Route/Roadmap/RoadmapStops.vue'),
+        },
+    ],
+};
+
 export default {
-    path: '/route',
    name: 'Route',
+    path: '/route',
    meta: {
        title: 'routes',
        icon: 'vn:delivery',
        moduleName: 'Route',
-    },
-    component: RouterView,
-    redirect: { name: 'RouteMain' },
-    menus: {
-        main: [
+        menu: [
            'RouteList',
            'RouteExtendedList',
            'RouteAutonomous',
@ -19,23 +175,32 @@ export default {
            'CmrList',
            'AgencyList',
        ],
-        card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
    },
+    component: RouterView,
+    redirect: { name: 'RouteMain' },
    children: [
        {
-            path: '/route',
            name: 'RouteMain',
+            path: '',
            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'RouteList' },
+            redirect: { name: 'RouteIndexMain' },
            children: [
                {
-                    path: 'list',
-                    name: 'RouteList',
-                    meta: {
-                        title: 'RouteList',
-                        icon: 'view_list',
-                    },
+                    path: '',
+                    name: 'RouteIndexMain',
+                    redirect: { name: 'RouteList' },
                    component: () => import('src/pages/Route/RouteList.vue'),
+                    children: [
+                        {
+                            name: 'RouteList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        routeCard,
+                    ],
                },
                {
                    path: 'extended-list',
@ -67,11 +232,23 @@ export default {
                {
                    path: 'roadmap',
                    name: 'RouteRoadmap',
+                    redirect: { name: 'RoadmapList' },
                    meta: {
                        title: 'RouteRoadmap',
                        icon: 'vn:troncales',
                    },
                    component: () => import('src/pages/Route/RouteRoadmap.vue'),
+                    children: [
+                        {
+                            name: 'RoadmapList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        roadmapCard,
+                    ],
                },
                {
                    path: 'cmr',
@ -83,66 +260,27 @@ export default {
                    component: () => import('src/pages/Route/Cmr/CmrList.vue'),
                },
                {
-                    path: '/agency',
+                    path: 'agency',
+                    name: 'RouteAgency',
                    redirect: { name: 'AgencyList' },
+                    meta: {
+                        title: 'agency',
+                        icon: 'garage_home',
+                    },
+                    component: () => import('src/pages/Route/Agency/AgencyList.vue'),
                    children: [
                        {
-                            path: 'list',
                            name: 'AgencyList',
+                            path: 'list',
                            meta: {
-                                title: 'agencyList',
-                                icon: 'list',
+                                title: 'list',
+                                icon: 'view_list',
                            },
-                            component: () =>
-                                import('src/pages/Route/Agency/AgencyList.vue'),
                        },
+                        agencyCard,
                    ],
                },
            ],
        },
-        {
-            name: 'RouteCard',
-            path: ':id',
-            component: () => import('src/pages/Route/Card/RouteCard.vue'),
-            redirect: { name: 'RouteSummary' },
-            children: [
-                {
-                    name: 'RouteBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('pages/Route/Card/RouteForm.vue'),
-                },
-                {
-                    name: 'RouteSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'open_in_new',
-                    },
-                    component: () => import('pages/Route/Card/RouteSummary.vue'),
-                },
-                {
-                    path: 'tickets',
-                    name: 'RouteTickets',
-                    meta: {
-                        title: 'tickets',
-                        icon: 'vn:ticket',
-                    },
-                    component: () => import('src/pages/Route/RouteTickets.vue'),
-                },
-                {
-                    path: 'log',
-                    name: 'RouteLog',
-                    meta: {
-                        title: 'log',
-                        icon: 'vn:History',
-                    },
-                    component: () => import('src/pages/Route/RouteLog.vue'),
-                },
-            ],
-        },
    ],
 };
--- a/src/router/routes.js
+++ b/src/router/routes.js
@ -12,8 +12,6 @@ import travel from './modules/travel';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
-import roadmap from 'src/router/modules/roadmap';
-import agency from 'src/router/modules/agency';
 import zone from 'src/router/modules/zone';
 import account from './modules/account';
 import monitor from 'src/router/modules/monitor';
@ -82,9 +80,7 @@ const routes = [
            route,
            supplier,
            travel,
-            roadmap,
            entry,
-            agency,
            zone,
            account,
            {
--- a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
@ -2,7 +2,7 @@ describe('AgencyWorkCenter', () => {
    beforeEach(() => {
        cy.viewport(1920, 1080);
        cy.login('developer');
-        cy.visit(`/#/agency/11/workCenter`);
+        cy.visit(`/#/route/agency/11/workCenter`);
    });
    const createButton = '.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon';
    const workCenterCombobox = 'input[role="combobox"]';
--- a/test/cypress/integration/route/roadMap/roadmapList.spec.js
+++ b/test/cypress/integration/route/roadMap/roadmapList.spec.js
@ -1,12 +1,11 @@
 describe('RoadMap', () => {
    beforeEach(() => {
-        cy.viewport(1920, 1080);
        cy.login('developer');
        cy.visit(`/#/route/roadmap`);
    });
    it('Route list create roadmap and redirect', () => {
        cy.addBtnClick();
-        cy.get('input[name="name"]').eq(1).type('roadMapTestOne{enter}');
+        cy.get('input[name="name"]').type('roadMapTestOne{enter}');
        cy.get('.q-notification__message').should('have.text', 'Data created');
        cy.url().should('include', '/summary');
    });