From b02e8283d0280955189c1676dd7df9e502e64b70 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 28 Aug 2024 17:34:38 +0700
Subject: [PATCH 1/6] =?UTF-8?q?=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/4_Allocate/Main.vue            |  5 +-
 .../components/4_Allocate/OrgList.vue         | 28 ++------
 .../components/5_Borrow/DialogForm.vue        | 12 ++--
 .../07_insignia/components/5_Borrow/Main.vue  |  4 +-
 src/modules/07_insignia/views/ResultPage.vue  | 64 ++++++++-----------
 5 files changed, 40 insertions(+), 73 deletions(-)

diff --git a/src/modules/07_insignia/components/4_Allocate/Main.vue b/src/modules/07_insignia/components/4_Allocate/Main.vue
index d0d92fb79..b0cc2534f 100644
--- a/src/modules/07_insignia/components/4_Allocate/Main.vue
+++ b/src/modules/07_insignia/components/4_Allocate/Main.vue
@@ -566,10 +566,7 @@ onMounted(async () => {
                     <q-tooltip> รายละเอียด</q-tooltip>
                   </q-btn>
                   <q-btn
-                    v-if="
-                      checkPermission($route)?.attrIsGet &&
-                      checkPermission($route)?.attrIsUpdate
-                    "
+                    v-if="checkPermission($route)?.attrIsUpdate"
                     flat
                     round
                     dense
diff --git a/src/modules/07_insignia/components/4_Allocate/OrgList.vue b/src/modules/07_insignia/components/4_Allocate/OrgList.vue
index d633d177e..7db9c94c9 100644
--- a/src/modules/07_insignia/components/4_Allocate/OrgList.vue
+++ b/src/modules/07_insignia/components/4_Allocate/OrgList.vue
@@ -134,7 +134,9 @@ async function fecthListData() {
     .catch((err) => {
       messageError($q, err);
     })
-    .finally(() => hideLoader());
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 /** funcion เรียกข้อมูลหน่วยงานจัดสรรเครื่องราชอิสริยาภรณ์ */
@@ -160,21 +162,6 @@ async function fetchOrgList() {
     .catch((err) => {
       messageError($q, err);
     });
-  // showLoader();
-  // await http
-  //   .get(config.API.typeOc())
-  //   .then(async (response: any) => {
-  //     orgList.value = response.data.result.map((e: any) => ({
-  //       id: e.organizationId,
-  //       name: e.organizationName,
-  //     }));
-  //   })
-  //   .catch((err) => {
-  //     messageError($q, err);
-  //   })
-  //   .finally(() => {
-  //     hideLoader();
-  //   });
 }
 
 /** funcion ย้อนกลับหน้าจัดสรรเครื่องราชอิสริยาภรณ์*/
@@ -286,10 +273,8 @@ const resetFilter = () => {
 
 /** Hook*/
 onMounted(async () => {
-  fecthDashboard();
-  fecthListData();
   name.value = DataStore.insigniaName;
-  fetchOrgList();
+  await Promise.all([fecthDashboard(), fecthListData(), fetchOrgList()]);
 });
 </script>
 
@@ -412,10 +397,7 @@ onMounted(async () => {
             <q-tr :props="props">
               <q-td auto-width>
                 <q-btn
-                  v-if="
-                    checkPermission($route)?.attrIsGet &&
-                    checkPermission($route)?.attrIsUpdate
-                  "
+                  v-if="checkPermission($route)?.attrIsUpdate"
                   flat
                   round
                   dense
diff --git a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
index e24b252e2..406890c51 100644
--- a/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
+++ b/src/modules/07_insignia/components/5_Borrow/DialogForm.vue
@@ -125,8 +125,6 @@ async function fecthlistInsignia() {
   }
 }
 
-/** function ดึงข้อมูลรายการหน่วยงาน */
-
 /** funcion เรียกข้อมูลหน่วยงานจัดสรรเครื่องราชอิสริยาภรณ์ */
 async function fetchOrgList() {
   http
@@ -180,8 +178,8 @@ async function onSubmit() {
         })
         .then(async () => {
           await props.closeAndFecth();
-          await clearData();
           await success($q, "บันทึกข้อมูลสำเร็จ");
+          await clearData();
         })
         .catch((err) => {
           messageError($q, err);
@@ -292,6 +290,7 @@ watch(props, () => {
       // fetchOrgList();
     } else {
       fecthlistInsignia();
+      setValue();
     }
   }
 });
@@ -476,6 +475,7 @@ watch(props, () => {
                       "
                       :label="`${'วันที่คืน'}`"
                       clearable
+                      class="inputgreen"
                       @clear="clearReturnDate"
                     >
                       <template v-slot:prepend>
@@ -515,6 +515,7 @@ watch(props, () => {
 
               <div class="col-12">
                 <q-input
+                  class="inputgreen"
                   type="textarea"
                   hide-bottom-space
                   dense
@@ -529,8 +530,9 @@ watch(props, () => {
                   :label="`สาเหตุที่ส่งคืนเครื่องราชอิสริยาภรณ์`"
                 />
               </div>
-            </div></div
-        ></q-card-section>
+            </div>
+          </div>
+        </q-card-section>
 
         <q-separator />
 
diff --git a/src/modules/07_insignia/components/5_Borrow/Main.vue b/src/modules/07_insignia/components/5_Borrow/Main.vue
index 19ab9c591..40ed90f12 100644
--- a/src/modules/07_insignia/components/5_Borrow/Main.vue
+++ b/src/modules/07_insignia/components/5_Borrow/Main.vue
@@ -374,9 +374,9 @@ function close() {
 }
 
 /** function closePopup และเเรียกข้อมูลรายชื่อการเสนอขอเครื่องราชฯ */
-function closeAndFecth() {
+async function closeAndFecth() {
+  await fecthlistInsignia();
   modal.value = false;
-  fecthlistInsignia();
 }
 
 /** function openPopup เพิ่มรายการ ยืม-คืนเครื่องราชฯ*/
diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue
index e8a6622cf..90e2c7667 100644
--- a/src/modules/07_insignia/views/ResultPage.vue
+++ b/src/modules/07_insignia/views/ResultPage.vue
@@ -15,8 +15,8 @@ import type { QTableProps, QInput } from "quasar";
  * import Components
  */
 import DialogHeader from "@/components/DialogHeader.vue";
-import Dialogbody from "@/modules/07_insignia/components/3_result/Dialogbody.vue";
-import DialogForm from "@/modules/07_insignia/components/3_result/DialogForm.vue";
+import Dialogbody from "@/modules/07_insignia/components/3_result/Dialogbody.vue"; //รับ-คืนเครื่องราชฯ
+import DialogForm from "@/modules/07_insignia/components/3_result/DialogForm.vue"; //บันทึกผล
 import fileUploadview from "../components/3_result/fileUpload.vue";
 
 /**
@@ -932,27 +932,6 @@ onMounted(() => {
         <fileUploadview :roundId="selectRound" />
       </q-tab-panel>
     </q-tab-panels>
-
-    <Dialogbody
-      :modal="ModalDialog"
-      :close="close"
-      :dateCheckReceive="dateCheckReceive"
-      :dateCheckReturn="dateCheckReturn"
-      :dataModal="dataModal"
-      :personId="personId"
-      :fecthlistInsignia="fecthlistInsignia"
-    />
-
-    <DialogForm
-      :modal="modal"
-      :save="save"
-      :close="close"
-      :roundId="selectRound"
-      :action="action"
-      :personId="personId"
-      :profileType="profileType"
-      :fecthlistInsignia="fecthlistInsignia"
-    />
   </q-card>
   <q-card v-else>
     <div class="q-pa-md q-gutter-sm">
@@ -962,25 +941,32 @@ onMounted(() => {
     </div>
   </q-card>
 
+  <!-- รับ-คืนเครื่องราชฯ -->
+  <Dialogbody
+    :modal="ModalDialog"
+    :close="close"
+    :dateCheckReceive="dateCheckReceive"
+    :dateCheckReturn="dateCheckReturn"
+    :dataModal="dataModal"
+    :personId="personId"
+    :fecthlistInsignia="fecthlistInsignia"
+  />
+  <!-- DialogForm -->
+  <DialogForm
+    :modal="modal"
+    :save="save"
+    :close="close"
+    :roundId="selectRound"
+    :action="action"
+    :personId="personId"
+    :profileType="profileType"
+    :fecthlistInsignia="fecthlistInsignia"
+  />
+
+  <!-- ยืนยันรายการข้อมูล -->
   <q-dialog v-model="modelPerview">
     <q-card style="width: 850px; max-width: 80vw">
       <DialogHeader tittle="ยืนยันรายการข้อมูล" :close="closeDialogPerview" />
-      <!-- <q-card-section>
-        <q-toolbar class="q-py-md">
-          <q-toolbar-title class="header-text">
-            ยืนยันรายการข้อมูล
-          </q-toolbar-title>
-          <q-btn
-            icon="close"
-            unelevated
-            round
-            dense
-            v-close-popup
-            style="color: #ff8080; background-color: #ffdede"
-          />
-        </q-toolbar>
-      </q-card-section> -->
-
       <q-card-section class="q-pt-none">
         <d-table
           :rows="rowspreview"

From ca237a1697e222de872bba26a09c1cbfcfe42e2d Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 28 Aug 2024 18:05:05 +0700
Subject: [PATCH 2/6] add function check permission get

---
 src/utils/permissions.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/utils/permissions.ts b/src/utils/permissions.ts
index bbe25827e..d312d07b8 100644
--- a/src/utils/permissions.ts
+++ b/src/utils/permissions.ts
@@ -35,7 +35,19 @@ export function checkPermissionList(sys: string[]) {
   if (storeMenu.permissions && sys) {
     return (
       storeMenu.permissions.roles.some(
-        (item) => sys.includes(item.authSysId) && item.attrIsCreate
+        (item) => sys.includes(item.authSysId) && item.attrIsList
+      ) ?? false
+    );
+  } else {
+    return false;
+  }
+}
+
+export function checkPermissionGet(sys: string[]) {
+  if (storeMenu.permissions && sys) {
+    return (
+      storeMenu.permissions.roles.some(
+        (item) => sys.includes(item.authSysId) && item.attrIsGet
       ) ?? false
     );
   } else {

From ac53080cecff68b63635fc191f2f2278bb745b08 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 29 Aug 2024 10:25:35 +0700
Subject: [PATCH 3/6] =?UTF-8?q?salary=20=3D=3D>=20=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/02_organizational/api.organization.ts    |  3 ++-
 src/api/registry/api.registry.ts                 |  6 ++++++
 .../13_salary/components/DialogInfoMain.vue      | 16 +++++++++++++---
 .../13_salary/components/InfoDiscipline.vue      |  7 +------
 src/modules/13_salary/components/InfoLeave.vue   |  4 ++--
 src/modules/13_salary/components/InfoSalary.vue  |  2 +-
 src/utils/permissions.ts                         |  2 +-
 7 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts
index c6ec1dc18..1d896ba6d 100644
--- a/src/api/02_organizational/api.organization.ts
+++ b/src/api/02_organizational/api.organization.ts
@@ -94,7 +94,8 @@ export default {
   orgProfileEmp: `${orgEmployeePos}/profile`,
   orgSearchProfileEmp: `${orgProfile}-employee/search`,
 
-  orgProfileById: (id: string, type: string) => `${orgProfile}${type}/${id}`,
+  orgProfileById: (id: string, type: string) =>
+    `${orgProfile}${type}/admin/${id}`,
 
   orgDeceasedProfile: `${orgPos}/profile/search`,
 
diff --git a/src/api/registry/api.registry.ts b/src/api/registry/api.registry.ts
index 93ce13e62..7d68900c4 100644
--- a/src/api/registry/api.registry.ts
+++ b/src/api/registry/api.registry.ts
@@ -128,6 +128,8 @@ export default {
     `${registryNew}${type}/discipline/${disciplineId}`,
   profileNewDisciplineHisByDisciplineId: (disciplineId: string, type: string) =>
     `${registryNew}${type}/discipline/history/${disciplineId}`,
+  disciplineListCard: (profileId: string, type: string) =>
+    `${registryNew}${type}/discipline/admin/${profileId}`, // noPermission
 
   // ปฏิบัติราชการพิเศษ
   profileNewDuty: (type: string) => `${registryNew}${type}/duty`,
@@ -153,6 +155,8 @@ export default {
     `${registryNew}${type}/leave/history/${id}`,
   profileCheckDate: () => `${env.API_URI}/leave/user/check`,
   profileNewLeaveType: () => `${env.API_URI}/leave/type`,
+  leaveListCard: (id: string, type: string) =>
+    `${registryNew}${type}/leave/admin/${id}`, //noPermission
 
   /** ตำแหน่งเงินเดือน*/
   profileSalaryNew: (type: string) => `${registryNew}${type}/salary`,
@@ -162,6 +166,8 @@ export default {
     `${registryNew}${type}/salary/history/${profileId}`,
   profileSalarySwapNew: (type: string, id: string, type2: string) =>
     `${registryNew}${type2}/salary/swap/${type}/${id}`,
+  salaryListCard: (id: string, type: string) =>
+    `${registryNew}${type}/salary/admin/${id}`, //noPermission
 
   // ประวัติการเปลี่ยนชื่อ-นามสกุล
   profileNewChangeName: (type: string) => `${registryNew}${type}/changeName`,
diff --git a/src/modules/13_salary/components/DialogInfoMain.vue b/src/modules/13_salary/components/DialogInfoMain.vue
index 1fbfe57e4..19e78a1c8 100644
--- a/src/modules/13_salary/components/DialogInfoMain.vue
+++ b/src/modules/13_salary/components/DialogInfoMain.vue
@@ -4,6 +4,7 @@ import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { checkPermissionGet } from "@/utils/permissions";
 
 /**
  * importCOmponents
@@ -48,12 +49,13 @@ function fetchInformation() {
   showLoader();
   http
     .get(config.API.orgProfileById(profileId.value, props.employeeClass))
-    .then((res) => {
+    .then(async (res) => {
       const data = res.data.result;
       fullName.value = `${data.prefix}${data.firstName} ${data.lastName}`;
       position.value = data.position;
+
       if (data.avatarName) {
-        fetchProfile(data.id as string, data.avatarName);
+        await fetchProfile(data.id as string, data.avatarName);
       }
     })
     .catch((err) => {
@@ -133,7 +135,15 @@ watch(
             <div class="q-mb-xs text-center text-grey" v-if="position">
               {{ position }}
             </div>
-            <div class="q-mt-md">
+
+            <div
+              class="q-mt-md"
+              v-if="
+                props.employeeClass === '-employee'
+                  ? checkPermissionGet('SYS_REGISTRY_EMP')
+                  : checkPermissionGet('SYS_REGISTRY_OFFICER')
+              "
+            >
               <q-btn
                 class="bg-white"
                 outline
diff --git a/src/modules/13_salary/components/InfoDiscipline.vue b/src/modules/13_salary/components/InfoDiscipline.vue
index 1abf65e2e..563347808 100644
--- a/src/modules/13_salary/components/InfoDiscipline.vue
+++ b/src/modules/13_salary/components/InfoDiscipline.vue
@@ -103,12 +103,7 @@ const visibleColumns = ref<string[]>([
 function fetchListDiscipline() {
   showLoader();
   http
-    .get(
-      config.API.profileNewDisciplineByProfileId(
-        profileId.value,
-        employeeClass.value
-      )
-    )
+    .get(config.API.disciplineListCard(profileId.value, employeeClass.value))
     .then((res) => {
       rows.value = res.data.result;
     })
diff --git a/src/modules/13_salary/components/InfoLeave.vue b/src/modules/13_salary/components/InfoLeave.vue
index edcdf1846..022788bad 100644
--- a/src/modules/13_salary/components/InfoLeave.vue
+++ b/src/modules/13_salary/components/InfoLeave.vue
@@ -105,7 +105,7 @@ const visibleColumns = ref<string[]>([
 function fetchListSalary() {
   showLoader();
   http
-    .get(config.API.profileNewLeaveById(profileId.value, employeeClass.value))
+    .get(config.API.leaveListCard(profileId.value, employeeClass.value))
     .then((res) => {
       rows.value = res.data.result;
     })
@@ -203,7 +203,7 @@ onMounted(() => {
           </q-tr>
         </template>
         <template v-slot:body="props">
-          <q-tr :props="props" >
+          <q-tr :props="props">
             <q-td v-for="col in props.cols" :key="col.id">
               <div class="table_ellipsis">
                 {{ col.value ? col.value : "-" }}
diff --git a/src/modules/13_salary/components/InfoSalary.vue b/src/modules/13_salary/components/InfoSalary.vue
index c5bcd1770..17bced93c 100644
--- a/src/modules/13_salary/components/InfoSalary.vue
+++ b/src/modules/13_salary/components/InfoSalary.vue
@@ -151,7 +151,7 @@ const visibleColumns = ref<string[]>([
 function fetchListSalary() {
   showLoader();
   http
-    .get(config.API.profileListSalaryNew(profileId.value, employeeClass.value))
+    .get(config.API.salaryListCard(profileId.value, employeeClass.value))
     .then((res) => {
       rows.value = res.data.result;
     })
diff --git a/src/utils/permissions.ts b/src/utils/permissions.ts
index d312d07b8..985c007c8 100644
--- a/src/utils/permissions.ts
+++ b/src/utils/permissions.ts
@@ -43,7 +43,7 @@ export function checkPermissionList(sys: string[]) {
   }
 }
 
-export function checkPermissionGet(sys: string[]) {
+export function checkPermissionGet(sys: string ) {
   if (storeMenu.permissions && sys) {
     return (
       storeMenu.permissions.roles.some(

From b808db1c73566666b4685f66a838476837562a84 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 29 Aug 2024 11:17:29 +0700
Subject: [PATCH 4/6] =?UTF-8?q?placement=20=3D=3D>=20=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/02_organizational/api.organization.ts |  1 +
 src/api/registry/api.registry.ts              |  2 ++
 src/components/CardProfile.vue                | 12 +++++---
 src/components/Dialogs/PopupPersonalNew.vue   | 28 +++++++++++--------
 .../components/Transfer/transferRegistry.vue  |  2 ++
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts
index 1d896ba6d..ba8cff83d 100644
--- a/src/api/02_organizational/api.organization.ts
+++ b/src/api/02_organizational/api.organization.ts
@@ -101,6 +101,7 @@ export default {
 
   //
   orgCheckAvatar: (id: string) => `${orgProfile}/avatar/profileId/${id}`,
+  orgCheckAvatarCard: (path: string) => `${organization}/${path}`, //noPernission
 
   changePosition: `${organization}/placement/change-position`,
   changePositionById: `${organization}/placement/change-position/profile-all`,
diff --git a/src/api/registry/api.registry.ts b/src/api/registry/api.registry.ts
index 7d68900c4..d2e3de68a 100644
--- a/src/api/registry/api.registry.ts
+++ b/src/api/registry/api.registry.ts
@@ -146,6 +146,8 @@ export default {
     `${registryNew}${type}/government/${id}`,
   profileNewGovernmentHistory: (id: string, type: string) =>
     `${registryNew}${type}/government/history/${id}`,
+  profileNewGovernmentCard: (id: string, type: string) =>
+    `${registryNew}${type}/government/admin/${id}`, // noPermission
 
   //การลา
   profileNewLeave: (type: string) => `${registryNew}${type}/leave`,
diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue
index 2576a9247..f798c1628 100644
--- a/src/components/CardProfile.vue
+++ b/src/components/CardProfile.vue
@@ -73,7 +73,11 @@ function fetchDataProfile(data: DataProfile) {
 }
 
 function fetchCheckAvatar(id: string) {
-  http.get(config.API.orgCheckAvatar(id)).then((res) => {
+  const path =
+    props.type === "employee"
+      ? `profile-employee/avatar/profileEmployeeId-admin/${id}`
+      : `profile/avatar/profileId-admin/${id}`;
+  http.get(config.API.orgCheckAvatarCard(path)).then((res) => {
     const data = res.data.result;
     if (data.avatarName) {
       fetchProfile(id, data.avatarName);
@@ -101,10 +105,10 @@ function onclickViewinfo() {
 
 watch(
   () => props.data,
-  () => {
-    const dataMain = props.data as DataProfile;
+  async () => {
+    const dataMain = (await props.data) as DataProfile;
     profileId.value = dataMain.profileId;
-    fetchDataProfile(dataMain);
+    await fetchDataProfile(dataMain);
   }
 );
 </script>
diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index a917080ea..a5ce956cc 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -4,6 +4,7 @@ import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRouter, useRoute } from "vue-router";
+import { checkPermissionGet } from "@/utils/permissions";
 
 /** importType*/
 import type { PersonalImformation } from "@/components/information/interface/response/Information";
@@ -101,8 +102,8 @@ async function fetchInformation(id: string) {
         `${empType.value == "employee" ? `-${empType.value}` : ""}`
       )
     )
-    .then((res) => {
-      const data = res.data.result;
+    .then(async (res) => {
+      const data = await res.data.result;
       imformation.prefix = data.prefix ? data.prefix : "-";
       imformation.citizenId = data.citizenId ? data.citizenId : "-";
       imformation.firstName = data.firstName ? data.firstName : "-";
@@ -115,7 +116,7 @@ async function fetchInformation(id: string) {
 
       avatar.position = data.position ? data.position : "-";
       if (data.avatarName) {
-        fetchProfile(data.id as string, data.avatarName);
+        await fetchProfile(data.id as string, data.avatarName);
       } else {
         avatar.avatar = "";
       }
@@ -136,13 +137,13 @@ async function fetchProfileGov(id: string) {
   showLoader();
   await http
     .get(
-      config.API.profileNewGovernmentById(
+      config.API.profileNewGovernmentCard(
         id,
         `${empType.value == "employee" ? `-${empType.value}` : ""}`
       )
     )
-    .then((res) => {
-      const data = res.data.result;
+    .then(async (res) => {
+      const data = await res.data.result;
       goverment.oc = data.org !== "" ? data.org : "-";
       goverment.posNo = data.posMasterNo !== "" ? data.posMasterNo : "-";
       goverment.position = data.position !== "" ? data.position : "-";
@@ -183,8 +184,10 @@ watch(
             ? "employee"
             : "officer";
 
-        fetchInformation(props.id);
-        fetchProfileGov(props.id);
+        await Promise.all([
+          fetchInformation(props.id),
+          fetchProfileGov(props.id),
+        ]);
       }
     }
   }
@@ -197,14 +200,10 @@ watch(modal, (newValue) => {
 });
 
 async function fetchProfile(id: string, avatarName: string) {
-  showLoader();
   await http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, avatarName))
     .then(async (res) => {
       avatar.avatar = await res.data.downloadUrl;
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 </script>
@@ -259,6 +258,11 @@ async function fetchProfile(id: string, avatarName: string) {
             </div>
             <div class="q-mt-md">
               <q-btn
+                v-if="
+                  empType === 'employee'
+                    ? checkPermissionGet('SYS_REGISTRY_EMP')
+                    : checkPermissionGet('SYS_REGISTRY_OFFICER')
+                "
                 class="bg-white"
                 outline
                 rounded
diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue
index bfb31fd1b..61ae20540 100644
--- a/src/modules/05_placement/components/Transfer/transferRegistry.vue
+++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue
@@ -325,7 +325,9 @@ onMounted(async () => {
     />
     รายละเอียดการขอโอนของ{{ responseData.fullname }}
   </div>
+
   <CardProfile :data="dataProfile as DataProfile" />
+
   <!-- <q-card bordered class="row col-12 text-dark">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
       <div class="q-pl-sm text-weight-bold text-subtitle2">

From 8957e38165cdd8ab3e5421e4e36b6690450ee60b Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 29 Aug 2024 14:03:49 +0700
Subject: [PATCH 5/6] fixing load registry

---
 src/modules/04_registryPerson/views/list.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/04_registryPerson/views/list.vue b/src/modules/04_registryPerson/views/list.vue
index 0efa3d10c..d1456cc28 100644
--- a/src/modules/04_registryPerson/views/list.vue
+++ b/src/modules/04_registryPerson/views/list.vue
@@ -256,12 +256,13 @@ async function selectType() {
         : "เลือกหน่วยงาน";
   } else {
     // แต่ถ้าประเภทเดิมระบบจะใช้ filter เดิมที่เคยค้นหาไว้
+
     if (
       store.formFilter.keyword != "" ||
       store.labelOption.posType != "ทั้งหมด" ||
       store.labelOption.posLevel != "ทั้งหมด" ||
-      store.formFilter.isShowRetire != null ||
-      store.formFilter.isProbation != null
+      store.formFilter.isShowRetire ||
+      store.formFilter.isProbation
     ) {
       store.formFilter.page = 1;
       fetchDataPerson();

From 71ef13e1f2b79fa0a5fd1135439cdfa4731ea151 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 29 Aug 2024 14:26:25 +0700
Subject: [PATCH 6/6] fixing register filter

---
 src/modules/04_registryPerson/store.ts       | 2 +-
 src/modules/04_registryPerson/views/list.vue | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index 73c15a8fc..44fba1bf2 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -88,6 +88,6 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     mode,
     formFilter,
     labelOption,
-    nodeData
+    nodeData,
   };
 });
diff --git a/src/modules/04_registryPerson/views/list.vue b/src/modules/04_registryPerson/views/list.vue
index d1456cc28..5c1ca07d8 100644
--- a/src/modules/04_registryPerson/views/list.vue
+++ b/src/modules/04_registryPerson/views/list.vue
@@ -143,9 +143,9 @@ function fetchDataPerson() {
     queryParams.type = empType.value;
   }
 
-  if (nodeData.node !== null && nodeData.nodeId !== null) {
-    queryParams.node = nodeData.node;
-    queryParams.nodeId = nodeData.nodeId;
+  if (store.nodeData.node !== null && store.nodeData.nodeId !== null) {
+    queryParams.node = store.nodeData.node;
+    queryParams.nodeId = store.nodeData.nodeId;
   }
   http
     .get(
@@ -262,7 +262,8 @@ async function selectType() {
       store.labelOption.posType != "ทั้งหมด" ||
       store.labelOption.posLevel != "ทั้งหมด" ||
       store.formFilter.isShowRetire ||
-      store.formFilter.isProbation
+      store.formFilter.isProbation ||
+      store.nodeData.nodeId != null
     ) {
       store.formFilter.page = 1;
       fetchDataPerson();