hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m45s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-02-25 11:36:30 +07:00
commit 3390a5be7a
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/Dialogs/DialogOrgSelect.vue
View file

@ -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'">

2
src/components/Dialogs/DialogOrgSelectEmployee.vue
View file

@ -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'">

7
src/modules/08_registryEmployee/components/DialogSelectPos.vue
View file

@ -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 }}

2
src/modules/15_development/views/Scholarship.vue
View file

@ -190,7 +190,7 @@ function onDetail(id: string) {
function conventStatus(val: string) {
switch (val) {
case "PENDING":
return "กำลังศึกษา";
return "อยู่ระหว่างศึกษา";
case "REPORTED":
return "รายงานตัวกลับเข้าปฏิบัติราชการแล้ว";
case "GRADUATE":