From 38120c26adaebe65b21f0a528cb4c1a08982805a Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 29 Nov 2024 15:20:16 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=97=E0=B8=B0?=
 =?UTF-8?q?=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=20=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87/?=
 =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/Salary/01_PositionSalary.vue    | 11 ++++++-----
 .../04_registryPerson/interface/response/Salary.ts    |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index 62ca30766..65c401f40 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -264,7 +264,10 @@ async function updateSelectType(val: string, status: boolean = false) {
   if (listLevel) {
     posLevelOptionMain.value = listLevel.posLevels.map((e: any) => ({
       id: e.id,
-      name: e.posLevelName.toString(),
+      name:
+        empType.value === ""
+          ? e.posLevelName
+          : `${listLevel.posTypeShortName} ${e.posLevelName}`,
     }));
 
     formDataSalary.positionLevel = !status ? "" : formDataSalary.positionLevel;
@@ -453,7 +456,7 @@ function onSubmit() {
       success($q, "บันทึกข้อมูลสำเร็จ");
     } catch (e) {
       messageError($q, e);
-      hideLoader()
+      hideLoader();
     } finally {
     }
   });
@@ -662,7 +665,6 @@ onMounted(() => {
       map-options
       :options="columns"
       option-value="name"
-      
       style="min-width: 140px"
     />
   </div>
@@ -768,7 +770,7 @@ onMounted(() => {
       <q-form greedy @submit.prevent @validation-success="onSubmit">
         <DialogHeader
           :tittle="
-            isStatusEdit ? 'แก้ไขตำแหน่งเงินเดือน' : 'เพิ่มตำแหน่งเงินเดือน'
+            isStatusEdit ? 'แก้ไขตำแหน่ง/เงินเดือน' : 'เพิ่มตำแหน่ง/เงินเดือน'
           "
           :close="onClickCloseDialog"
         />
@@ -1020,7 +1022,6 @@ onMounted(() => {
                 dense
                 outlined
                 v-model="formDataSalary.salaryPos"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกเงินประจำตำแหน่ง'}`]"
                 label="เงินประจำตำแหน่ง"
                 mask="###,###,###,###"
                 reverse-fill-mask
diff --git a/src/modules/04_registryPerson/interface/response/Salary.ts b/src/modules/04_registryPerson/interface/response/Salary.ts
index 84df73af8..8b459fa5b 100644
--- a/src/modules/04_registryPerson/interface/response/Salary.ts
+++ b/src/modules/04_registryPerson/interface/response/Salary.ts
@@ -30,6 +30,7 @@ interface ResType {
   posTypeName: string;
   posTypeRank: number;
   posLevels: PosLevel[];
+  posTypeShortName?: string;
 }
 
 interface PosLevel {