Merge branch 'develop' into devTee

src/modules/15_development/router.ts

@@ -1,6 +1,12 @@
 const mainPage = () => import("@/modules/15_development/views/MainPage.vue");
 const mainForm = () =>
   import("@/modules/15_development/components/MainTab.vue");
+const developmentHistory = () =>
+  import("@/modules/15_development/views/History.vue");
+const employeeHistory = () =>
+  import("@/modules/15_development/views/EmployeeHistory.vue");
+const Scholarship = () =>
+  import("@/modules/15_development/views/Scholarship.vue");
 
 export default [
   {
@@ -19,7 +25,7 @@ export default [
     component: mainForm,
     meta: {
       Auth: true,
-      Key: [1.1],
+      Key: [1.2],
       Role: "development",
     },
   },
@@ -29,7 +35,37 @@ export default [
     component: mainForm,
     meta: {
       Auth: true,
-      Key: [1.1],
+      Key: [1.3],
+      Role: "development",
+    },
+  },
+  {
+    path: "/development/history",
+    name: "developmentHistory",
+    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",
     },
   },

src/modules/15_development/views/EmployeeHistory.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        ประวัติฝึกอบรม/ดูงานลูกจ้าง
+    </div>
+</template>

src/modules/15_development/views/History.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        ประวัติฝึกอบรม/ดูงาน ขรก.
+    </div>
+</template>

src/modules/15_development/views/Scholarship.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        ทุนการศึกษา/ฝึกอบรม
+    </div>
+</template>