diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue
index e56784d4e1..376eaf03d3 100644
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@@ -94,8 +94,8 @@ function checkIsMain() {
/>
-
-
+
+
{
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 () => {
>
- {{ console.log('opt: ', opt) }}
{{ opt.id }} -
@@ -311,11 +310,11 @@ const createInvoiceInCorrection = async () => {
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?
diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
index 6694afdb18..4322b9bc80 100644
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -69,29 +69,25 @@ const columns = computed(() => [
-
-
+
+
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 978367a02b..bc3227f6c8 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -110,7 +110,7 @@ const columns = computed(() => [
-
-
+
+
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',
- icon: 'list',
+ title: 'list',
+ icon: 'view_list',
},
- component: () =>
- import('src/pages/Route/Agency/AgencyList.vue'),
},
+ agencyCard,
],
},
],
diff --git a/src/router/routes.js b/src/router/routes.js
index ddda2aa639..733400c4b9 100644
--- a/src/router/routes.js
+++ b/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,
{