From 34adab163992739c34ad272074188f62bb28f834 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 28 Oct 2024 14:46:46 +0700
Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E0=B9=84=E0=B8=9F=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/04_registryPerson/views/detailView.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue
index 81e27522c..3d919fba5 100644
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@@ -561,7 +561,7 @@ function getImage() {
       }
     })
     .catch((e) => {
-      messageError($q, e);
+      // messageError($q, e);
     })
     .finally(() => {
       hideLoader();
@@ -572,8 +572,8 @@ function getImage() {
  * ฟังก์ชันเรียกข้อมูลรูป
  * @param dataList
  */
-function getImg(dataList: any) {
-  http
+async function getImg(dataList: any) {
+  await http
     .get(config.API.fileByPath(`${dataList.avatar}/${dataList.avatarName}`))
     .then((res) => {
       const data = res.data;
@@ -585,7 +585,7 @@ function getImg(dataList: any) {
       images.value = [...images.value, newData];
     })
     .catch((e) => {
-      messageError($q, e);
+      // messageError($q, e);
     });
 }
 

From 99cab44e0174d68e0a3320c14400d15690a6d784 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 28 Oct 2024 15:01:28 +0700
Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=81=E0=B8=95=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B1=E0=B9=89=E0=B8=87=E0=B8=84=E0=B8=93=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=81=E0=B8=A3=E0=B8=A3=E0=B8=A1=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=A5=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=97=E0=B8=94?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=9B=E0=B8=8F=E0=B8=B4=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/probation/FormAppoint/FormAppoint.vue            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue b/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue
index 5015e9c32..77c4cc67e 100644
--- a/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue
+++ b/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue
@@ -347,11 +347,13 @@ async function getData() {
 }
 
 async function onDirector() {
+  pagination.value.page = 1;
   await getPerson();
   selected.value = [];
 }
 
 function resetFilter() {
+  pagination.value.page = 1;
   filterKeyword.value = "";
   getPerson();
 }

From 2399dc81ac99bd00da61be2b309c33874e9a08fa Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 28 Oct 2024 16:01:35 +0700
Subject: [PATCH 3/3] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/requestEdit/Page01_Detail.vue             | 5 ++++-
 src/modules/04_registryPerson/views/detailView.vue       | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue b/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue
index 30894eb0e..54a70a4c2 100644
--- a/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue
+++ b/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue
@@ -249,7 +249,10 @@ onMounted(async () => {
     </div>
     <q-space />
     <q-btn
-      v-if="workflowRef?.permission.isUpdate"
+      v-if="
+        workflowRef?.permission.isUpdate &&
+        topicConvert(dataRequest.topic) !== ''
+      "
       color="public"
       :label="topicConvert(dataRequest.topic)"
       @click="onUpdate(dataRequest)"
diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue
index 3d919fba5..4a5eba09e 100644
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@@ -104,11 +104,13 @@ const baseItemsMenu = ref<DataOptionSys[]>([
 const itemsMenu = computed(() => {
   if (
     leaveReason.value ===
-    "(พ้นจากราชการด้วยสาเหตุ: ได้รับโทษทางวินัย ให้ออกจากราชการไว้ก่อน)"
+      "(พ้นจากราชการด้วยสาเหตุ: ได้รับโทษทางวินัย ให้ออกจากราชการไว้ก่อน)" ||
+    leaveReason.value ===
+      "(พ้นจากราชการด้วยสาเหตุ: ลาออกจากราชการ)"
   ) {
     return (
       baseItemsMenu.value?.filter(
-        (option: DataOptionSys) => option.system === "SYS_PROMOTION_OFFICER"
+        (option: DataOptionSys) => option.system === "SYS_PLACEMENT_OTHER"
       ) || []
     );
   } else {
@@ -716,7 +718,8 @@ onMounted(async () => {
               'SYS_PLACEMENT_OTHER',
             ])) ||
           leaveReason ===
-            '(พ้นจากราชการด้วยสาเหตุ: ได้รับโทษทางวินัย ให้ออกจากราชการไว้ก่อน)'
+            '(พ้นจากราชการด้วยสาเหตุ: ได้รับโทษทางวินัย ให้ออกจากราชการไว้ก่อน)' ||
+          leaveReason === '(พ้นจากราชการด้วยสาเหตุ: ลาออกจากราชการ)'
         "
         size="md"
         rounded