From e8e9b4592e4fedcaf8924d15a722fa869ffff2cb Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 29 Apr 2025 17:06:53 +0700
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=88?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=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            | 4 ++--
 1 file changed, 2 insertions(+), 2 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 666c93cfd..b27fd04c8 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -1404,10 +1404,10 @@ onMounted(async () => {
                     dense
                     outlined
                     v-model="formData.amount"
-                    label="เงินเดือน"
+                    :label="empType == '' ? 'เงินเดือน' : 'ค่าจ้าง'"
                     mask="###,###,###,###"
                     reverse-fill-mask
-                    :rules="[(val:string) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
+                    :rules="[(val:string) => !!val || `กรุณากรอก${empType == '' ? 'เงินเดือน' : 'ค่าจ้าง'}`]"
                     lazy-rules
                     hide-bottom-space
                   />

From 4acf223a0308c20fa9b1f5f5e67a60979eed37c5 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 29 Apr 2025 17:16:08 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A1=20popup=20=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/05_Leave/Dialog/DialogAddCommander.vue       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
index a061a6d74..dfd9fa720 100644
--- a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
+++ b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
@@ -239,7 +239,11 @@ watch(
               </div>
             </div>
             <div class="col-12 text-red">
-              *ลำดับการอนุมัติขึ้นอยู่กับลำดับการคลิกเลือก
+              {{
+                props.type == "APPROVER"
+                  ? ""
+                  : "*ลำดับการอนุมัติขึ้นอยู่กับลำดับการคลิกเลือก"
+              }}
             </div>
             <div class="col-12">
               <d-table