diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 7d3682525..d468d3bdb 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -254,6 +254,8 @@ globals: twoFactor: Two factor recoverPassword: Recover password resetPassword: Reset password + ticketsMonitor: Tickets monitor + clientsActionsMonitor: Clients and actions created: Created worker: Worker now: Now diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 8157f1803..d471c8ecc 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -256,6 +256,8 @@ globals: twoFactor: Doble factor recoverPassword: Recuperar contraseña resetPassword: Restablecer contraseña + ticketsMonitor: Monitor de tickets + clientsActionsMonitor: Clientes y acciones created: Fecha creación worker: Trabajador now: Ahora diff --git a/src/pages/Monitor/MonitorClientsActions.vue b/src/pages/Monitor/MonitorClientsActions.vue new file mode 100644 index 000000000..9d0cf05fb --- /dev/null +++ b/src/pages/Monitor/MonitorClientsActions.vue @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/Monitor/MonitorList.vue b/src/pages/Monitor/MonitorList.vue deleted file mode 100644 index 4906247e8..000000000 --- a/src/pages/Monitor/MonitorList.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - {{ t('salesMonitor.clientsOnWebsite') }} - - - {{ t('salesMonitor.recentOrderActions') }} - - - - - - - - {{ t('salesMonitor.clientsOnWebsite') }} - - - - - - {{ t('salesMonitor.recentOrderActions') }} - - - - - - - - - - - {{ t('salesMonitor.ticketsMonitor') }} - - - - - - - - - - diff --git a/src/pages/Monitor/MonitorTickets.vue b/src/pages/Monitor/MonitorTickets.vue new file mode 100644 index 000000000..57ba00e57 --- /dev/null +++ b/src/pages/Monitor/MonitorTickets.vue @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/src/pages/Monitor/SalesOrdersTable.vue b/src/pages/Monitor/SalesOrdersTable.vue index 496d5134c..dc723e541 100644 --- a/src/pages/Monitor/SalesOrdersTable.vue +++ b/src/pages/Monitor/SalesOrdersTable.vue @@ -27,13 +27,21 @@ function exprBuilder(param, value) { const columns = computed(() => [ { - label: t('salesOrdersTable.date'), - name: 'date', - field: 'dated', + label: t('salesOrdersTable.dateSend'), + name: 'dateSend', + field: 'dateSend', align: 'left', orderBy: 'date_send', columnFilter: false, }, + { + label: t('salesOrdersTable.dateMake'), + name: 'dateMake', + field: 'dateMake', + align: 'left', + orderBy: 'date_make', + columnFilter: false, + }, { label: t('salesOrdersTable.client'), name: 'clientFk', @@ -144,7 +152,7 @@ const openTab = (id) => {{ t('salesOrdersTable.delete') }} - + > {{ toDateFormat(row.date_send) }} - {{ toDateTimeFormat(row.date_make) }} + + + + + {{ row.date_make }} diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml index f58db7854..629005191 100644 --- a/src/pages/Monitor/locale/en.yml +++ b/src/pages/Monitor/locale/en.yml @@ -11,7 +11,8 @@ salesClientsTable: client: Client salesOrdersTable: delete: Delete - date: Date + dateSend: Send date + dateMake: Make date client: Client salesPerson: Salesperson deleteConfirmTitle: Delete selected elements diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml index 918b51813..cf73550be 100644 --- a/src/pages/Monitor/locale/es.yml +++ b/src/pages/Monitor/locale/es.yml @@ -11,7 +11,8 @@ salesClientsTable: client: Cliente salesOrdersTable: delete: Eliminar - date: Fecha + dateSend: Fecha de envío + dateMake: Fecha de realización client: Cliente salesPerson: Comercial deleteConfirmTitle: Eliminar los elementos seleccionados diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js index f0db8d3f3..904f2db74 100644 --- a/src/router/modules/monitor.js +++ b/src/router/modules/monitor.js @@ -11,7 +11,7 @@ export default { component: RouterView, redirect: { name: 'MonitorMain' }, menus: { - main: ['MonitorList'], + main: ['MonitorTickets', 'MonitorClientsActions'], card: [], }, children: [ @@ -19,16 +19,26 @@ export default { path: '', name: 'MonitorMain', component: () => import('src/components/common/VnSectionMain.vue'), - redirect: { name: 'MonitorList' }, + redirect: { name: 'MonitorTickets' }, children: [ { - path: 'list', - name: 'MonitorList', + path: 'tickets', + name: 'MonitorTickets', meta: { - title: 'list', + title: 'ticketsMonitor', icon: 'grid_view', }, - component: () => import('src/pages/Monitor/MonitorList.vue'), + component: () => import('src/pages/Monitor/MonitorTickets.vue'), + }, + { + path: 'clients-actions', + name: 'MonitorClientsActions', + meta: { + title: 'clientsActionsMonitor', + icon: 'grid_view', + }, + component: () => + import('src/pages/Monitor/MonitorClientsActions.vue'), }, ], },