From 55f865baf7a354e611fb25b243d56d37f9529c14 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 16 Jun 2025 13:35:59 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A5=E0=B9=80=E0=B8=95=E0=B8=AD=E0=B8=A3=E0=B9=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../09_leave/components/03_ChangeRound/DialogForm.vue      | 7 ++++++-
 src/modules/09_leave/stores/ChangeRoundStore.ts            | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
index 6423d2914..6957013bd 100644
--- a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
+++ b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
@@ -151,11 +151,11 @@ async function fetchDataOption() {
           name: `${r.startTimeMorning}-${r.endTimeAfternoon}`,
         });
       });
-
       const filterData = option.filter(
         (e) => e.name !== props.DataRow?.currentRound
       );
       dataStore.roundOp = filterData;
+      dataStore.roundOpMain = option;
     })
     .catch((err) => {
       messageError($q, err);
@@ -205,6 +205,11 @@ watch(
     if (props.modal === true && dataStore.roundOp.length == 0) {
       currentPage.value = 1;
       await fetchDataOption();
+    } else {
+      const dataOp = dataStore.roundOpMain.filter(
+        (e: any) => e.name !== props.DataRow?.currentRound
+      );
+      dataStore.roundOp = dataOp;
     }
   }
 );
diff --git a/src/modules/09_leave/stores/ChangeRoundStore.ts b/src/modules/09_leave/stores/ChangeRoundStore.ts
index 80ed97d3c..82c89fa7b 100644
--- a/src/modules/09_leave/stores/ChangeRoundStore.ts
+++ b/src/modules/09_leave/stores/ChangeRoundStore.ts
@@ -22,6 +22,7 @@ export const useChangeRoundDataStore = defineStore(
   "changeRoundDataStore",
   () => {
     const roundOp = ref<any>([]);
+    const roundOpMain = ref<any>([]);
     //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
     const visibleColumns = ref<string[]>([
       "cardId",
@@ -235,7 +236,8 @@ export const useChangeRoundDataStore = defineStore(
 
       totalListMain,
       maxPageMain,
-      roundOp
+      roundOp,
+      roundOpMain
     };
   }
 );