Merge branch 'develop' into devTee

This commit is contained in:
STW_TTTY\stwtt 2024-06-07 09:53:10 +07:00
commit b6af8ccb70

View file

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