Merge branch 'develop' into dev

fix: text-red isCondition
แก้ข้อความสถานะทุน
2026-02-25 11:36:30 +07:00 · 2026-02-25 11:36:13 +07:00 · 2026-02-25 11:05:45 +07:00
4 changed files with 7 additions and 6 deletions
--- 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'">
--- 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'">
--- 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 }}
--- 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":
Author	SHA1	Message	Date
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	3390a5be7a	Merge branch 'develop' into dev All checks were successful Build & Deploy on Dev / build (push) Successful in 2m45s Details	2026-02-25 11:36:30 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	0c80012317	fix: text-red isCondition	2026-02-25 11:36:13 +07:00
waruneeauy	249424d4a5	แก้ข้อความสถานะทุน	2026-02-25 11:05:45 +07:00