From 265c0bdbe0b7b28f9ec715e5e9b48039965ed396 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 1 Aug 2024 15:25:48 +0700 Subject: [PATCH] updated route complete --- .../components/1_Proposals/listProposals.vue | 2 +- src/modules/07_insignia/router.ts | 61 +++--- src/modules/11_discipline/router.ts | 204 +++++++++--------- src/modules/12_evaluatePersonal/router.ts | 32 +-- src/modules/13_salary/router.ts | 79 +++---- src/modules/14_KPI/router.ts | 31 ++- src/modules/15_development/router.ts | 154 +++++++------ 7 files changed, 275 insertions(+), 288 deletions(-) diff --git a/src/modules/07_insignia/components/1_Proposals/listProposals.vue b/src/modules/07_insignia/components/1_Proposals/listProposals.vue index 5fd87d8bb..14a85628c 100644 --- a/src/modules/07_insignia/components/1_Proposals/listProposals.vue +++ b/src/modules/07_insignia/components/1_Proposals/listProposals.vue @@ -128,7 +128,7 @@ async function fetchData() { /** Function redirect หน้าข้อมูลรอบการเสนอข้อ */ function clickEdit(col: ColId) { - router.push(`/insignia/round-add/${col.period_id}`); + router.push(`/insignia/round/${col.period_id}`); } /** diff --git a/src/modules/07_insignia/router.ts b/src/modules/07_insignia/router.ts index 92d3dc2b1..f76718f1a 100644 --- a/src/modules/07_insignia/router.ts +++ b/src/modules/07_insignia/router.ts @@ -2,7 +2,6 @@ * Router เครื่องราชอิสริยาภรณ์ (insignia) */ -const Main = () => import("@/modules/07_insignia/views/Main.vue"); const ReportView = () => import("../07_insignia/components/report/ReportView.vue"); const report_01 = () => @@ -27,43 +26,33 @@ const insigniaBorrow = () => import("@/modules/07_insignia/components/5_Borrow/Main.vue"); export default [ { - path: "/insignia", - name: "insignia", - component: Main, - meta: { - Auth: true, - Key: [8], - Role: "insignia", - }, - }, - { - path: "/insignia/round-proposals", + path: "/insignia/round", name: "insigniaProposals", component: insigniaProposals, meta: { Auth: true, - Key: [8.1], - Role: "insignia", + Key: "SYS_INSIGNIA_ROUND", + Role: "STAFF", }, }, { - path: "/insignia/round-add/:id", + path: "/insignia/round/:id", name: "roundAddEdit", component: roundAdd, meta: { Auth: true, - Key: [8.1], - Role: "insignia", + Key: "SYS_INSIGNIA_ROUND", + Role: "STAFF", }, }, { - path: "/insignia/round-add", + path: "/insignia/round/add", name: "roundAdd", component: roundAdd, meta: { Auth: true, - Key: [8.1], - Role: "insignia", + Key: "SYS_INSIGNIA_ROUND", + Role: "STAFF", }, }, @@ -73,8 +62,8 @@ export default [ component: RecordInsignia, meta: { Auth: true, - Key: [8.4], - Role: "insignia", + Key: "SYS_INSIGNIA_RECORD", + Role: "STAFF", }, }, { @@ -83,8 +72,8 @@ export default [ component: ReportView, meta: { Auth: true, - Key: [8.5], - Role: "insignia", + Key: "SYS_INSIGNIA_REPORT", + Role: "STAFF", }, }, { @@ -93,8 +82,8 @@ export default [ component: report_01, meta: { Auth: true, - Key: [8.5], - Role: "insignia", + Key: "SYS_INSIGNIA_REPORT", + Role: "STAFF", }, }, { @@ -103,8 +92,8 @@ export default [ component: report_02, meta: { Auth: true, - Key: [8.5], - Role: "insignia", + Key: "SYS_INSIGNIA_REPORT", + Role: "STAFF", }, }, { @@ -113,8 +102,8 @@ export default [ component: listMange, meta: { Auth: true, - Key: [8.6], - Role: "insignia", + Key: "SYS_INSIGNIA_MANAGE", + Role: "STAFF", }, }, { @@ -123,8 +112,8 @@ export default [ component: listAllocate, meta: { Auth: true, - Key: [8.7], - Role: "insignia", + Key: "SYS_INSIGNIA_ALLOCATE", + Role: "STAFF", }, }, { @@ -133,8 +122,8 @@ export default [ component: allocateOrdList, meta: { Auth: true, - Key: [8.9], - Role: "insignia", + Key: "SYS_INSIGNIA_ALLOCATE", + Role: "STAFF", }, }, { @@ -143,8 +132,8 @@ export default [ component: insigniaBorrow, meta: { Auth: true, - Key: [8.9], - Role: "insignia", + Key: "SYS_INSIGNIA_BORROW", + Role: "STAFF", }, }, ]; diff --git a/src/modules/11_discipline/router.ts b/src/modules/11_discipline/router.ts index ca4c998e5..f4392b4f7 100644 --- a/src/modules/11_discipline/router.ts +++ b/src/modules/11_discipline/router.ts @@ -2,8 +2,8 @@ const complaintMain = () => import("@/modules/11_discipline/components/1_Complaint/MainPage.vue"); const factsMain = () => import("@/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue"); -const investigatefactsAdd = () => - import("@/modules/11_discipline/components/2_InvestigateFacts/AddPage.vue"); +// const investigatefactsAdd = () => +// import("@/modules/11_discipline/components/2_InvestigateFacts/AddPage.vue"); const investigatefactsEdit = () => import("@/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue"); const disciplinaryMain = () => @@ -14,8 +14,8 @@ const disciplinaryEdit = () => import( "@/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue" ); -const report = () => - import("@/modules/11_discipline/components/5_Report/MainPage.vue"); +// const report = () => +// import("@/modules/11_discipline/components/5_Report/MainPage.vue"); const directorMain = () => import( "@/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue" @@ -46,10 +46,10 @@ const complaintEdit = () => import("@/modules/11_discipline/components/1_Complaint/EditPage.vue"); const reportType = () => import("@/modules/11_discipline/components/5_Report/DetailPage.vue"); -const InvestigateDisciplinaryAdd = () => - import( - "@/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue" - ); +// const InvestigateDisciplinaryAdd = () => +// import( +// "@/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue" +// ); const oredrMain = () => import("@/modules/11_discipline/components/9_Order/MainPage.vue"); @@ -80,8 +80,8 @@ export default [ component: complaintMain, meta: { Auth: true, - Key: [11.1], - Role: "discipline", + Key: "SYS_DISCIPLINE_COMPLAIN", + Role: "STAFF", }, }, { @@ -90,8 +90,8 @@ export default [ component: complaintAdd, meta: { Auth: true, - Key: [11.1], - Role: "discipline", + Key: "SYS_DISCIPLINE_COMPLAIN", + Role: "STAFF", }, }, { @@ -100,8 +100,8 @@ export default [ component: complaintEdit, meta: { Auth: true, - Key: [11.1], - Role: "discipline", + Key: "SYS_DISCIPLINE_COMPLAIN", + Role: "STAFF", }, }, { @@ -110,8 +110,28 @@ export default [ component: factsMain, meta: { Auth: true, - Key: [11.2], - Role: "discipline", + Key: "SYS_DISCIPLINE_INVESTIGATE", + Role: "STAFF", + }, + }, + // { + // path: "/discipline/investigatefacts/add", + // name: "disciplineInvestigatefactsAdd", + // component: investigatefactsAdd, + // meta: { + // Auth: true, + // Key: "SYS_DISCIPLINE_INVESTIGATE", + // Role: "STAFF", + // }, + // }, + { + path: "/discipline/investigatefacts/:id", + name: "disciplineInvestigatefactsEdit", + component: investigatefactsEdit, + meta: { + Auth: true, + Key: "SYS_DISCIPLINE_INVESTIGATE", + Role: "STAFF", }, }, { @@ -120,8 +140,8 @@ export default [ component: disciplinaryMain, meta: { Auth: true, - Key: [11.3], - Role: "discipline", + Key: "SYS_DISCIPLINE_INTERROGATE", + Role: "STAFF", }, }, { @@ -130,18 +150,28 @@ export default [ component: disciplinaryEdit, meta: { Auth: true, - Key: [11.3], - Role: "discipline", + Key: "SYS_DISCIPLINE_INTERROGATE", + Role: "STAFF", }, }, + // { + // path: "/discipline/disciplinary/add", + // name: "disciplineInvestigateDisciplinaryAdd", + // component: InvestigateDisciplinaryAdd, + // meta: { + // Auth: true, + // Key: "SYS_DISCIPLINE_INTERROGATE", + // Role: "STAFF", + // }, + // }, { path: "/discipline-result", name: "disciplineResult", component: resultMainPage, meta: { Auth: true, - Key: [11.4], - Role: "discipline", + Key: "SYS_DISCIPLINE_RESULT", + Role: "STAFF", }, }, { @@ -150,30 +180,30 @@ export default [ component: resultEditPage, meta: { Auth: true, - Key: [11.4], - Role: "discipline", - }, - }, - { - path: "/discipline/report", - name: "disciplineReport", - component: report, - meta: { - Auth: true, - Key: [11.5], - Role: "discipline", - }, - }, - { - path: "/discipline/report/:type", - name: "disciplineReportType", - component: reportType, - meta: { - Auth: true, - Key: [11.5], - Role: "discipline", + Key: "SYS_DISCIPLINE_RESULT", + Role: "STAFF", }, }, + // { + // path: "/discipline/report", + // name: "disciplineReport", + // component: report, + // meta: { + // Auth: true, + // Key: "", + // Role: "STAFF", + // }, + // }, + // { + // path: "/discipline/report/:type", + // name: "disciplineReportType", + // component: reportType, + // meta: { + // Auth: true, + // Key: [11.5], + // Role: "discipline", + // }, + // }, // ข้อมูลพื้นฐาน กรรมการ { path: "/discipline/director", @@ -181,8 +211,8 @@ export default [ component: directorMain, meta: { Auth: true, - Key: [11.6], - Role: "discipline", + Key: "SYS_DISCIPLINE_INFO", + Role: "STAFF", }, }, { @@ -191,8 +221,8 @@ export default [ component: directorAdd, meta: { Auth: true, - Key: [11.6], - Role: "discipline", + Key: "SYS_DISCIPLINE_INFO", + Role: "STAFF", }, }, { @@ -201,8 +231,8 @@ export default [ component: directorEdit, meta: { Auth: true, - Key: [11.6], - Role: "discipline", + Key: "SYS_DISCIPLINE_INFO", + Role: "STAFF", }, }, { @@ -211,38 +241,8 @@ export default [ component: channelMain, meta: { Auth: true, - Key: [11.6], - Role: "discipline", - }, - }, - { - path: "/discipline/investigatefacts/add", - name: "disciplineInvestigatefactsAdd", - component: investigatefactsAdd, - meta: { - Auth: true, - Key: [11.2], - Role: "discipline", - }, - }, - { - path: "/discipline/investigatefacts/:id", - name: "disciplineInvestigatefactsEdit", - component: investigatefactsEdit, - meta: { - Auth: true, - Key: [11.2], - Role: "discipline", - }, - }, - { - path: "/discipline/investigate-disciplinary/add", - name: "disciplineInvestigateDisciplinaryAdd", - component: InvestigateDisciplinaryAdd, - meta: { - Auth: true, - Key: [11.3], - Role: "discipline", + Key: "SYS_DISCIPLINE_INFO", + Role: "STAFF", }, }, { @@ -251,8 +251,8 @@ export default [ component: channelAdd, meta: { Auth: true, - Key: [11.2], - Role: "discipline", + Key: "SYS_DISCIPLINE_INFO", + Role: "STAFF", }, }, { @@ -261,8 +261,8 @@ export default [ component: channelEdit, meta: { Auth: true, - Key: [11.2], - Role: "discipline", + Key: "SYS_DISCIPLINE_INFO", + Role: "STAFF", }, }, { @@ -271,8 +271,8 @@ export default [ component: listSuspendMainPage, meta: { Auth: true, - Key: [11.4], - Role: "discipline", + Key: "SYS_DISCIPLINE_SUSPENDED", + Role: "STAFF", }, }, { @@ -281,8 +281,8 @@ export default [ component: suspendEditPage, meta: { Auth: true, - Key: [11.4], - Role: "discipline", + Key: "SYS_DISCIPLINE_SUSPENDED", + Role: "STAFF", }, }, { @@ -291,8 +291,8 @@ export default [ component: appealComplain, meta: { Auth: true, - Key: [11.4], - Role: "discipline", + Key: "SYS_DISCIPLINE_APPEAL", + Role: "STAFF", }, }, { @@ -301,8 +301,8 @@ export default [ component: appealComplainAdd, meta: { Auth: true, - Key: [11.4], - Role: "discipline", + Key: "SYS_DISCIPLINE_APPEAL", + Role: "STAFF", }, }, { @@ -311,8 +311,8 @@ export default [ component: appealComplainEdit, meta: { Auth: true, - Key: [11.4], - Role: "discipline", + Key: "SYS_DISCIPLINE_APPEAL", + Role: "STAFF", }, }, @@ -322,8 +322,8 @@ export default [ component: oredrMain, meta: { Auth: true, - Key: [11.4], - Role: "discipline", + Key: "SYS_DISCIPLINE_SENTENCE", + Role: "STAFF", }, }, { @@ -332,8 +332,8 @@ export default [ component: DetailPage, meta: { Auth: true, - Key: [11.4], - Role: "discipline", + Key: "SYS_DISCIPLINE_SENTENCE", + Role: "STAFF", }, }, { @@ -342,8 +342,8 @@ export default [ component: DetailPage, meta: { Auth: true, - Key: [11.4], - Role: "discipline", + Key: "SYS_DISCIPLINE_SENTENCE", + Role: "STAFF", }, }, ]; diff --git a/src/modules/12_evaluatePersonal/router.ts b/src/modules/12_evaluatePersonal/router.ts index 36f766773..d6e28b61f 100644 --- a/src/modules/12_evaluatePersonal/router.ts +++ b/src/modules/12_evaluatePersonal/router.ts @@ -24,8 +24,8 @@ export default [ component: mainPage, meta: { Auth: true, - Key: [1.1], - Role: "evaluate", + Key: "SYS_EVA_REQ", + Role: "STAFF", }, }, { @@ -34,8 +34,8 @@ export default [ component: detailPage, meta: { Auth: true, - Key: [12.2], - Role: "evaluate", + Key: "SYS_EVA_REQ", + Role: "STAFF", }, }, { @@ -44,8 +44,8 @@ export default [ component: directorPage, meta: { Auth: true, - Key: [12.2], - Role: "evaluate", + Key: "SYS_EVA_INFO", + Role: "STAFF", }, }, { @@ -54,8 +54,8 @@ export default [ component: directorAddPage, meta: { Auth: true, - Key: [12.2], - Role: "evaluate", + Key: "SYS_EVA_INFO", + Role: "STAFF", }, }, { @@ -64,8 +64,8 @@ export default [ component: directorEditPage, meta: { Auth: true, - Key: [12.2], - Role: "evaluate", + Key: "SYS_EVA_INFO", + Role: "STAFF", }, }, { @@ -74,8 +74,8 @@ export default [ component: meetingPage, meta: { Auth: true, - Key: [12.2], - Role: "evaluate", + Key: "SYS_EVA_INFO", + Role: "STAFF", }, }, { @@ -84,8 +84,8 @@ export default [ component: meetingAddPage, meta: { Auth: true, - Key: [12.2], - Role: "evaluate", + Key: "SYS_EVA_INFO", + Role: "STAFF", }, }, { @@ -94,8 +94,8 @@ export default [ component: meetingEditPage, meta: { Auth: true, - Key: [12.2], - Role: "evaluate", + Key: "SYS_EVA_INFO", + Role: "STAFF", }, }, ]; diff --git a/src/modules/13_salary/router.ts b/src/modules/13_salary/router.ts index cf318cde5..ca6af3afb 100644 --- a/src/modules/13_salary/router.ts +++ b/src/modules/13_salary/router.ts @@ -11,9 +11,10 @@ const salaryEmployeeLists = () => const commandSalary = () => import("@/modules/13_salary/views/commandSalary.vue"); - const commandSalaryAdd = () => import("@/modules/13_salary/components/Command/detail.vue"); - // const commandSalary = () => import("@/modules/13_salary/views/commandSalary.vue"); - // const commandSalary = () => import("@/modules/13_salary/views/commandSalary.vue"); +const commandSalaryAdd = () => + import("@/modules/13_salary/components/Command/detail.vue"); +// const commandSalary = () => import("@/modules/13_salary/views/commandSalary.vue"); +// const commandSalary = () => import("@/modules/13_salary/views/commandSalary.vue"); export default [ { path: "/salary", @@ -21,28 +22,8 @@ export default [ component: salaryChart, meta: { Auth: true, - Key: [1.1], - Role: "salary", - }, - }, - { - path: "/salary-employee", - name: "salaryEmployeeChart", - component: salaryEmployeeChart, - meta: { - Auth: true, - Key: [1.1], - Role: "salary", - }, - }, - { - path: "/salary-employee/rate/:id", - name: "salaryEmployeeRate", - component: salaryEmployeeRate, - meta: { - Auth: true, - Key: [1.1], - Role: "salary", + Key: "SYS_SALARY_CHART_OFFICER", + Role: "STAFF", }, }, { @@ -51,8 +32,28 @@ export default [ component: salaryRate, meta: { Auth: true, - Key: [1.2], - Role: "salary", + Key: "SYS_SALARY_CHART_OFFICER", + Role: "STAFF", + }, + }, + { + path: "/salary-employee", + name: "salaryEmployeeChart", + component: salaryEmployeeChart, + meta: { + Auth: true, + Key: "SYS_WAGE_CHART_EMP", + Role: "STAFF", + }, + }, + { + path: "/salary-employee/rate/:id", + name: "salaryEmployeeRate", + component: salaryEmployeeRate, + meta: { + Auth: true, + Key: "SYS_WAGE_CHART_EMP", + Role: "STAFF", }, }, { @@ -61,8 +62,8 @@ export default [ component: salaryRound, meta: { Auth: true, - Key: [1.3], - Role: "salary", + Key: "SYS_SALARY_ROUND", + Role: "STAFF", }, }, { @@ -71,8 +72,8 @@ export default [ component: salaryLists, meta: { Auth: true, - Key: [1.4], - Role: "salary", + Key: "SYS_SALARY_OFFICER", + Role: "STAFF", }, }, { @@ -81,8 +82,8 @@ export default [ component: salaryEmployeeLists, meta: { Auth: true, - Key: [1.4], - Role: "salary", + Key: "SYS_WAGE", + Role: "STAFF", }, }, { @@ -91,8 +92,8 @@ export default [ component: commandSalary, meta: { Auth: true, - Key: [1.5], - Role: "salary", + Key: "SYS_SALARY_COMMAND", + Role: "STAFF", }, }, { @@ -101,8 +102,8 @@ export default [ component: commandSalaryAdd, meta: { Auth: true, - Key: [1.5], - Role: "salary", + Key: "SYS_SALARY_COMMAND", + Role: "STAFF", }, }, { @@ -111,8 +112,8 @@ export default [ component: commandSalaryAdd, meta: { Auth: true, - Key: [1.5], - Role: "salary", + Key: "SYS_SALARY_COMMAND", + Role: "STAFF", }, }, ]; diff --git a/src/modules/14_KPI/router.ts b/src/modules/14_KPI/router.ts index 5d9f8bd43..46e39f3ca 100644 --- a/src/modules/14_KPI/router.ts +++ b/src/modules/14_KPI/router.ts @@ -1,7 +1,6 @@ const roundPage = () => import("@/modules/14_KPI/views/round.vue"); const probationDetail = () => import("@/modules/14_KPI/views/mainDetail.vue"); - // const IndicatorByPlan = () => // import("@/modules/14_KPI/views/indicatorByPlan.vue"); // const IndicatorByPlanDetail = () => @@ -14,7 +13,7 @@ const probationDetail = () => import("@/modules/14_KPI/views/mainDetail.vue"); // const competencyAddPage = () => // import("@/modules/14_KPI/components/competency/AddPage.vue"); const listPage = () => import("@/modules/14_KPI/views/list.vue"); -const detailPage = () => import("@/modules/14_KPI/views/detail.vue"); +// const detailPage = () => import("@/modules/14_KPI/views/detail.vue"); const reportPage = () => import("@/modules/14_KPI/views/report.vue"); const detailView = () => import("@/modules/14_KPI/views/detailView.vue"); const ResultsView = () => import("@/modules/14_KPI/views/resultsMain.vue"); @@ -26,8 +25,8 @@ export default [ component: roundPage, meta: { Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Key: "SYS_KPI_ROUND", + Role: "STAFF", }, }, @@ -37,8 +36,8 @@ export default [ component: listPage, meta: { Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Key: "SYS_KPI_LIST", + Role: "STAFF", }, }, { @@ -47,8 +46,8 @@ export default [ component: detailView, meta: { Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Key: "SYS_KPI_LIST", + Role: "STAFF", }, }, { @@ -57,8 +56,8 @@ export default [ component: reportPage, meta: { Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Key: "SYS_REPORT", + Role: "STAFF", }, }, @@ -68,8 +67,8 @@ export default [ component: detailView, meta: { Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Key: "SYS_KPI_LIST", + Role: "STAFF", }, }, @@ -79,8 +78,8 @@ export default [ component: ResultsView, meta: { Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Key: "SYS_RESULT", + Role: "STAFF", }, }, { @@ -89,8 +88,8 @@ export default [ component: probationDetail, meta: { Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Key: "SYS_KPI_LIST", + Role: "STAFF", }, }, ]; diff --git a/src/modules/15_development/router.ts b/src/modules/15_development/router.ts index ff32fd0e9..6c387c797 100644 --- a/src/modules/15_development/router.ts +++ b/src/modules/15_development/router.ts @@ -7,12 +7,12 @@ const employeeHistory = () => import("@/modules/15_development/views/EmployeeHistory.vue"); const Scholarship = () => import("@/modules/15_development/views/Scholarship.vue"); -const historyAdd = () => - import("@/modules/15_development/components/history/AddPage.vue"); +// const historyAdd = () => +// import("@/modules/15_development/components/history/AddPage.vue"); const historyEdit = () => import("@/modules/15_development/components/history/AddPage.vue"); -const historyEmployeeAdd = () => - import("@/modules/15_development/components/historyEmployee/AddPage.vue"); +// const historyEmployeeAdd = () => +// import("@/modules/15_development/components/historyEmployee/AddPage.vue"); const historyEmployeeEdit = () => import("@/modules/15_development/components/historyEmployee/AddPage.vue"); const ScholarshipDetail = () => @@ -31,8 +31,8 @@ export default [ component: mainPage, meta: { Auth: true, - Key: [1.1], - Role: "development", + Key: "SYS_DEV_PROJECT", + Role: "STAFF", }, }, { @@ -41,8 +41,8 @@ export default [ component: mainForm, meta: { Auth: true, - Key: [1.2], - Role: "development", + Key: "SYS_DEV_PROJECT", + Role: "STAFF", }, }, { @@ -51,8 +51,18 @@ export default [ component: mainForm, meta: { Auth: true, - Key: [1.3], - Role: "development", + Key: "SYS_DEV_PROJECT", + Role: "STAFF", + }, + }, + { + path: "/development/record/:id", + name: "developmentRecordPage", + component: RecordPage, + meta: { + Auth: true, + Key: "SYS_DEV_PROJECT", + Role: "STAFF", }, }, { @@ -61,58 +71,8 @@ export default [ component: developmentHistory, meta: { Auth: true, - Key: [1.4], - Role: "development", - }, - }, - { - path: "/development/employee-history", - name: "developmentEmployeeHistory", - component: employeeHistory, - meta: { - Auth: true, - Key: [1.5], - Role: "development", - }, - }, - { - path: "/development/scholarship", - name: "developmentScholarship", - component: Scholarship, - meta: { - Auth: true, - Key: [1.6], - 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", - component: historyAdd, - meta: { - Auth: true, - Key: [1.6], - Role: "development", + Key: "SYS_DEV_HISTORY_OFFICER", + Role: "STAFF", }, }, { @@ -121,18 +81,18 @@ export default [ component: historyEdit, meta: { Auth: true, - Key: [1.6], - Role: "development", + Key: "SYS_DEV_HISTORY_OFFICER", + Role: "STAFF", }, }, { - path: "/development/employee-history/add", - name: "developmentEmployeeHistoryAdd", - component: historyEmployeeAdd, + path: "/development/employee-history", + name: "developmentEmployeeHistory", + component: employeeHistory, meta: { Auth: true, - Key: [1.6], - Role: "development", + Key: "SYS_DEV_HISTORY_EMP", + Role: "STAFF", }, }, { @@ -141,22 +101,60 @@ export default [ component: historyEmployeeEdit, meta: { Auth: true, - Key: [1.6], - Role: "development", + Key: "SYS_DEV_HISTORY_EMP", + Role: "STAFF", }, }, - { - path: "/development/record/:id", - name: "developmentRecordPage", - component: RecordPage, + path: "/development/scholarship", + name: "developmentScholarship", + component: Scholarship, meta: { Auth: true, - Key: [1.6], - Role: "development", + Key: "SYS_DEV_SCHOLARSHIP", + Role: "STAFF", }, }, - + { + path: "/development/scholarship/add", + name: "developmentScholarshipAdd", + component: ScholarshipDetail, + meta: { + Auth: true, + Key: "SYS_DEV_SCHOLARSHIP", + Role: "STAFF", + }, + }, + { + path: "/development/scholarship/:id", + name: "developmentScholarshipid", + component: ScholarshipDetail, + meta: { + Auth: true, + Key: "SYS_DEV_SCHOLARSHIP", + Role: "STAFF", + }, + }, + // { + // path: "/development/history/add", + // name: "developmentHistoryAdd", + // component: historyAdd, + // meta: { + // Auth: true, + // Key: [1.6], + // Role: "development", + // }, + // }, + // { + // path: "/development/employee-history/add", + // name: "developmentEmployeeHistoryAdd", + // component: historyEmployeeAdd, + // meta: { + // Auth: true, + // Key: [1.6], + // Role: "development", + // }, + // }, // { // path: "/development/strategic", // name: "developmentStrategic",