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

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

Browse source 
* 'develop' of github.com:Frappet/bma-ehr-frontend:
  fix: ซ่อนคำหน้าชื่อ ถ้าเป็นnull
  fix: แก้คำผิด
This commit is contained in:
Warunee Tamkoo 2024-06-13 16:29:58 +07:00
commit b6c1896944
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/03_recruiting/views/01_compete/DetailEx.vue
View file

@ -202,7 +202,7 @@
<div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
<div class="col-xs-4 col-sm-5 text-weight-bold q-pt-sm">
ผลการสอบx
ผลการสอบ
</div>
<div
class="col-xs-8 col-sm-6 q-pr-xs text-weight-bold text-subtitle1"

6
src/modules/05_placement/components/AppointEmployee/Detail.vue
View file

@ -72,9 +72,9 @@ const fecthappointmentByid = async () => {
const data = res.data.result;
appointment.value = data;
profileId.value = data.profileId;
title.value.fullname = `${data.prefix}${data.firstName ?? "-"} ${
data.lastName ?? "-"
}`;
title.value.fullname = `${data.prefix === null ? "" : data.prefix}${
data.firstName ?? "-"
} ${data.lastName ?? "-"}`;
title.value.organizationPositionOld = data.organizationPositionOld ?? "-";
title.value.positionLevelOld = data.positionLevelOld ?? "-";
title.value.positionTypeOld = data.positionTypeOld ?? "-";