Merge branch 'develop' into devTee

src/interface/request/main/main.ts

@@ -684,9 +684,34 @@ const menuList = readonly<any[]>([
     key: 14,
     icon: "mdi-briefcase-account",
     activeIcon: "mdi-briefcase-account",
-    label: "พัฒนาบุคลากร/การศึกษาต่อ",
+    label: "พัฒนาบุคลากร",
     role: "development",
-    path: "developmentMain",
+    children: [
+      {
+        key: 14.1,
+        label: "โครงการ/หลักสูตรการฝึกอบรม",
+        path: "developmentMain",
+        role: "development",
+      },
+      {
+        key: 14.2,
+        label: "ประวัติฝึกอบรม/ดูงาน ขรก.",
+        path: "developmentHistory",
+        role: "development",
+      },
+      {
+        key: 14.3,
+        label: "ประวัติฝึกอบรม/ดูงานลูกจ้าง",
+        path: "developmentEmployeeHistory",
+        role: "development",
+      },
+      {
+        key: 14.4,
+        label: "ทุนการศึกษา/ฝึกอบรม",
+        path: "developmentScholarship",
+        role: "development",
+      },
+    ],
   },
   // {
   //   key: 99,

src/modules/04_registry/components/TableProfile.vue

@@ -458,7 +458,7 @@ import PopupADdEmployee from "@/components/DialogAddEmployee.vue";
 const currentPage = ref<number>(1);
 const maxPage = ref<number>(1);
 const page = ref<number>(1);
-const rowsPerPage = ref<number>(20);
+const rowsPerPage = ref<number>(50);
 
 
 const attrs = ref<any>(useAttrs());

src/modules/04_registry/views/Main.vue

@@ -87,7 +87,7 @@
             :page="page"
             :maxPage="maxPage"
             @update:pagination="updatePagingProp"
-            :rows-per-page-options="[20, 50, 100, 200]"
+            :rows-per-page-options="[50, 100, 200, 500]"
           >
             <template #columns="props">
               <q-tr
@@ -174,7 +174,7 @@ const { profileData, changeProfileColumns } = store;
 const { changeTreeRegister, selectedRegister, expandedRegister } = dataStore;
 
 const maxPage = ref<number>(1);
-const rowsPerPage = ref<number>(20);
+const rowsPerPage = ref<number>(50);
 const page = ref<number>(1);
 
 const mixin = useCounterMixin();
@@ -200,7 +200,7 @@ const employeeLevel = ref<string>("");
 const posNo = ref<string>("");
 const initialPagination = ref<Pagination>({
   page: 1,
-  rowsPerPage: 10,
+  rowsPerPage: 50,
 });
 const expanded = ref<string[]>([]);
 const selected = ref<string>("");
@@ -1213,7 +1213,7 @@ const changeTab = () => {
 };
 
 const onSelected = async (id: string) => {
-  rowsPerPage.value = 20;
+  rowsPerPage.value = 50;
   page.value = 1;
   await clickTree();
   await doSearch();
@@ -1268,33 +1268,33 @@ const doSearch = async () => {
     });
   }
 
-  if (isShowRetire.value !== null) {
+  // if (isShowRetire.value !== null) {
-    cirteria.push({
+  //   cirteria.push({
-      criteriaType: "is_retire",
+  //     criteriaType: "is_retire",
-      criteriaValue: isShowRetire.value.toString(),
+  //     criteriaValue: isShowRetire.value.toString(),
-    });
+  //   });
-  }
+  // }
 
-  if (isProbation.value !== null) {
+  // if (isProbation.value !== null) {
-    cirteria.push({
+  //   cirteria.push({
-      criteriaType: "is_probation",
+  //     criteriaType: "is_probation",
-      criteriaValue: isProbation.value.toString(),
+  //     criteriaValue: isProbation.value.toString(),
-    });
+  //   });
-  }
+  // }
 
-  if (retireYear.value !== null && retireYear.value !== undefined) {
+  // if (retireYear.value !== null && retireYear.value !== undefined) {
-    cirteria.push({
+  //   cirteria.push({
-      criteriaType: "retire_year",
+  //     criteriaType: "retire_year",
-      criteriaValue: retireYear.value,
+  //     criteriaValue: retireYear.value,
-    });
+  //   });
-  }
+  // }
 
