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

บรรจุ => รายการ อื่นๆ

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-05-02 17:05:19 +07:00
parent 40fe9eb2da
commit 23ab289951
8 changed files with 276 additions and 396 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/05_placement/components/Repatriate/RepatriateMain.vue
View file

@ -87,7 +87,15 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.posTypeName} (${row.posLevelName})`;
let name = "";
if (row.posTypeName && row.posLevelName) {
name = `${row.posTypeName} (${row.posLevelName})`;
} else if (row.posTypeName) {
name = `${row.posTypeName}`;
} else if (row.posLevelName) {
name = `(${row.posLevelName})`;
} else name = "-";
return name;
},
},
{

5
src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
View file

@ -29,6 +29,7 @@ const {
hideLoader,
success,
dialogConfirm,
findOrgName,
} = mixin;
const myForm = ref<QForm | null>(null);
@ -59,7 +60,9 @@ const getData = () => {
dataProfile.value = res.data.result as unknown as DataProfile;
fullname.value = `${data.prefix}${data.firstName} ${data.lastName}`;
organizationPositionOld.value = data.organizationPositionOld;
organizationPositionOld.value = data.organizationPositionOld
? data.organizationPositionOld
: findOrgName(data);
positionTypeOld.value = data.positionTypeOld;
positionLevelOld.value = data.positionLevelOld;
positionNumberOld.value = data.positionNumberOld;