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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2025-04-04 17:55:32 +07:00
commit 95c577b647
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue
View file

@ -487,7 +487,7 @@ onMounted(() => {
<q-separator />
<div class="row q-pa-sm bg-grey-2">
<div class="col-3 text-grey-6 text-weight-medium">
{{ empType.value === "" ? "เลขที่ตำแหน่ง" : "ตำแหน่งเลขที่" }}
{{ empType === "" ? "เลขที่ตำแหน่ง" : "ตำแหน่งเลขที่" }}
</div>
<div class="col-3">
{{ props.row.posNo ? props.row.posNo : "-" }}

2
src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
View file

@ -112,7 +112,7 @@ const baseColumns = ref<QTableColumn[]>([
style: "font-size: 14px",
format(val, row) {
return row.posNoAbb && row.posNo
? `${row.posNoAbb}${row.posNo}`
? `${row.posNoAbb} ${row.posNo}`
: row.posNo
? row.posNo
: "-";

2
src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
View file

@ -117,7 +117,7 @@ const baseColumns = ref<QTableColumn[]>([
style: "font-size: 14px",
format(val, row) {
return row.posNoAbb && row.posNo
? `${row.posNoAbb}${row.posNo}`
? `${row.posNoAbb} ${row.posNo}`
: row.posNo
? row.posNo
: "-";

2
src/modules/04_registryPerson/views/edit/components/Table.vue
View file

@ -100,7 +100,7 @@ const baseColumns = ref<QTableColumn[]>([
style: "font-size: 14px",
format(val, row) {
return row.posNoAbb && row.posNo
? `${row.posNoAbb}${row.posNo}`
? `${row.posNoAbb} ${row.posNo}`
: row.posNo
? row.posNo
: "-";