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:
STW_TTTY\stwtt 2024-06-07 09:53:10 +07:00
commit b6af8ccb70
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/06_retirement/components/ListRetirement/TableList.vue
View file

@ -11,7 +11,6 @@ import DialogHeader from "@/components/DialogHeader.vue";
import DialogPopupReason from "@/components/Dialogs/PopupReason.vue"; import DialogPopupReason from "@/components/Dialogs/PopupReason.vue";
import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
import { format } from "path"; import { format } from "path";
import type { substitute } from "esri/intl";
const modalPersonal = ref<boolean>(false); const modalPersonal = ref<boolean>(false);
const personId = ref<string>(""); const personId = ref<string>("");
@ -102,7 +101,7 @@ const fecthlistprofile = async (id: string) => {
id: e.id, id: e.id,
profileId: e.profileId, profileId: e.profileId,
order: e.order, order: e.order,
name: e.fullName, name: e.prefix + e.firstName + " " + e.lastName,
organization: e.root, organization: e.root,
position: e.position, position: e.position,
positionNumber: e.posNo, positionNumber: e.posNo,