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-21 11:17:26 +07:00
parent 8b12e131bc
commit b27e8fb46f
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
View file

@ -248,6 +248,7 @@ async function onClickOpenDialog(statusEdit: boolean = false, data: any = []) {
statusEdit && (await updateSelectType(data.positionType, true)); statusEdit && (await updateSelectType(data.positionType, true));
isStatusEdit.value = statusEdit; isStatusEdit.value = statusEdit;
}, 500); }, 500);
posLevelOptionMain.value = !statusEdit ? [] : posLevelOptionMain.value; posLevelOptionMain.value = !statusEdit ? [] : posLevelOptionMain.value;
modalDialogSalary.value = true; modalDialogSalary.value = true;
salaryId.value = data.id; salaryId.value = data.id;
@ -261,8 +262,10 @@ async function onClickOpenDialog(statusEdit: boolean = false, data: any = []) {
formDataSalary.positionPathSide = statusEdit ? data.positionPathSide : ""; formDataSalary.positionPathSide = statusEdit ? data.positionPathSide : "";
formDataSalary.positionExecutive = statusEdit ? data.positionExecutive : ""; formDataSalary.positionExecutive = statusEdit ? data.positionExecutive : "";
formDataSalary.salaryCompensation = statusEdit ? data.mouthSalaryAmount : ""; formDataSalary.salaryCompensation = statusEdit ? data.mouthSalaryAmount : "";
formDataSalary.salary = statusEdit ? data.amount : ""; formDataSalary.salary = statusEdit ? data.amount.toLocaleString() : "";
formDataSalary.salaryPos = statusEdit ? data.positionSalaryAmount : ""; formDataSalary.salaryPos = statusEdit
? data.positionSalaryAmount.toLocaleString()
: "";
formDataSalary.refCommandNo = statusEdit ? data.refCommandNo : ""; formDataSalary.refCommandNo = statusEdit ? data.refCommandNo : "";
formDataSalary.templateDoc = ""; formDataSalary.templateDoc = "";
formDataSalary.doc = statusEdit ? data.templateDoc : ""; formDataSalary.doc = statusEdit ? data.templateDoc : "";
@ -434,7 +437,6 @@ async function fetchDataOption() {
.get(config.API.orgPosPosition + `?keyword=&type=ALL`) .get(config.API.orgPosPosition + `?keyword=&type=ALL`)
.then((res) => { .then((res) => {
const data = res.data.result; const data = res.data.result;
console.log(res);
const seen = new Set(); const seen = new Set();
const seen2 = new Set(); const seen2 = new Set();

4
src/modules/04_registryNew/interface/response/Profile.ts
View file

@ -1,4 +1,6 @@
interface ResponseObject { interface ResponseObject {
avatar: null | string;
avatarName: null | string;
birthDate: Date | null; birthDate: Date | null;
bloodGroup: string | null; bloodGroup: string | null;
citizenId: string; citizenId: string;
@ -26,7 +28,7 @@ interface ResponseObject {
posTypeId: string | null; posTypeId: string | null;
position: string | null; position: string | null;
prefix: string; prefix: string;
rank: string | null rank: string | null;
relationship: string | null; relationship: string | null;
religion: string | null; religion: string | null;
telephoneNumber: string | null; telephoneNumber: string | null;

19
src/modules/04_registryNew/views/detailView.vue
View file

@ -190,6 +190,11 @@ async function fetchDataPersonal() {
.then((res) => { .then((res) => {
formDetail.value = res.data.result; formDetail.value = res.data.result;
fileName.value = res.data.result.avatarName; fileName.value = res.data.result.avatarName;
if (formDetail.value?.avatarName) {
fetchProfile(profileId.value);
} else {
profilePicture.value = avatar;
}
}) })
.catch((err) => { .catch((err) => {
messageError($q, err); messageError($q, err);
@ -482,7 +487,7 @@ async function selectAvatarHistory() {
onMounted(async () => { onMounted(async () => {
// fileName.value = `profile-${profileId.value}`; // fileName.value = `profile-${profileId.value}`;
await fetchDataPersonal(); await fetchDataPersonal();
await fetchProfile(profileId.value); // await fetchProfile(profileId.value);
}); });
</script> </script>
@ -617,13 +622,17 @@ onMounted(async () => {
<div class="row col-12" style="padding-left: 14%"> <div class="row col-12" style="padding-left: 14%">
<div class="col-2"> <div class="col-2">
<div class="col-sm-3 col-md-3"> <div class="col-sm-3 col-md-3">
<div class="col text-grey-6 text-caption">ตำแหน่งในสายงาน</div> <div class="col text-grey-6 text-caption">
{{ empType === "" ? "ตำแหน่งในสายงาน" : "ตำแหน่ง" }}
</div>
<div class="col">{{ formDetail?.position || "-" }}</div> <div class="col">{{ formDetail?.position || "-" }}</div>
</div> </div>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="col-sm-3 col-md-3"> <div class="col-sm-3 col-md-3">
<div class="col text-grey-6 text-caption">ประเภทตำแหน่ง</div> <div class="col text-grey-6 text-caption">
{{ empType === "" ? "ประเภทตำแหน่ง" : "กลุ่มงาน" }}
</div>
<div class="col"> <div class="col">
{{ formDetail?.posType?.posTypeName || "-" }} {{ formDetail?.posType?.posTypeName || "-" }}
</div> </div>
@ -631,7 +640,9 @@ onMounted(async () => {
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="col-sm-3 col-md-3"> <div class="col-sm-3 col-md-3">
<div class="col text-grey-6 text-caption">ระดับตำแหน่ง</div> <div class="col text-grey-6 text-caption">
{{ empType === "" ? "ระดับตำแหน่ง" : "ระดับชั้นงาน" }}
</div>
<div class="col"> <div class="col">
{{ formDetail?.posLevel?.posLevelName || "-" }} {{ formDetail?.posLevel?.posLevelName || "-" }}
</div> </div>