From df5f0f925dbd7ba470cd77bae3c57b68c4ad80fc Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 29 Apr 2025 17:23:58 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=20rules=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A0?=
 =?UTF-8?q?=E0=B8=97=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/GovernmentInformation/07_Position.vue   | 4 ++--
 .../components/detail/Salary/01_PositionSalary.vue            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
index da82bd917..adfbd4026 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -1021,7 +1021,6 @@ onMounted(async () => {
         <q-card-section style="max-height: 100%" class="scroll">
           <div class="row col-12 q-col-gutter-sm">
             <div class="col-xs-12 col-sm-6 col-md-8">
-              <!-- :rules="[(val: string) => !!val || 'กรุณาเลือกประเภทคำสั่ง']" -->
               <q-select
                 outlined
                 :class="classInput(true)"
@@ -1039,6 +1038,7 @@ onMounted(async () => {
                 use-input
                 hide-selected
                 fill-input
+                :rules="[(val: string) => !!val || 'กรุณาเลือกประเภทคำสั่ง']"
                 input-debounce="0"
                 @update:model-value="updateSelectType"
                 @filter="(inputValue: string,
@@ -1453,7 +1453,7 @@ onMounted(async () => {
                 dense
                 outlined
                 v-model="formData.amount"
-                label="เงินเดือน"
+                :label="empType == '' ? 'เงินเดือน' : 'ค่าจ้าง'"
                 mask="###,###,###,###"
                 reverse-fill-mask
                 lazy-rules
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 b27fd04c8..5cce9711f 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -971,7 +971,6 @@ onMounted(async () => {
         <q-card-section style="max-height: 100%" class="scroll">
           <div class="row col-12 q-col-gutter-sm">
             <div class="col-xs-12 col-sm-6 col-md-8">
-              <!-- :rules="[(val: string) => !!val || 'กรุณาเลือกประเภทคำสั่ง']" -->
               <q-select
                 outlined
                 :class="classInput(true)"
@@ -990,6 +989,7 @@ onMounted(async () => {
                 hide-selected
                 fill-input
                 input-debounce="0"
+                :rules="[(val: string) => !!val || 'กรุณาเลือกประเภทคำสั่ง']"
                 @update:model-value="updateSelectType"
                 @filter="(inputValue: string,
                     doneFn: Function) => filterSelector(inputValue, doneFn, 'commandCode'