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 2m51s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-05-12 18:07:41 +07:00
commit 20f75d24b0
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/05_placement/components/Receive/DialogOrders.vue
View file

@ -112,9 +112,11 @@ const columns2 = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
format(val, row) { format(val, row) {
return row.positionTypeOld return row.positionTypeOld && row.positionTypeOl !== "-"
? `${row.positionTypeOld}${ ? `${row.positionTypeOld}${
row.positionLevelOld ? `(${row.positionLevelOld})` : "" row.positionLevelOld && row.positionLevelOld !== "-"
? `(${row.positionLevelOld})`
: ""
}` }`
: ""; : "";
}, },

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

@ -133,9 +133,11 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
format(val, row) { format(val, row) {
return row.positionTypeOld return row.positionTypeOld && row.positionTypeOld !== "-"
? `${row.positionTypeOld}${ ? `${row.positionTypeOld}${
row.positionLevelOld ? `(${row.positionLevelOld})` : "" row.positionLevelOld && row.positionLevelOld !== "-"
? `(${row.positionLevelOld})`
: ""
}` }`
: ""; : "";
}, },