From 26917fc7dc52676f3c5b8cc4c493e57ac59172bb Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Thu, 19 Dec 2024 16:31:59 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20popup=20=E0=B9=84?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=88=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99=20false?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/Achievement/DialogDevelopmance.vue      | 2 +-
 .../components/3_InvestigateDisciplinary/EditPage.vue         | 2 +-
 src/modules/11_discipline/components/PopupSendToNext.vue      | 1 -
 src/modules/14_KPI/components/Tab/01_Assessment.vue           | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue b/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue
index 3c20623b4..634ae51d0 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/DialogDevelopmance.vue
@@ -333,7 +333,7 @@ watch(
               map-options
               hide-bottom-space
               use-input
-              :readonly="!formData.year"
+              readonly
               v-model="projectName"
               @update:model-value="getProjectDetail(projectName)"
               @filter="filterOptionFn"
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
index 2a3f5ea6e..ec3865232 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
@@ -345,6 +345,7 @@ function emitPerson(data: PersonsArray[]) {
       persons: dataMapId,
     })
     .then(async(res) => {
+      modalPopup.value = false
       success($q, "ส่งไปพักราชการสำเร็จ");
       // router.push(`/discipline/investigatefacts`);
       await fetchDetailDisciplinary();
@@ -354,7 +355,6 @@ function emitPerson(data: PersonsArray[]) {
     })
     .finally(() => {
       hideLoader();
-      fetchDetailDisciplinary();
     });
 }
 
diff --git a/src/modules/11_discipline/components/PopupSendToNext.vue b/src/modules/11_discipline/components/PopupSendToNext.vue
index e3096fa15..8e0b28f57 100644
--- a/src/modules/11_discipline/components/PopupSendToNext.vue
+++ b/src/modules/11_discipline/components/PopupSendToNext.vue
@@ -86,7 +86,6 @@ function onclickSend() {
         $q,
         async () => {
           emit("returnPerson", selected.value);
-          modal.value = false;
         },
         `ยืนยันการ${props.title}`,
         `ต้องการยืนยันการ${props.title}หรือไม่`
diff --git a/src/modules/14_KPI/components/Tab/01_Assessment.vue b/src/modules/14_KPI/components/Tab/01_Assessment.vue
index 0d6417d45..72776d1ac 100644
--- a/src/modules/14_KPI/components/Tab/01_Assessment.vue
+++ b/src/modules/14_KPI/components/Tab/01_Assessment.vue
@@ -8,7 +8,7 @@ import http from "@/plugins/http";
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 
-import type { ListCriteria } from "@/modules/14_KPI/interface/request/index";
+import type { ListCriteria } from "@/modules/14_KPI/interface/request/Index";
 
 import DialogListCriteria from "@/modules/14_KPI/components/Tab/Dialog/DialogListCriteria.vue";
 import Work from "@/modules/14_KPI/components/Tab/Topic/01_Indicator.vue";
@@ -226,7 +226,7 @@ onMounted(async () => {
     class="bg-white row col-12 text-dark q-pa-md"
   >
     <div class="text-weight-bold text-body2">
-      <span class="txt-under text-blue-6">องค์ประกอบที่ 1 </span>
+      <span class="txt-under text-blue-6">องค์ประกอบที่ 1</span>
       <span class="q-ml-sm"> ผลสัมฤทธิ์ของงาน</span>
     </div>
     <div class="q-gutter-md q-mt-sm">