From f9bdb3a52307a34749e31a2f2a4356c3461f06dd Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Feb 2025 09:45:45 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B0=E0=B8=A2=E0=B8=B0?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2=E0=B8=94=E0=B8=B3=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=87=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/PopupPersonalNew.vue                   | 2 +-
 .../components/detail/GovernmentInformation/07_Position.vue   | 4 ++--
 src/modules/21_report/views/02_reportRegistry.vue             | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index 4afdf0b48..504fde1ed 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -487,7 +487,7 @@ async function fetchProfile(id: string, avatarName: string) {
               <q-card
                 bordered
                 style="border: 1px solid #d6dee1"
-                v-if="checkRoute"
+                v-if="checkRoute && props.type === 'officer'"
               >
                 <CardPosition :id="props.id" :type="props.type" />
               </q-card>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
index 7c6ddf9fb..eab68205e 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -755,12 +755,12 @@ async function fetchDataTenure() {
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
 onMounted(() => {
   fetchListSalary();
-  fetchDataTenure();
+  empType.value === "" && fetchDataTenure();
 });
 </script>
 
 <template>
-  <div class="row q-col-gutter-sm q-pb-sm">
+  <div class="row q-col-gutter-sm q-pb-sm" v-if="empType === ''">
     <div class="col" v-for="(item, index) in cardData" :key="index">
       <q-card bordered class="col-12" style="border: 1px solid #d6dee1">
         <div class="col-12 text-weight-medium bg-grey-1 q-py-xs q-px-md">
diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index beecb0083..634b800b1 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -6,7 +6,7 @@ import * as XLSX from "xlsx";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRoute } from "vue-router";
-import { checkPermission, checkPermissionGet } from "@/utils/permissions";
+import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { useReportStore } from "@/modules/21_report/store";
 import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
@@ -45,7 +45,6 @@ const employeeClassOption = ref<OptionData[]>([
 ]);
 
 const rows = ref<any[]>([]);
-const detailReport = ref<any>();
 
 /** ช่วงเวลา */
 const dateStart = ref<Date | null>(null); //บรรจุตั้งเเต่วันที่