From a0334a04b4e42ad71e47a5789b54800c417d9c5d Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 16 Aug 2024 10:18:00 +0700
Subject: [PATCH] updated approved

---
 .../components/Evaluator/02_TabOther.vue      | 10 ++++----
 src/modules/08_KPI/views/main.vue             | 24 ++++++++++++++++---
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/modules/08_KPI/components/Evaluator/02_TabOther.vue b/src/modules/08_KPI/components/Evaluator/02_TabOther.vue
index 651c8da..52df1b9 100644
--- a/src/modules/08_KPI/components/Evaluator/02_TabOther.vue
+++ b/src/modules/08_KPI/components/Evaluator/02_TabOther.vue
@@ -51,12 +51,14 @@ const pagination = ref({
   rowsPerPage: 10,
 });
 
-function onClickApprove(type: string = "") {
+async function onClickApprove(type: string = "") {
   if (store.selected.length !== 0) {
-    const userIds = store.selected.map((user: ResEvaluatorAssessor) => user.id);
+    const userIds = await store.selected.map(
+      (user: ResEvaluatorAssessor) => user.id
+    );
     dialogConfirm(
       $q,
-      () => {
+      async () => {
         showLoader();
         const url =
           store.tabMainevaluator === "2" || store.tabMainevaluator === "4"
@@ -77,7 +79,7 @@ function onClickApprove(type: string = "") {
               : undefined,
           id: userIds,
         };
-        http
+        await http
           .post(config.API.kpiEvaluation + `/admin/${url}`, body)
           .then(async () => {
             store.selected = [];
diff --git a/src/modules/08_KPI/views/main.vue b/src/modules/08_KPI/views/main.vue
index 1c35609..de80b59 100644
--- a/src/modules/08_KPI/views/main.vue
+++ b/src/modules/08_KPI/views/main.vue
@@ -653,7 +653,13 @@ onMounted(() => {
                 dense
                 option-label="name"
                 option-value="id"
-                :options="evaluatorIdOp"
+                :options="
+                  evaluatorIdOp.filter(
+                    (i) =>
+                      i.id !== formRound.commanderId &&
+                      i.id !== formRound.commanderHighId
+                  )
+                "
                 emit-value
                 map-options
                 hide-bottom-space
@@ -684,7 +690,13 @@ onMounted(() => {
                 dense
                 option-label="name"
                 option-value="id"
-                :options="commanderIdOp"
+                :options="
+                  commanderIdOp.filter(
+                    (i) =>
+                      i.id !== formRound.evaluatorId &&
+                      i.id !== formRound.commanderHighId
+                  )
+                "
                 emit-value
                 map-options
                 use-input
@@ -716,7 +728,13 @@ onMounted(() => {
                 dense
                 option-label="name"
                 option-value="id"
-                :options="commanderHighOp"
+                :options="
+                  commanderHighOp.filter(
+                    (i) =>
+                      i.id !== formRound.evaluatorId &&
+                      i.id !== formRound.commanderId
+                  )
+                "
                 emit-value
                 map-options
                 use-input