แก้ไขเมนูทะเบียนประวัติ

src/components/Dialogs/PopupPersonalNew.vue

@@ -155,7 +155,7 @@ async function fetchProfileGov(id: string) {
 }
 
 function redirecToRegistry() {
-  router.push(`/registry-person${empType.value}/${props.id}`);
+  router.push(`/registry-officer${empType.value}/${props.id}`);
   modal.value = false;
 }
 

src/modules/04_registryPerson/components/DialogHistory.vue

@@ -253,7 +253,9 @@ function filterFn(val: string, update: Function) {
  */
 function clickRedirect(id: string) {
   const url =
-    employeeClass.value === "officer" ? "registry-person" : "registry-employee";
+    employeeClass.value === "officer"
+      ? "registry-officer"
+      : "registry-employee";
   router.push(`${url}/${id}`);
 }
 

src/modules/04_registryPerson/components/TableView.vue

@@ -193,7 +193,7 @@ function onClickHistory() {
  */
 function onClickViewDetail(id: string) {
   if (empType.value === "officer") {
-    router.push(`/registry-person/${id}`);
+    router.push(`/registry-officer/${id}`);
   } else {
     router.push(`/registry-employee/${id}`);
   }
@@ -203,7 +203,7 @@ function onClickViewDetail(id: string) {
  * function redirect ไปหน้ารายการคำร้องขอแก้ไขข้อมูล
  */
 function redirectToPagePetition() {
-  router.push(`/registry-person/request-edit`);
+  router.push(`/registry-officer/request-edit`);
 }
 
 watch(

src/modules/04_registryPerson/router.ts

@@ -7,19 +7,29 @@ const requestEdit = () =>
 
 export default [
   {
-    path: "/registry-person",
+    path: "/registry-officer",
     name: "registryNew",
     component: listPage,
     meta: {
       Auth: true,
-      Key: "SYS_REGISTRY",
+      Key: "SYS_REGISTRY_OFFICER",
       Role: "STAFF",
     },
   },
   {
-    path: "/registry-person/:id",
+    path: "/registry-officer/:id",
     name: "registryNewByid",
     component: detailPage,
+    meta: {
+      Auth: true,
+      Key: "SYS_REGISTRY_OFFICER",
+      Role: "STAFF",
+    },
+  },
+  {
+    path: "/registry-employee",
+    name: "registryEmployeeList",
+    component: listPage,
     meta: {
       Auth: true,
       Key: "SYS_REGISTRY",
@@ -37,12 +47,12 @@ export default [
     },
   },
   {
-    path: "/registry-person/request-edit",
+    path: "/registry-officer/request-edit",
     name: "registryNewRequestEdit",
     component: requestEdit,
     meta: {
       Auth: true,
-      Key: "SYS_REGISTRY",
+      Key: "SYS_REGISTRY_OFFICER",
       Role: "STAFF",
     },
   },

src/modules/04_registryPerson/views/list.vue

@@ -19,10 +19,12 @@ import avatar from "@/assets/avatar_user.jpg";
 /** importStore*/
 import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 import { useCounterMixin } from "@/stores/mixin";
+import { useRoute } from "vue-router";
 
 const $q = useQuasar();
 const store = useRegistryNewDataStore();
 const { showLoader, hideLoader, messageError } = useCounterMixin();
+const route = useRoute();
 
 const mode = ref<"table" | "card">("table");
 
@@ -72,6 +74,7 @@ function fetchType() {
   http
     .get(config.API.orgPosType)
     .then((res) => {
+      console.log("this fetchType", res.data.result);
       store.fetchType(res.data.result);
     })
     .catch((err) => {
@@ -86,6 +89,8 @@ function fetchOptionGroup() {
   http
     .get(config.API.orgEmployeeType)
     .then((res) => {
+      console.log("this fetchOptionGroup===>", res.data.result);
+
       store.fetchType(res.data.result);
     })
     .catch((err) => {
@@ -206,7 +211,6 @@ function onClickShowFilter() {
   isShowFilter.value = !isShowFilter.value;
   isShowBtnFilter.value = false;
   if (isShowFilter.value) {
-    fetchType();
     // fetchLevel();
     fetchYearOption();
   }
@@ -232,14 +236,16 @@ function onclickSearch() {
  * function เลือกประเภทข้าราชการ
  * @param item ประเภทข้าราชการ
  */
-function selectType(item: DataOption) {
+async function selectType() {
-  labelOption.type = item.name;
+  // labelOption.type = item.name;
-  empType.value = item.id;
+  empType.value = await (route.name == "registryNew" ? "officer" : "perm");
   formFilter.page = 1;
 
+  console.log("empType===>", empType.value);
+
   labelOption.posType = "ทั้งหมด";
   labelOption.posLevel = "ทั้งหมด";
-  if (item.id !== "officer") {
+  if (empType.value !== "officer") {
     formFilter.isShowRetire = null;
     formFilter.isProbation = null;
     fetchOptionGroup();
@@ -294,14 +300,18 @@ function clearSelect(t: string) {
 }
 
 onMounted(async () => {
-  fetchDataPerson();
+  selectType();
 });
 </script>
+
 <template>
   <q-card class="q-mt-md">
     <q-card-section class="card-img q-pb-lg">
       <div class="text-h5 text-center q-py-md text-weight-medium">
         ค้นหาข้อมูลทะเบียนประวัติ
+        {{
+          empType === "officer" ? "ข้าราชการ กทม. สามัญ" : "ลูกจ้างประจำ กทม."
+        }}
       </div>
       <div class="row justify-center">
         <div
@@ -370,7 +380,7 @@ onMounted(async () => {
             class="row q-mt-sm q-gutter-sm justify-center"
             v-if="isShowFilter"
           >
-            <q-btn-dropdown
+            <!-- <q-btn-dropdown
               flat
               rounded
               dense
@@ -396,7 +406,7 @@ onMounted(async () => {
               </q-list>
             </q-btn-dropdown>
 
-            <q-separator inset vertical class="lineFil" />
+            <q-separator inset vertical class="lineFil" /> -->
 
             <q-btn-dropdown
               rounded

src/modules/07_insignia/components/2_Manage/Tab1.vue

@@ -697,7 +697,7 @@ async function fecthInsignia() {
  * @param id profileId
  */
 function nextPage(id: string) {
-  router.push(`/registry-person/${id}`);
+  router.push(`/registry-officer/${id}`);
 }
 
 /** ค้นหาข้อมุล table*/

src/modules/07_insignia/components/2_Manage/Tab2.vue

@@ -172,7 +172,7 @@ function changtypeOc() {
  * @param id profileId
  */
 function nextPage(id: string) {
-  router.push(`/registry-person/${id}`);
+  router.push(`/registry-officer/${id}`);
 }
 
 /** filter table*/

src/modules/07_insignia/components/2_Manage/Tab3.vue

@@ -172,7 +172,7 @@ async function changtypeOc() {
  * @param id profileId
  */
 function nextPage(id: string) {
-  router.push(`/registry-person/${id}`);
+  router.push(`/registry-officer/${id}`);
 }
 
 /** ข้อมูล Table*/

src/modules/08_registryEmployee/components/AddEmployee/Main.vue

@@ -348,7 +348,7 @@ const addData = async () => {
 
 // ปุ่ม back
 const clickBack = () => {
-  router.push("/registry-employee");
+  router.push("/registry-temp");
 };
 </script>
 

src/modules/08_registryEmployee/router.ts

@@ -18,7 +18,7 @@ const DetailView = defineAsyncComponent(
 
 export default [
   {
-    path: "/registry-employee",
+    path: "/registry-temp",
     name: "registry-employee",
     component: Main,
     meta: {
@@ -28,7 +28,7 @@ export default [
     },
   },
   {
-    path: "/registry-employee/:id",
+    path: "/registry-temp/:id",
     name: "registry-employeeId",
     component: DetailView,
     meta: {

src/modules/08_registryEmployee/stores/registry-employee.ts

@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 
-export const useRegistryEmp = defineStore("registry-employee", () => {
+export const useRegistryEmp = defineStore("registryEmployeeTemp", () => {
   /**
    * function คำนวณหาอายุ
    * @param birthDate วันเกิด

src/modules/08_registryEmployee/views/Main.vue

@@ -251,7 +251,7 @@ function onClickDelete(id: string) {
 }
 
 function redirectToPageDetail(id: string) {
-  router.push(`/registry-employee/${id}`);
+  router.push(`/registry-temp/${id}`);
 }
 
 /** เพิ่มข้อมูลลูกจ้างชั่วคราว*/

src/modules/08_registryEmployee/views/MainOld.vue

@@ -275,13 +275,13 @@ const resetFilter = () => {
 
 // เพิ่มข้อมูลลูกจ้าง
 const clickAdd = () => {
-  router.push(`/registry-employee/add`);
+  router.push(`/registry-temp/add`);
 };
 
 // ดูรายการแก้ไขรายชื่อ
 const redirectToPage = (id?: string, status?: string) => {
   if (!(status == "REPORT" || status == "DONE")) {
-    router.push(`/registry-employee/edit/${id}`);
+    router.push(`/registry-temp/edit/${id}`);
   }
 };
 

src/modules/13_salary/components/DialogInfoMain.vue

@@ -79,7 +79,7 @@ function fetchProfile(id: string, avatarName: string) {
  * function rediract ไปทะเบียนประวัติ
  */
 function redirecToRegistry() {
-  router.push(`/registry-person${props.employeeClass}/${profileId.value}`);
+  router.push(`/registry-officer${props.employeeClass}/${profileId.value}`);
   modal.value = false;
 }