hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'nice_dev' into develop

Browse source 
# Conflicts:
#	src/modules/15_development/router.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-04-02 16:02:06 +07:00
commit a231dda03d
3 changed files with 1080 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/15_development/router.ts
View file

@ -9,6 +9,10 @@ const Scholarship = () =>
import("@/modules/15_development/views/Scholarship.vue");
const historyAdd = () => import('@/modules/15_development/components/history/AddPage.vue')
const historyEmployeeAdd = () => import('@/modules/15_development/components/historyEmployee/AddPage.vue')
const ScholarshipDetail = () =>
import("@/modules/15_development/components/scholarship/DetailView.vue");
const historyAdd = () =>
import("@/modules/15_development/components/history/AddPage.vue");
export default [
{
path: "/development",
@ -70,6 +74,26 @@ export default [
Role: "development",
},
},
{
path: "/development/scholarship/add",
name: "developmentScholarshipAdd",
component: ScholarshipDetail,
meta: {
Auth: true,
Key: [1.6],
Role: "development",
},
},
{
path: "/development/scholarship/:id",
name: "developmentScholarshipid",
component: ScholarshipDetail,
meta: {
Auth: true,
Key: [1.6],
Role: "development",
},
},
{
path: "/development/history/add",
name: "developmentHistoryAdd",