Merge branch 'develop' into devTee

src/modules/06_evaluate/components/viewstep/viewStep1.vue

@@ -83,7 +83,7 @@ async function fetchDetail() {
       formDetail.position = data.position;
       formDetail.oc = data.rootShortName;
       formDetail.positionLevel = data.posLevelName;
-      formDetail.posNo = data.posNo ?? '';
+      formDetail.posNo = data.posNo ?? "";
       formDetail.birthDate = data.birthDate;
       formDetail.govAge = data.govAge; // ยังไม่มี
       formDetail.salary = data.salary;
@@ -317,7 +317,7 @@ onMounted(async () => {
               <q-input
                 borderless
                 readonly
-                :model-value="`${formDetail.posNo ? formDetail.posNo :'-'}`"
+                :model-value="`${formDetail.posNo ? formDetail.posNo : '-'}`"
                 label="ตำแหน่งเลขที่"
               />
             </div>
@@ -325,7 +325,11 @@ onMounted(async () => {
               <q-input
                 borderless
                 readonly
-                :model-value="formDetail.salary"
+                :model-value="
+                  formDetail.salary
+                    ? formDetail.salary.toLocaleString('th-TH')
+                    : ''
+                "
                 label="เงินเดือน"
               />
             </div>