-  if (govAge.value !== null && govAge.value !== undefined) {
+  // if (govAge.value !== null && govAge.value !== undefined) {
-    cirteria.push({
+  //   cirteria.push({
-      criteriaType: "gov_age",
+  //     criteriaType: "gov_age",
-      criteriaValue: govAge.value,
+  //     criteriaValue: govAge.value,
-    });
+  //   });
-  }
+  // }
 
   if (employeeClass.value == "officer" || employeeClass.value == "employee") {
     profileType.value = employeeClass.value;
@@ -1321,47 +1321,47 @@ const doSearch = async () => {
     }
   }
 
-  if (positionPath.value !== null && positionPath.value !== "") {
+  // if (positionPath.value !== null && positionPath.value !== "") {
-    cirteria.push({
+  //   cirteria.push({
-      criteriaType: "position_path",
+  //     criteriaType: "position_path",
-      criteriaValue: positionPath.value,
+  //     criteriaValue: positionPath.value,
-    });
+  //   });
-  }
+  // }
 
-  if (positionLevel.value !== null && positionLevel.value !== "") {
+  // if (positionLevel.value !== null && positionLevel.value !== "") {
-    cirteria.push({
+  //   cirteria.push({
-      criteriaType: "position_level",
+  //     criteriaType: "position_level",
-      criteriaValue: positionLevel.value,
+  //     criteriaValue: positionLevel.value,
-    });
+  //   });
-  }
+  // }
 
-  if (positionExecutive.value !== null && positionExecutive.value !== "") {
+  // if (positionExecutive.value !== null && positionExecutive.value !== "") {
-    cirteria.push({
+  //   cirteria.push({
-      criteriaType: "position_executive",
+  //     criteriaType: "position_executive",
-      criteriaValue: positionExecutive.value,
+  //     criteriaValue: positionExecutive.value,
-    });
+  //   });
-  }
+  // }
 
-  if (employeePosition.value !== null && employeePosition.value !== "") {
+  // if (employeePosition.value !== null && employeePosition.value !== "") {
-    cirteria.push({
+  //   cirteria.push({
-      criteriaType: "employee_position",
+  //     criteriaType: "employee_position",
-      criteriaValue: employeePosition.value,
+  //     criteriaValue: employeePosition.value,
-    });
+  //   });
-  }
+  // }
 
-  if (employeeLevel.value !== null && employeeLevel.value !== "") {
+  // if (employeeLevel.value !== null && employeeLevel.value !== "") {
-    cirteria.push({
+  //   cirteria.push({
-      criteriaType: "employee_level",
+  //     criteriaType: "employee_level",
-      criteriaValue: employeeLevel.value,
+  //     criteriaValue: employeeLevel.value,
-    });
+  //   });
-  }
+  // }
 
-  if (posNo.value !== null && posNo.value !== "") {
+  // if (posNo.value !== null && posNo.value !== "") {
-    cirteria.push({
+  //   cirteria.push({
-      criteriaType: "pos_no",
+  //     criteriaType: "pos_no",
-      criteriaValue: posNo.value,
+  //     criteriaValue: posNo.value,
-    });
+  //   });
-  }
+  // }
 
   if (selected.value == null || selected.value == "") return;
   showLoader();

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

@@ -186,7 +186,7 @@ async function getAgencyPosition(id: string) {
           (e: DataOption) => e.id === data.rootId
         );
 
-        agencyFilter.value = position ? position.id : "";
+        agencyFilter.value = position ? position.id : "ALL";
 
         if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
           fetchSalalyPeriod(

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

@@ -186,7 +186,7 @@ async function getAgencyPosition(id: string) {
           (e: DataOption) => e.id === data.rootId
         );
 
-        agencyFilter.value = position ? position.id : "";
+        agencyFilter.value = position ? position.id : "ALL";
 
         if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
           fetchSalalyPeriod(

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>

src/views/MainLayout.vue

@@ -740,7 +740,8 @@ watch(
                     menuItem.key == 8 ||
                     menuItem.key == 9 ||
                     menuItem.key == 11 ||
-                    menuItem.key == 12
+                    menuItem.key == 12 ||
+                    menuItem.key == 14
                   "
                 >
                   <div class="row items-center no-wrap">
@@ -904,7 +905,8 @@ watch(
                   menuItem.key == 8 ||
                   menuItem.key == 9 ||
                   menuItem.key == 11 ||
-                  menuItem.key == 12
+                  menuItem.key == 12 ||
+                  menuItem.key == 14
                 "
               >
                 <template v-slot:header>