Merge branch 'develop' into working
# Conflicts: # src/interface/request/main/main.ts # src/modules/09_leave/router.ts
This commit is contained in:
commit
511fe670ae
6 changed files with 583 additions and 12 deletions
|
|
@ -4,6 +4,7 @@ const leaveMain = () => import("@/modules/09_leave/views/LeaveListMain.vue");
|
|||
const reportMain = () => import("@/modules/09_leave/views/ReportMain.vue")
|
||||
const leaveDetail = () => import("@/modules//09_leave/components/2_Leave/DetailLeave.vue")
|
||||
const RoundMain = () => import("@/modules/09_leave/views/RoundMain.vue")
|
||||
const workingtime = () => import('@/modules/09_leave/components/3_WorkTime/MainPage.vue')
|
||||
|
||||
export default [
|
||||
{
|
||||
|
|
@ -56,5 +57,15 @@ export default [
|
|||
Role: "coin",
|
||||
},
|
||||
},
|
||||
{
|
||||
path: "/workingtime",
|
||||
name: "/working-time",
|
||||
component: workingtime,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [9],
|
||||
Role: "coin",
|
||||
},
|
||||
},
|
||||
|
||||
]
|
||||
Loading…
Add table
Add a link
Reference in a new issue