Merge branch 'develop' into devTee

src/modules/03_retire/views/addRetire.vue

@@ -607,7 +607,7 @@ onMounted(() => {
           dataDetail.status !== 'DONEREJECT'
         "
       >
-        <Workflow :id="id" sys-name="RETIREMENT_RESIFNATION" />
+        <Workflow :id="id" sys-name="SYS_RETIREMENT" />
       </div>
     </div>
   </div>
@@ -627,7 +627,7 @@ onMounted(() => {
       <q-separator />
 
       <q-card-section>
-        <Workflow :id="id" sys-name="LEAVE_CANCEL" />
+        <Workflow :id="id" sys-name="RETIREMENT_CANCEL" />
       </q-card-section>
     </q-card>
   </q-dialog>

src/modules/05_leave/components/DialogDetail.vue

@@ -16,7 +16,7 @@ import type {
 } from "@/modules/05_leave/interface/response/leave";
 
 import DialogHeader from "@/components/DialogHeader.vue";
-import Workflow from "@/components/Workflow/Main.vue"
+import Workflow from "@/components/Workflow/Main.vue";
 import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue";
 import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue";
 import FormHoliday from "@/modules/05_leave/components/formDetail/05_VacationForm.vue";
@@ -495,7 +495,7 @@ watch(
               :data="formData"
             />
 
-            <Workflow :id="props.leaveId" sys-name="LEAVE_LIST" />
+            <Workflow :id="props.leaveId" sys-name="SYS_LEAVE_LIST" />
           </div>
 
           <div

src/modules/10_registry/components/DialogAddRequestEdit.vue

@@ -307,8 +307,8 @@ watch(
             ที่อยู่ตามทะเบียนบ้าน
             <ul>
               <li>ที่อยู่ (บ้านเลขที่ หมู่ ตรอก ซอย ถนน ใส่ในฟิลด์นี้)</li>
-              <li>แขวง/ตำ บล</li>
-              <li>เขต/อำ เภอ</li>
+              <li>แขวง/ตำบล</li>
+              <li>เขต/อำเภอ</li>
               <li>จังหวัด</li>
               <li>รหัสไปรษณีย์</li>
             </ul>

src/modules/10_registry/views/main.vue

@@ -34,6 +34,7 @@ const formData = reactive<any>({
   posExecutiveName: "",
   posTypeName: "",
   posLevelName: "",
+  posNo: "",
 });
 const sizeImg = ref<string>("");
 function onResize(size: any) {
@@ -51,6 +52,7 @@ function getMain() {
     .get(config.API.profilePosition())
     .then(async (res) => {
       const data = res.data.result;
+
       formData.prefix = data.prefix;
       formData.firstName = data.firstName;
       formData.lastName = data.lastName;
@@ -59,6 +61,7 @@ function getMain() {
       formData.posTypeName = data.posTypeName;
       formData.posExecutiveName = data.posExecutiveName;
       formData.posLevelName = data.posLevelName;
+      formData.posNo = `${data.rootShortName}${data.posMaster}`;
       store.profileId = data.profileId;
       if (data.avatarName) {
         await getImg(data.profileId, data.avatarName);
@@ -74,9 +77,9 @@ function getMain() {
     });
 }
 
-function getImg(id: string, pathName: string) {
+async function getImg(id: string, pathName: string) {
   showLoader();
-  http
+  await http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName))
     .then((res) => {
       profileImg.value = res.data.downloadUrl;
@@ -227,17 +230,18 @@ onMounted(async () => {
                 <span class="text-grey text-weight-medium">{{
                   formData.position ? `${formData.position}` : "-"
                 }}</span>
+                <div class="text-grey">{{ formData.posNo }}</div>
               </div>
             </q-card-section>
 
             <q-list separator class="q-mt-md">
-              <q-separator />
+              <!-- <q-separator />
               <q-item>
                 <q-item-section class="text-grey-6">{{
                   store.typeProfile == "OFFICER" ? "ตำแหน่งในสายงาน" : "ตำแหน่ง"
                 }}</q-item-section>
                 <q-item-section>{{ formData.posExecutiveName }}</q-item-section>
-              </q-item>
+              </q-item> -->
               <q-item>
                 <q-item-section class="text-grey-6">{{
                   store.typeProfile == "OFFICER" ? "ตำแหน่งประเภท" : "กลุ่มงาน"
@@ -346,6 +350,7 @@ onMounted(async () => {
               <span class="text-grey text-weight-medium">{{
                 formData.position ? `${formData.position}` : "-"
               }}</span>
+              <div class="text-grey">{{ formData.posNo }}</div>
             </div>
             <div class="row justify-center q-gutter-x-lg">
               <q-btn