From 39b14d70266a2627d16b3c26fef9cdd98769f765 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Fri, 4 Apr 2025 14:52:19 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=94=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/PopupPersonalNew.vue   | 30 ++++++++++++-------
 .../21_report/components/CardPosition.vue     |  2 +-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index c20ede68f..2f16bf7b6 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -102,7 +102,11 @@ async function fetchInformation(id: string) {
     .get(
       config.API.orgProfileById(
         id,
-        `${props.type.toLocaleLowerCase() == "employee" ? `-${props.type.toLocaleLowerCase()}` : ""}`
+        `${
+          props.type.toLocaleLowerCase() == "employee"
+            ? `-${props.type.toLocaleLowerCase()}`
+            : ""
+        }`
       )
     )
     .then(async (res) => {
@@ -146,7 +150,11 @@ async function fetchProfileGov(id: string) {
     .get(
       config.API.profileNewGovernmentCard(
         id,
-        `${props.type.toLocaleLowerCase() == "employee" ? `-${props.type.toLocaleLowerCase()}` : ""}`
+        `${
+          props.type.toLocaleLowerCase() == "employee"
+            ? `-${props.type.toLocaleLowerCase()}`
+            : ""
+        }`
       )
     )
     .then(async (res) => {
@@ -176,7 +184,7 @@ async function fetchProfileGov(id: string) {
 
 function redirecToRegistry() {
   router.push(
-    `/registry-${props.type == "employee" ? "employee" : "officer"}/${props.id}`
+    `/registry-${props.type.toLocaleLowerCase() == "employee" ? "employee" : "officer"}/${props.id}`
   );
   modal.value = false;
 }
@@ -222,7 +230,7 @@ async function fetchProfile(id: string, avatarName: string) {
     <q-card style="width: 420px; overflow: visible">
       <q-toolbar>
         <q-toolbar-title class="text-subtitle1 text-bold"
-          >ทะเบียนประวัติ{{ props.type }}
+          >ทะเบียนประวัติ
         </q-toolbar-title>
         <q-btn
           icon="close"
@@ -268,7 +276,7 @@ async function fetchProfile(id: string, avatarName: string) {
             <div class="q-mt-md">
               <q-btn
                 v-if="
-                  empType === 'employee'
+                  props.type.toLocaleLowerCase() === 'employee'
                     ? checkPermissionGet('SYS_REGISTRY_EMP')
                     : checkPermissionGet('SYS_REGISTRY_OFFICER')
                 "
@@ -385,7 +393,7 @@ async function fetchProfile(id: string, avatarName: string) {
                         readonly
                         :model-value="goverment.posNo ? goverment.posNo : '-'"
                         :label="
-                          props.type == 'employee'
+                          props.type.toLocaleLowerCase() == 'employee'
                             ? 'ตำแหน่งเลขที่'
                             : 'เลขที่ตำแหน่ง'
                         "
@@ -432,7 +440,7 @@ async function fetchProfile(id: string, avatarName: string) {
                           goverment.positionType ? goverment.positionType : '-'
                         "
                         :label="
-                          props.type == 'employee'
+                          props.type.toLocaleLowerCase() == 'employee'
                             ? 'กลุ่มงาน'
                             : 'ตำแหน่งประเภท'
                         "
@@ -448,7 +456,7 @@ async function fetchProfile(id: string, avatarName: string) {
                             : '-'
                         "
                         :label="
-                          props.type == 'employee'
+                          props.type.toLocaleLowerCase() == 'employee'
                             ? 'ระดับชั้นงาน'
                             : 'ระดับตำแหน่ง'
                         "
@@ -456,7 +464,7 @@ async function fetchProfile(id: string, avatarName: string) {
                     </div>
                     <div
                       class="col-xs-6 col-md-6"
-                      v-if="props.type !== 'employee'"
+                      v-if="props.type.toLocaleLowerCase() !== 'employee'"
                     >
                       <q-input
                         borderless
@@ -471,7 +479,7 @@ async function fetchProfile(id: string, avatarName: string) {
                     </div>
                     <div
                       class="col-xs-6 col-md-6"
-                      v-if="props.type !== 'employee'"
+                      v-if="props.type.toLocaleLowerCase() !== 'employee'"
                     >
                       <q-input
                         borderless
@@ -491,7 +499,7 @@ async function fetchProfile(id: string, avatarName: string) {
               <q-card
                 bordered
                 style="border: 1px solid #d6dee1"
-                v-if="checkRoute && props.type === 'officer'"
+                v-if="checkRoute && props.type.toLocaleLowerCase() === 'officer'"
               >
                 <CardPosition :id="props.id" :type="props.type" />
               </q-card>
diff --git a/src/modules/21_report/components/CardPosition.vue b/src/modules/21_report/components/CardPosition.vue
index 3888464fc..956639272 100644
--- a/src/modules/21_report/components/CardPosition.vue
+++ b/src/modules/21_report/components/CardPosition.vue
@@ -42,7 +42,7 @@ async function fetchDataTenure() {
       .get(
         config.API.salaryTenurePosition(
           props?.id,
-          props.type === "officer" ? "" : "-employee"
+          props.type.toLocaleLowerCase() === "officer" ? "" : "-employee"
         )
       )
       .then((res) => {