From 2ebcb1961c05ebc009ef069cc27c53b7bc71f632 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 16 Jul 2024 13:08:40 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A8=E0=B8=9C=E0=B8=A5=20=3D>=20fix=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../14_KPI/components/results/dialogIndividual.vue    | 11 +++++------
 .../14_KPI/components/results/tableResults.vue        | 10 ++++------
 src/modules/14_KPI/views/report.vue                   |  4 ++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/modules/14_KPI/components/results/dialogIndividual.vue b/src/modules/14_KPI/components/results/dialogIndividual.vue
index bd74d80b6..ba2cf095e 100644
--- a/src/modules/14_KPI/components/results/dialogIndividual.vue
+++ b/src/modules/14_KPI/components/results/dialogIndividual.vue
@@ -55,7 +55,7 @@ const columns = ref<QTableProps["columns"]>([
     name: "detail",
     align: "left",
     label: "เกณฑ์การประเมิน",
-    sortable: true,
+    sortable: false,
     field: "detail",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px; width:80%;",
@@ -90,11 +90,10 @@ function fetchDetailIndividual() {
     .then((res) => {
       const data = res.data.result;
       title.value = data.name;
-      develop.value = [
-        data.isDevelopment70 ? "isDevelopment70" : "",
-        data.isDevelopment20 ? "isDevelopment20" : "",
-        data.isDevelopment10 ? "isDevelopment10" : "",
-      ];
+      const developKeys = [70, 20, 10];
+      develop.value = developKeys
+        .filter((key) => data[`isDevelopment${key}`])
+        .map((key) => `isDevelopment${key}`);
 
       target.value = data.target;
       const achievements = ["10", "5", "0"];
diff --git a/src/modules/14_KPI/components/results/tableResults.vue b/src/modules/14_KPI/components/results/tableResults.vue
index 330200177..f5485fd16 100644
--- a/src/modules/14_KPI/components/results/tableResults.vue
+++ b/src/modules/14_KPI/components/results/tableResults.vue
@@ -187,12 +187,10 @@ function onAnnounce() {
         .post(config.API.evaluationUserDone, {
           id: ids,
         })
-        .then(() => {
-          setTimeout(async () => {
-            await porps.fetchData();
-            await success($q, "ประกาศผลสำเร็จ");
-            selected.value = [];
-          }, 1500);
+        .then(async () => {
+          await porps.fetchData();
+          await success($q, "ประกาศผลสำเร็จ");
+          selected.value = [];
         })
         .catch((err) => {
           messageError($q, err);
diff --git a/src/modules/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue
index 7974e1e29..d0723ce21 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -259,7 +259,7 @@ function filterSelector(val: string, update: Function, type: string) {
   switch (type) {
     case "typereport":
       update(() => {
-        typeReport.value = "";
+        typeReport.value = val ? "" : typeReport.value;
         listReport.value = listReportMain.value.filter(
           (v: DataOption) => v.name.toLowerCase().indexOf(val) > -1
         );
@@ -267,7 +267,7 @@ function filterSelector(val: string, update: Function, type: string) {
       break;
     case "organization":
       update(() => {
-        organization.value = "";
+        organization.value = val ? "" : organization.value;
         organizationOps.value = organizationOpsMain.value.filter(
           (v: DataOption) => v.name.toLowerCase().indexOf(val) > -1
         );