ทะเบียนประวัติ =>

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();

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;

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);
 });
 </script>
 
@@ -617,13 +622,17 @@ onMounted(async () => {
         <div class="row col-12" style="padding-left: 14%">
           <div class="col-2">
             <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>
           </div>
           <div class="col-2">
             <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?.posType?.posTypeName || "-" }}
               </div>
@@ -631,7 +640,9 @@ onMounted(async () => {
           </div>
           <div class="col-2">
             <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?.posLevel?.posLevelName || "-" }}
               </div>