diff --git a/package-lock.json b/package-lock.json index 4fe3c0cdc..afcf4b291 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "0.0.1", + "version": "23.32.01", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index d9702c895..85e0cd72b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "23.30.01", + "version": "23.32.01", "description": "Salix frontend", "productName": "Salix", "author": "Verdnatura", diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index a911fab2b..fafba4b09 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -20,6 +20,7 @@ export default { save: 'Save', remove: 'Remove', reset: 'Reset', + close: 'Close', cancel: 'Cancel', confirm: 'Confirm', back: 'Back', @@ -462,6 +463,25 @@ export default { uncompleteTrays: 'There are incomplete trays', }, }, + route: { + pageTitles: { + routes: 'Routes', + cmrsList: 'External CMRs list', + }, + cmr: { + list: { + total: 'Total {0} records', + cmrFk: 'Cmr id', + hasCmrDms: `Attached in gestdoc`, + true: 'Yes', + false: 'No', + ticketFk: 'Ticketd id', + country: 'Country', + clientFk: 'Client id', + shipped: 'Preparation date', + }, + }, + }, components: { topbar: {}, userPanel: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index e6a491c9d..5b0983031 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -20,6 +20,7 @@ export default { save: 'Guardar', remove: 'Eliminar', reset: 'Restaurar', + close: 'Cerrar', cancel: 'Cancelar', confirm: 'Confirmar', back: 'Volver', @@ -462,6 +463,25 @@ export default { uncompleteTrays: 'Hay bandejas sin completar', }, }, + route: { + pageTitles: { + routes: 'Rutas', + cmrsList: 'Listado de CMRs externos', + }, + cmr: { + list: { + total: 'Total {0} registros', + cmrFk: 'Id cmr', + hasCmrDms: 'Adjuntado en gestdoc', + true: 'Sí', + false: 'No', + ticketFk: 'Id ticket', + country: 'País', + clientFk: 'Id cliente', + shipped: 'Fecha preparación', + }, + }, + }, components: { topbar: {}, userPanel: { diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue new file mode 100644 index 000000000..9059e0195 --- /dev/null +++ b/src/pages/Route/Cmr/CmrFilter.vue @@ -0,0 +1,141 @@ + + + + + + en: + params: + cmrFk: Cmr id, + hasCmrDms: Attached in gestdoc, + ticketFk: Ticketd id, + country: Country, + clientFk: Client id, + shipped: Preparation date, + + es: + params: + cmrFk: Id cmr, + hasCmrDms: Adjuntado en gestdoc, + ticketFk: Id ticket, + country: País, + clientFk: Id cliente, + shipped: Fecha preparación, + diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue new file mode 100644 index 000000000..761d79fa2 --- /dev/null +++ b/src/pages/Route/Cmr/CmrList.vue @@ -0,0 +1,130 @@ + + + + \ No newline at end of file diff --git a/src/pages/Route/RouteMain.vue b/src/pages/Route/RouteMain.vue new file mode 100644 index 000000000..66ce78f23 --- /dev/null +++ b/src/pages/Route/RouteMain.vue @@ -0,0 +1,17 @@ + + + diff --git a/src/router/modules/index.js b/src/router/modules/index.js index 30c51939d..2916b98ef 100644 --- a/src/router/modules/index.js +++ b/src/router/modules/index.js @@ -4,6 +4,7 @@ import Claim from './claim'; import InvoiceOut from './invoiceOut'; import Worker from './worker'; import Wagon from './wagon'; +import Route from './route'; export default [ Customer, @@ -11,5 +12,6 @@ export default [ Claim, InvoiceOut, Worker, - Wagon + Wagon, + Route ] diff --git a/src/router/modules/route.js b/src/router/modules/route.js new file mode 100644 index 000000000..a3550885c --- /dev/null +++ b/src/router/modules/route.js @@ -0,0 +1,35 @@ +import { RouterView } from 'vue-router'; + +export default { + path: '/route', + name: 'Route', + meta: { + title: 'routes', + icon: 'vn:delivery', + }, + component: RouterView, + redirect: { name: 'RouteMain' }, + menus: { + main: ['CmrList'], + card: [], + }, + children: [ + { + path: '/route', + name: 'RouteMain', + component: () => import('src/pages/Route/RouteMain.vue'), + redirect: { name: 'CmrList' }, + children: [ + { + path: 'cmr/list', + name: 'CmrList', + meta: { + title: 'cmrsList', + icon: 'fact_check', + }, + component: () => import('src/pages/Route/Cmr/CmrList.vue') + }, + ], + }, + ], +}; diff --git a/src/router/routes.js b/src/router/routes.js index d1c877305..4425996b0 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -4,6 +4,7 @@ import claim from './modules/claim'; import worker from './modules/worker'; import invoiceOut from './modules/invoiceOut'; import wagon from './modules/wagon'; +import route from './modules/route'; const routes = [ { @@ -48,6 +49,7 @@ const routes = [ component: () => import('../pages/NotFound.vue'), }, wagon, + route, ], }, ]; diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js index bcaeeb953..168c1f9dc 100644 --- a/src/stores/useNavigationStore.js +++ b/src/stores/useNavigationStore.js @@ -6,7 +6,7 @@ import { useRole } from 'src/composables/useRole'; import routes from 'src/router/modules'; export const useNavigationStore = defineStore('navigationStore', () => { - const modules = ['customer', 'claim', 'ticket', 'invoiceOut', 'worker', 'wagon']; + const modules = ['customer', 'claim', 'ticket', 'invoiceOut', 'worker', 'wagon', 'route']; const pinnedModules = ref([]); const role = useRole();