diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
index 461f2d95e..4df0278a6 100644
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -1,19 +1,8 @@
-
-
-
-
-
+
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index b82d1468e..259cacd16 100644
--- 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,41 @@ const columns = computed(() => [
]);
-
-
-
+
+
-
-
-
-
- {{ row?.workerUserName }}
-
-
+
+
+
+
+ {{ row?.workerUserName }}
+
+
+
+
-
+
diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml
index 420d18dfe..57806d0f4 100644
--- a/src/pages/Route/locale/en.yml
+++ b/src/pages/Route/locale/en.yml
@@ -23,6 +23,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
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
index a6ba4f370..4db28032b 100644
--- a/src/pages/Route/locale/es.yml
+++ b/src/pages/Route/locale/es.yml
@@ -23,6 +23,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
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index a6c4f30a2..9ddea4124 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -1,41 +1,87 @@
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'),
+ },
+ ]
+};
+
export default {
- path: '/route',
name: 'Route',
+ path: '/route',
meta: {
title: 'routes',
icon: 'vn:delivery',
moduleName: 'Route',
+ menu: ['RouteList', 'RouteExtendedList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'AgencyList'],
},
component: RouterView,
redirect: { name: 'RouteMain' },
- menus: {
- main: [
- 'RouteList',
- 'RouteExtendedList',
- 'RouteAutonomous',
- 'RouteRoadmap',
- 'CmrList',
- 'AgencyList',
- ],
- card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
- },
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',
@@ -100,49 +146,5 @@ export default {
},
],
},
- {
- 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'),
- },
- ],
- },
],
};