src/components/Dialogs/DialogOrgSelect.vue

@@ -717,8 +717,8 @@ onMounted(async () => {
                                 :props="props"
                                 @click="onClickSelectPos(props.row.id)"
                                 :class="{
-                                  'bg-blue-2': props.row.id === positionId,
                                   'text-red': props.row.isCondition === true,
+                                  'bg-blue-2': props.row.id === positionId,
                                 }"
                               >
                                 <div v-if="col.name == 'no'">

src/components/Dialogs/DialogOrgSelectEmployee.vue

@@ -685,8 +685,8 @@ onMounted(() => {
                                 :props="props"
                                 @click="onClickSelectPos(props.row.id)"
                                 :class="{
-                                  'bg-blue-2': props.row.id === positionId,
                                   'text-red': props.row.isCondition === true,
+                                  'bg-blue-2': props.row.id === positionId,
                                 }"
                               >
                                 <div v-if="col.name == 'no'">

src/modules/08_registryEmployee/components/DialogSelectPos.vue

@@ -681,10 +681,9 @@ onBeforeMount(async () => {
                                 :key="col.name"
                                 :props="props"
                                 @click="onClickSelectPos(props.row.id)"
-                                :class="{
-                                  'bg-blue-2': props.row.id === positionId,
-                                  'text-red': props.row.isCondition === true,
-                                }"
+                                :class="
+                                  props.row.id === positionId ? 'bg-blue-2' : ''
+                                "
                               >
                                 <div v-if="col.name == 'no'">
                                   {{ props.rowIndex + 1 }}

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":