Merge branch 'develop' into devTee

src/api/13_salary/api.salary.ts

@@ -0,0 +1,6 @@
+import env from "../index";
+const evaluateIndividual = `${env.API_URI}/evaluate-individual`;
+
+export default {
+  evaluateIndividual,
+};

src/api/14_KPI/api.KPI.ts

@@ -0,0 +1,6 @@
+import env from "../index";
+const KPI = `${env.API_URI}/KPI`;
+
+export default {
+  KPI,
+};

src/api/15_development/api.development.ts

@@ -0,0 +1,6 @@
+import env from "../index";
+const development = `${env.API_URI}/development`;
+
+export default {
+  development,
+};

src/app.config.ts

@@ -55,6 +55,15 @@ import evaluate from "./api/12_evaluatePersonal/api.evaluate";
 /** API โครงสร้างอัตรากำลัง*/
 import organization from "./api/02_organizational/api.organization";
 
+/** API เงินเดือน/ค่าจ้าง*/
+import salary from "./api/13_salary/api.salary";
+
+/** API ระเมินผลการปฏิบัติราชการระดับบุคคล*/
+import KPI from "./api/14_KPI/api.KPI";
+
+/** API เงินเดือน/ค่าจ้าง*/
+import development from "./api/15_development/api.development";
+
 // environment variables
 export const compettitivePanel = import.meta.env.VITE_COMPETITIVE_EXAM_PANEL;
 export const qualifyDisableExamPanel = import.meta.env
@@ -110,6 +119,10 @@ const API = {
 
   /**evaluate*/
   ...evaluate,
+
+  ...salary,
+  ...KPI,
+  ...development,
 };
 
 export default {

src/interface/request/main/main.ts

@@ -614,6 +614,45 @@ const menuList = readonly<any[]>([
       },
     ],
   },
