diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue index 67eb614d5..569ec1ee4 100644 --- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue @@ -248,6 +248,7 @@ async function onClickOpenDialog(statusEdit: boolean = false, data: any = []) { statusEdit && (await updateSelectType(data.positionType, true)); isStatusEdit.value = statusEdit; }, 500); + posLevelOptionMain.value = !statusEdit ? [] : posLevelOptionMain.value; modalDialogSalary.value = true; salaryId.value = data.id; @@ -261,8 +262,10 @@ async function onClickOpenDialog(statusEdit: boolean = false, data: any = []) { formDataSalary.positionPathSide = statusEdit ? data.positionPathSide : ""; formDataSalary.positionExecutive = statusEdit ? data.positionExecutive : ""; formDataSalary.salaryCompensation = statusEdit ? data.mouthSalaryAmount : ""; - formDataSalary.salary = statusEdit ? data.amount : ""; - formDataSalary.salaryPos = statusEdit ? data.positionSalaryAmount : ""; + formDataSalary.salary = statusEdit ? data.amount.toLocaleString() : ""; + formDataSalary.salaryPos = statusEdit + ? data.positionSalaryAmount.toLocaleString() + : ""; formDataSalary.refCommandNo = statusEdit ? data.refCommandNo : ""; formDataSalary.templateDoc = ""; formDataSalary.doc = statusEdit ? data.templateDoc : ""; @@ -434,7 +437,6 @@ async function fetchDataOption() { .get(config.API.orgPosPosition + `?keyword=&type=ALL`) .then((res) => { const data = res.data.result; - console.log(res); const seen = new Set(); const seen2 = new Set(); diff --git a/src/modules/04_registryNew/interface/response/Profile.ts b/src/modules/04_registryNew/interface/response/Profile.ts index 63883eb57..6cc8bc90b 100644 --- a/src/modules/04_registryNew/interface/response/Profile.ts +++ b/src/modules/04_registryNew/interface/response/Profile.ts @@ -1,4 +1,6 @@ interface ResponseObject { + avatar: null | string; + avatarName: null | string; birthDate: Date | null; bloodGroup: string | null; citizenId: string; @@ -26,7 +28,7 @@ interface ResponseObject { posTypeId: string | null; position: string | null; prefix: string; - rank: string | null + rank: string | null; relationship: string | null; religion: string | null; telephoneNumber: string | null; diff --git a/src/modules/04_registryNew/views/detailView.vue b/src/modules/04_registryNew/views/detailView.vue index 4e452ca88..21d293061 100644 --- a/src/modules/04_registryNew/views/detailView.vue +++ b/src/modules/04_registryNew/views/detailView.vue @@ -190,6 +190,11 @@ async function fetchDataPersonal() { .then((res) => { formDetail.value = res.data.result; fileName.value = res.data.result.avatarName; + if (formDetail.value?.avatarName) { + fetchProfile(profileId.value); + } else { + profilePicture.value = avatar; + } }) .catch((err) => { messageError($q, err); @@ -482,7 +487,7 @@ async function selectAvatarHistory() { onMounted(async () => { // fileName.value = `profile-${profileId.value}`; await fetchDataPersonal(); - await fetchProfile(profileId.value); + // await fetchProfile(profileId.value); }); @@ -617,13 +622,17 @@ onMounted(async () => {
-
ตำแหน่งในสายงาน
+
+ {{ empType === "" ? "ตำแหน่งในสายงาน" : "ตำแหน่ง" }} +
{{ formDetail?.position || "-" }}
-
ประเภทตำแหน่ง
+
+ {{ empType === "" ? "ประเภทตำแหน่ง" : "กลุ่มงาน" }} +
{{ formDetail?.posType?.posTypeName || "-" }}
@@ -631,7 +640,9 @@ onMounted(async () => {
-
ระดับตำแหน่ง
+
+ {{ empType === "" ? "ระดับตำแหน่ง" : "ระดับชั้นงาน" }} +
{{ formDetail?.posLevel?.posLevelName || "-" }}