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/hrms-mgt into develop

Browse source
This commit is contained in:
Warunee Tamkoo 2025-05-06 16:05:54 +07:00
commit f183c200f6
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -278,7 +278,7 @@ async function getDataTable(id: string, level: number = 0) {
isPosition: e.isPosition,
posMasterNo:
e.orgShortname +
(e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
(e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") + ' ' +
e.posMasterNo +
(e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
positionName: e.positionName,

8
src/modules/05_placement/views/03_receiveMain.vue
View file

@ -610,6 +610,14 @@ onMounted(async () => {
: "-"
}}
</div>
<div
v-else-if="col.name == 'organizationNameOld'"
class="text-html"
>
{{ col.value ? col.value : "-" }}
</div>
<div v-else-if="col.name == 'createdAt'">
{{
props.row.createdAt ? date2Thai(props.row.createdAt) : "-"