From 24de3ccd485ca4ccdfd98f8bf1e3ed7b90b61e7e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 5 Sep 2024 11:55:29 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20API=20=E0=B8=94?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A7=E0=B8=99=E0=B9=8C=E0=B9=82=E0=B8=AB=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=94=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C=E0=B8=82=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=87=E0=B8=97=E0=B8=B0=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/registry/api.profile.ts                  |  1 +
 .../04_registryPerson/views/detailView.vue       |  4 ++++
 src/modules/08_registryEmployee/views/Main.vue   | 16 ++++++++++++----
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/api/registry/api.profile.ts b/src/api/registry/api.profile.ts
index 77a70667b..9074e5cb8 100644
--- a/src/api/registry/api.profile.ts
+++ b/src/api/registry/api.profile.ts
@@ -178,6 +178,7 @@ export default {
   profileReportEmpId: (profileId: string) =>
     `${report}kk1-employee/${profileId}`,
   profileKp7ShortId: (profileId: string) => `${report}kp7-short/${profileId}`,
+  profileKp7ShortEmpId: (profileId: string) => `${report}kp7-short-employee/${profileId}`,
 
   profileChangeNameId: (profileId: string) =>
     `${profile}changeName/${profileId}`,
diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue
index 308510db5..55ff17669 100644
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@@ -304,7 +304,10 @@ function onClickDownloadKp7(type: string) {
       ? empType.value
         ? config.API.profileReportEmpId(profileId.value)
         : config.API.profileReportId(profileId.value)
+      : empType.value
+      ? config.API.profileKp7ShortEmpId(profileId.value)
       : config.API.profileKp7ShortId(profileId.value);
+
   const fileName = type === "FULL" ? "ก.พ.7/ก.ก.1" : "ประวัติแบบย่อ";
   http
     .get(url, {
@@ -746,6 +749,7 @@ onMounted(async () => {
       </q-btn-dropdown>
 
       <q-btn
+        v-if="empType !== '-temp'"
         unelevated
         round
         color="grey-4"
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 98836779f..1b4b5ac0e 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -394,16 +394,24 @@ onMounted(async () => {
             >
               <q-btn
                 v-if="
-                  (props.row.draftOrgEmployeeStatus === null ||
-                    props.row.draftOrgEmployeeStatus === 'WAITTING' ||
-                    props.row.draftOrgEmployeeStatus === 'PENDING') &&
                   checkPermission($route)?.attrIsUpdate &&
                   checkPermission($route)?.attrIsGet
                 "
+                :disable="
+                  props.row.draftOrgEmployeeStatus !== null &&
+                  props.row.draftOrgEmployeeStatus !== 'WAITTING' &&
+                  props.row.draftOrgEmployeeStatus !== 'PENDING'
+                "
                 flat
                 round
                 dense
-                color="blue"
+                :color="
+                  props.row.draftOrgEmployeeStatus !== null &&
+                  props.row.draftOrgEmployeeStatus !== 'WAITTING' &&
+                  props.row.draftOrgEmployeeStatus !== 'PENDING'
+                    ? 'grey-5'
+                    : 'blue'
+                "
                 icon="mdi-account-settings"
                 @click.pervent="onClickSelectPos(props.row)"
               >