+  {
+    key: 12,
+    icon: "mdi-cash",
+    activeIcon: "mdi-cash",
+    label: "เงินเดือน/ค่าจ้าง",
+    role: "salary",
+    children: [
+      {
+        key: 12.1,
+        label: "ผังบัญชีเงินเดือน",
+        path: "salaryChart",
+        role: "salary",
+      },
+    ],
+  },
+  {
+    key: 13,
+    icon: "mdi-account-star",
+    activeIcon: "mdi-account-star",
+    label: "ประเมินผลการปฏิบัติราชการระดับบุคคล",
+    role: "evaluateKPI",
+    path: "KPIMain",
+  },
+  {
+    key: 14,
+    icon: "mdi-briefcase-account",
+    activeIcon: "mdi-briefcase-account",
+    label: "พัฒนาบุคลากร/การศึกษาต่อ",
+    role: "development",
+    path: "developmentMain",
+  },
+  // {
+  //   key: 99,
+  //   icon: "mdi-chat",
+  //   activeIcon: "mdi-chat",
+  //   label: "ถาม-ตอบ",
+  //   role: "support",
+  //   path: "support",
+  // },
 ]);
 
 const tabList = readonly<tabType[]>([

src/modules/13_salary/components/SalaryChart/DialogFormMain.vue

@@ -0,0 +1,5 @@
+<script setup lang="ts"></script>
+
+<template>เพิ่ม/แก้ไขผังบัญชีเงินเดือน</template>
+
+<style lang="scss" scoped></style>

src/modules/13_salary/components/SalaryChart/DialogFormRate.vue

@@ -0,0 +1,5 @@
+<script setup lang="ts"></script>
+
+<template>เพิ่ม/แก้ไขอัตราเงินเดือน</template>
+
+<style lang="scss" scoped></style>

src/modules/13_salary/interface/index/Main.ts

@@ -0,0 +1,6 @@
+interface DataOption {
+  id: string;
+  name: string;
+}
+
+export type { DataOption };

src/modules/13_salary/interface/response/Main.ts

@@ -0,0 +1,6 @@
+interface DataOption {
+  id: string;
+  name: string;
+}
+
+export type { DataOption };

src/modules/13_salary/router.ts

@@ -0,0 +1,25 @@
+const salaryChart = () => import("@/modules/13_salary/views/salaryChart.vue");
+const salaryRate = () => import("@/modules/13_salary/views/salaryRate.vue");
+
+export default [
+  {
+    path: "/salary",
+    name: "salaryChart",
+    component: salaryChart,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "salary",
+    },
+  },
+  {
+    path: "/salary/rate",
+    name: "salaryRate",
+    component: salaryRate,
+    meta: {
+      Auth: true,
+      Key: [1.2],
+      Role: "salary",
+    },
+  },
+];

src/modules/13_salary/store/SalaryStore.ts

@@ -0,0 +1,6 @@
+import { defineStore } from "pinia";
+
+// store 
+export const useSalaryDataStore = defineStore("salaryDataStore", () => {
+  return {};
+});

src/modules/13_salary/views/salaryChart.vue

@@ -0,0 +1,12 @@
+<script setup lang="ts">
+import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
+
+/** use*/
+const $q = useQuasar();
+const router = useRouter();
+</script>
+
+<template>หน้ารายการผังบัญชีเงินเดือน</template>
+
+<style scoped></style>

src/modules/13_salary/views/salaryRate.vue

@@ -0,0 +1,12 @@
+<script setup lang="ts">
+import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
+
+/** use*/
+const $q = useQuasar();
+const router = useRouter();
+</script>
+
+<template>หน้ารายการผังบัญชีเงินเดือน</template>
+
+<style scoped></style>

src/modules/14_KPI/components/Table.vue

@@ -0,0 +1,5 @@
+<script setup lang="ts"></script>
+
+<template></template>
+
+<style lang="scss" scoped></style>

src/modules/14_KPI/interface/index/Main.ts

@@ -0,0 +1,6 @@
+interface DataOption {
+  id: string;
+  name: string;
+}
+
+export type { DataOption };

src/modules/14_KPI/interface/response/Main.ts

@@ -0,0 +1,6 @@
+interface DataOption {
+  id: string;
+  name: string;
+}
+
+export type { DataOption };

src/modules/14_KPI/router.ts

@@ -0,0 +1,14 @@
+const mainPage = () => import("@/modules/14_KPI/views/MainPage.vue");
+
+export default [
+  {
+    path: "/KPI",
+    name: "KPIMain",
+    component: mainPage,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
+];

src/modules/14_KPI/store/KPIStore.ts

@@ -0,0 +1,6 @@
+import { defineStore } from "pinia";
+
+// store 
+export const useKPIDataStore = defineStore("KPIDataStore", () => {
+  return {};
+});

src/modules/14_KPI/views/MainPage.vue

@@ -0,0 +1,12 @@
+<script setup lang="ts">
+import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
+
+/** use*/
+const $q = useQuasar();
+const router = useRouter();
+</script>
+
+<template>KPI Page</template>
+
+<style scoped></style>

src/modules/15_development/components/Table.vue

@@ -0,0 +1,5 @@
+<script setup lang="ts"></script>
+
+<template></template>
+
+<style lang="scss" scoped></style>

src/modules/15_development/interface/index/Main.ts

@@ -0,0 +1,6 @@
+interface DataOption {
+  id: string;
+  name: string;
+}
+
+export type { DataOption };

src/modules/15_development/interface/response/Main.ts

@@ -0,0 +1,6 @@
+interface DataOption {
+  id: string;
+  name: string;
+}
+
+export type { DataOption };

src/modules/15_development/router.ts

@@ -0,0 +1,14 @@
+const mainPage = () => import("@/modules/15_development/views/MainPage.vue");
+
+export default [
+  {
+    path: "/development",
+    name: "developmentMain",
+    component: mainPage,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "development",
+    },
+  },
+];

src/modules/15_development/store/developmentStore.ts

@@ -0,0 +1,6 @@
+import { defineStore } from "pinia";
+
+// store 
+export const useDevelopmentDataStore = defineStore("developmentDataStore", () => {
+  return {};
+});

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

@@ -0,0 +1,12 @@
+<script setup lang="ts">
+import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
+
+/** use*/
+const $q = useQuasar();
+const router = useRouter();
+</script>
+
+<template>development Page</template>
+
+<style scoped></style>

src/router/index.ts

@@ -19,6 +19,9 @@ import ModuleOrder from "@/modules/10_order/router";
 import ModuleLeave from "@/modules/09_leave/router";
 import ModuleDiscipline from "@/modules/11_discipline/router";
 import ModuleEvaluate from "@/modules/12_evaluatePersonal/router";
+import ModuleSalary from "@/modules/13_salary/router";
+import ModuleKPI from "@/modules/14_KPI/router";
+import ModuleDevelopment from "@/modules/15_development/router";
 import ModuleSupport from "@/modules/00_support/router";
 
 // TODO: ใช้หรือไม่?
@@ -57,6 +60,9 @@ const router = createRouter({
         ...ModuleLeave,
         ...ModuleDiscipline,
         ...ModuleEvaluate,
+        ...ModuleSalary,
+        ...ModuleKPI,
+        ...ModuleDevelopment,
         ...ModuleSupport,
       ],
     },

src/views/MainLayout.vue

@@ -287,17 +287,18 @@ const myEventHandler = (e: any, setSCroll: boolean) => {
  * @param path string
  */
 const activeMenu = (path: string) => {
-  if (path == "dashboard" && route.fullPath == "/") return true;
-  if (path == "registry" && route.fullPath == "/registry-employee")
-    return false;
-  if (path == "registry" && route.fullPath.includes(`/registry-employee/edit`))
-    return false;
-  if (path == "registry" && route.fullPath.includes(`/registry-employee/add`))
-    return false;
+  // if (path == "dashboard" && route.fullPath == "/") return true;
+  // if (path == "registry" && route.fullPath == "/registry-employee")
+  //   return false;
+  // if (path == "registry" && route.fullPath.includes(`/registry-employee/edit`))
+  //   return false;
+  // if (path == "registry" && route.fullPath.includes(`/registry-employee/add`))
+  //   return false;
 
-  if (path == "registry" && route.fullPath == "/") return false;
+  // if (path == "registry" && route.fullPath == "/") return false;
   // if (path != "registry" && path == "registryEmployee" && route.fullPath == "/registryEmployee") return true;
-  const bool = route.fullPath.includes(`/${path}`);
+  // const bool = route.fullPath.includes(`/${path}`) || route.name === path;
+  const bool = route.name === path;
 
   return bool;
 };
@@ -903,7 +904,8 @@ watch(
                   menuItem.key == 7 ||
                   menuItem.key == 8 ||
                   menuItem.key == 9 ||
-                  menuItem.key == 11
+                  menuItem.key == 11 ||
+                  menuItem.key == 12
                 "
               >
                 <template v-slot:header>