From 249424d4a5a51d02e0e63d36f8ab538f8d367c9c Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 25 Feb 2026 11:05:45 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=82?=
 =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=B0=E0=B8=97=E0=B8=B8=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/15_development/views/Scholarship.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/15_development/views/Scholarship.vue b/src/modules/15_development/views/Scholarship.vue
index b9e1626a0..33b4d55c3 100644
--- a/src/modules/15_development/views/Scholarship.vue
+++ b/src/modules/15_development/views/Scholarship.vue
@@ -190,7 +190,7 @@ function onDetail(id: string) {
 function conventStatus(val: string) {
   switch (val) {
     case "PENDING":
-      return "กำลังศึกษา";
+      return "อยู่ระหว่างศึกษา";
     case "REPORTED":
       return "รายงานตัวกลับเข้าปฏิบัติราชการแล้ว";
     case "GRADUATE":

From 0c800123174290ff2c4ae4d2b36650600627b680 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Feb 2026 11:36:13 +0700
Subject: [PATCH 2/2] fix: text-red isCondition

---
 src/components/Dialogs/DialogOrgSelect.vue                 | 2 +-
 src/components/Dialogs/DialogOrgSelectEmployee.vue         | 2 +-
 .../08_registryEmployee/components/DialogSelectPos.vue     | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index 5f81fb073..259d7154b 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -717,8 +717,8 @@ onMounted(async () => {
                                 :props="props"
                                 @click="onClickSelectPos(props.row.id)"
                                 :class="{
-                                  'text-red': props.row.isCondition === true,
                                   'bg-blue-2': props.row.id === positionId,
+                                  'text-red': props.row.isCondition === true,
                                 }"
                               >
                                 <div v-if="col.name == 'no'">
diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue
index e22af075a..80d5950f4 100644
--- a/src/components/Dialogs/DialogOrgSelectEmployee.vue
+++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue
@@ -685,8 +685,8 @@ onMounted(() => {
                                 :props="props"
                                 @click="onClickSelectPos(props.row.id)"
                                 :class="{
-                                  'text-red': props.row.isCondition === true,
                                   'bg-blue-2': props.row.id === positionId,
+                                  'text-red': props.row.isCondition === true,
                                 }"
                               >
                                 <div v-if="col.name == 'no'">
diff --git a/src/modules/08_registryEmployee/components/DialogSelectPos.vue b/src/modules/08_registryEmployee/components/DialogSelectPos.vue
index ad6072d71..7602cb043 100644
--- a/src/modules/08_registryEmployee/components/DialogSelectPos.vue
+++ b/src/modules/08_registryEmployee/components/DialogSelectPos.vue
@@ -681,9 +681,10 @@ onBeforeMount(async () => {
                                 :key="col.name"
                                 :props="props"
                                 @click="onClickSelectPos(props.row.id)"
-                                :class="
-                                  props.row.id === positionId ? 'bg-blue-2' : ''
-                                "
+                                :class="{
+                                  'bg-blue-2': props.row.id === positionId,
+                                  'text-red': props.row.isCondition === true,
+                                }"
                               >
                                 <div v-if="col.name == 'no'">
                                   {{ props.rowIndex + 1 }}