wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

resolve conflicts in worker routes

This commit is contained in:
William Buezas 2024-04-09 15:28:11 -03:00
parent c3835dfd7a
commit fc4a69b2c6
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/router/modules/worker.js
View File

@ -19,7 +19,7 @@ export default {
'WorkerNotificationsManager',
'WorkerPBX',
'WorkerLog',
'WorkerCalendar'
'WorkerCalendar',
],
departmentCard: ['BasicData'],
},
@ -120,22 +120,8 @@ export default {
import('src/pages/Worker/Card/WorkerNotificationsManager.vue'),
},
{
<<<<<<< HEAD
name: 'WorkerCalendar',
path: 'calendar',
meta: {
title: 'calendar',
icon: 'calendar_today',
},
component: () => import('src/pages/Worker/Card/WorkerCalendar.vue'),
},
{
name: 'WorkerPda',
path: 'pda',
=======
path: 'pbx',
name: 'WorkerPBX',
>>>>>>> be9dd8b2b721a19295af30ff538e636ef69e890a
meta: {
title: 'pbx',
icon: 'vn:pbx',
@ -151,6 +137,15 @@ export default {
},
component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
},
{
name: 'WorkerCalendar',
path: 'calendar',
meta: {
title: 'calendar',
icon: 'calendar_today',
},
component: () => import('src/pages/Worker/Card/WorkerCalendar.vue'),
},
],
},
],