feat: refs #8322 fix route.js and unify with /agency

src/components/common/VnSection.vue

@@ -94,8 +94,8 @@ function checkIsMain() {
         />
         <div :id="searchbarId"></div>
     </slot>
-    <RightAdvancedMenu :is-main-section="isMainSection">
+    <RightAdvancedMenu :is-main-section="isMainSection && rightFilter">
-        <template #advanced-menu v-if="$slots[advancedMenuSlot] || rightFilter">
+        <template #advanced-menu v-if="$slots[advancedMenuSlot]">
             <slot :name="advancedMenuSlot">
                 <VnTableFilter
                     v-if="rightFilter && columns"

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		
+    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries
-    isLinked: The entry has been linked to Sage. Please contact administration for further information		
+    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		
+    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes
-    isLinked: El asiento fue enlazado a Sage, por favor contacta con administración		
+    isLinked: El asiento fue enlazado a Sage, por favor contacta con administración
     assertAction: Estas seguro de querer {action} esta factura?
 </i18n>

src/pages/Route/Agency/AgencyList.vue

@@ -69,29 +69,25 @@ const columns = computed(() => [
 </script>
 <template>
     <VnSection
-        :data-key="dataKey"
+        :data-key
         :columns="columns"
         prefix="agency"
         :right-filter="false"
-        :array-data-props="{ 
+        :array-data-props="{
             url: 'Agencies',
-            order: 'name', 
+            order: 'name',
             exprBuilder,
         }"
     >
-        <template #body>  
+        <template #body>
-        <div class="list-container">
+            <VnTable
-            <div class="list">
+                :data-key
-                <VnTable
+                :columns="columns"
-                    :data-key="dataKey"
+                :right-search="false"
-                    :columns="columns"
+                :use-model="true"
-                    :right-search="false"
+                redirect="route/agency"
-                    :use-model="true"
+                default-mode="card"
-                    redirect="agency"
+            />
-                    default-mode="card"
-                />
-            </div>
-        </div>
         </template>
     </VnSection>
 </template>

src/pages/Route/RouteList.vue

@@ -110,7 +110,7 @@ const columns = computed(() => [
 </script>
 <template>
     <VnSection
-        :data-key="dataKey"
+        :data-key
         :columns="columns"
         prefix="route"
         :array-data-props="{
@@ -118,12 +118,12 @@ const columns = computed(() => [
             userFilter: routeFilter,
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
-            <RouteFilter data-key="RouteList" />
+            <RouteFilter :data-key />
         </template>
         <template #body>
             <VnTable
-                :data-key="dataKey"
+                :data-key
                 :columns="columns"
                 :right-search="false"
                 redirect="route"

src/router/modules/index.js

@@ -13,7 +13,6 @@ 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';
@@ -34,7 +33,6 @@ export default [
     invoiceIn,
     Entry,
     roadmap,
-    Agency,
     Zone,
     Account,
     Monitor,

src/router/modules/route.js

@@ -45,7 +45,80 @@ const routeCard = {
             },
             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'),
+        },
+    ],
 };
 
 export default {
@@ -55,7 +128,14 @@ export default {
         title: 'routes',
         icon: 'vn:delivery',
         moduleName: 'Route',
-        menu: ['RouteList', 'RouteExtendedList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'AgencyList'],
+        menu: [
+            'RouteList',
+            'RouteExtendedList',
+            'RouteAutonomous',
+            'RouteRoadmap',
+            'CmrList',
+            'AgencyList',
+        ],
     },
     component: RouterView,
     redirect: { name: 'RouteMain' },
@@ -81,7 +161,7 @@ export default {
                             },
                         },
                         routeCard,
-                    ]
+                    ],
                 },
                 {
                     path: 'extended-list',
@@ -129,19 +209,24 @@ export default {
                     component: () => import('src/pages/Route/Cmr/CmrList.vue'),
                 },
                 {
-                    path: '/agency',
+                    path: 'agency',
+                    name: 'AgencyMain',
                     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',
+                                title: 'list',
-                                icon: 'list',
+                                icon: 'view_list',
                             },
-                            component: () =>
-                                import('src/pages/Route/Agency/AgencyList.vue'),
                         },
+                        agencyCard,
                     ],
                 },
             ],

src/router/routes.js

@@ -13,7 +13,6 @@ 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';
@@ -84,7 +83,6 @@ const routes = [
             travel,
             roadmap,
             entry,
-            agency,
             zone,
             account,
             {