diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index f8b912cd7..ce7fada9c 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -889,7 +889,8 @@ export default { basicData: 'Basic Data', summary: 'Summary', tickets: 'Tickets', - log: 'Log' + log: 'Log', + autonomous: 'Autonomous', }, cmr: { list: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 5cf527d01..44d282f44 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -944,6 +944,7 @@ export default { summary: 'Summary', tickets: 'Tickets', log: 'Historial', + autonomous: 'Autónomos', }, cmr: { list: { diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue new file mode 100644 index 000000000..a36656c1d --- /dev/null +++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue @@ -0,0 +1,15 @@ + + + + + + diff --git a/src/pages/Route/Card/RouteAutonomousFilter.vue b/src/pages/Route/Card/RouteAutonomousFilter.vue new file mode 100644 index 000000000..ec30458ce --- /dev/null +++ b/src/pages/Route/Card/RouteAutonomousFilter.vue @@ -0,0 +1,237 @@ + + + + (agencyList = data)" + auto-load + /> + (agencyAgreementList = data)" + auto-load + /> + (supplierList = data)" + auto-load + /> + + + + {{ t(`params.${tag.label}`) }}: + {{ formatFn(tag.value) }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +en: + params: + agencyModeFk: Agency route + m3: m³ + from: From + to: To + date: Date + agencyFk: Agency agreement + packages: Packages + price: Price + invoiceInFk: Received + supplierFk: Autonomous +es: + params: + agencyModeFk: Agencia ruta + m3: m³ + from: Desde + to: Hasta + date: Fecha + agencyFk: Agencia Acuerdo + packages: Bultos + price: Precio + invoiceInFk: Recibida + supplierFk: Autónomos + From: Desde + To: Hasta + Date: Fecha + Agency route: Agencia Ruta + Agency agreement: Agencia Acuerdo + Packages: Bultos + Price: Precio + Received: Recibida + Autonomous: Autónomos + diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue new file mode 100644 index 000000000..00322386d --- /dev/null +++ b/src/pages/Route/RouteAutonomous.vue @@ -0,0 +1,301 @@ + + + + + + + + + + + + {{ t('globals.collapseMenu') }} + + + + + + + + + + + + + + + + + {{ t('Total') }} + + + {{ toCurrency(total) }} + + + + + + + + + + + + {{ props.value }} + + + + + + + + {{ dashIfEmpty(props.value) }} + + + + + + + + {{ props.value }} + + + + + + + + + {{ t('Preview') }} + + + + + + + + + + + + + {{ t('Create invoiceIn') }} + + + + + + + + +es: + Search autonomous: Buscar autónomos + You can search by autonomous reference: Puedes buscar por referencia del autónomo + Create invoiceIn: Crear factura recibida + Two autonomous cannot be counted at the same time: Dos autonónomos no pueden ser contabilizados al mismo tiempo + Date: Fecha + Agency route: Agencia Ruta + Agency agreement: Agencia Acuerdo + Packages: Bultos + Price: Precio + Received: Recibida + Autonomous: Autónomos + diff --git a/src/router/modules/route.js b/src/router/modules/route.js index abd7db1e5..297fcedf8 100644 --- a/src/router/modules/route.js +++ b/src/router/modules/route.js @@ -10,7 +10,7 @@ export default { component: RouterView, redirect: { name: 'RouteMain' }, menus: { - main: ['RouteList', 'CmrList'], + main: ['RouteList', 'RouteAutonomous', 'CmrList'], card: ['RouteBasicData', 'RouteTickets', 'RouteLog'], }, children: [ @@ -20,15 +20,6 @@ export default { component: () => import('src/pages/Route/RouteMain.vue'), redirect: { name: 'RouteList' }, children: [ - { - path: 'cmr', - name: 'CmrList', - meta: { - title: 'cmrsList', - icon: 'fact_check', - }, - component: () => import('src/pages/Route/Cmr/CmrList.vue'), - }, { path: 'list', name: 'RouteList', @@ -46,6 +37,24 @@ export default { }, component: () => import('src/pages/Route/Card/RouteForm.vue'), }, + { + path: 'agency-term', + name: 'RouteAutonomous', + meta: { + title: 'autonomous', + icon: 'vn:agency-term', + }, + component: () => import('src/pages/Route/RouteAutonomous.vue'), + }, + { + path: 'cmr', + name: 'CmrList', + meta: { + title: 'cmrsList', + icon: 'fact_check', + }, + component: () => import('src/pages/Route/Cmr/CmrList.vue'), + }, ], }, {