From aaa9292abbd335e946efc3859e5c89045af353ac Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Fri, 13 Dec 2024 16:22:29 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=20=E0=B8=9B=E0=B8=B5=E0=B8=9E.=E0=B8=A8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/Salary/01_PositionSalary.vue       | 2 +-
 .../11_discipline/components/9_DisciplineReport/Main.vue | 4 ++--
 src/modules/18_command/components/Step/2_ListPersons.vue | 2 +-
 .../18_command/components/Step/Dialog2_Salary.vue        | 9 +++++----
 4 files changed, 9 insertions(+), 8 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 200191af5..80a7ffccf 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -758,7 +758,7 @@ onMounted(() => {
               props.row.amount
                 ? `${props.row.amount.toLocaleString()}${
                     props.row.amountSpecial !== 0 && props.row.amountSpecial
-                      ? `(${props.row.amountSpecial.toLocaleString()})`
+                      ? ` (${props.row.amountSpecial.toLocaleString()})`
                       : ""
                   }`
                 : "-"
diff --git a/src/modules/11_discipline/components/9_DisciplineReport/Main.vue b/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
index 5516a122a..249929b40 100644
--- a/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
+++ b/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
@@ -248,7 +248,7 @@ onMounted(async () => {
 
 <template>
   <div class="toptitle text-dark col-12 row items-center">
-    จำนวนและรายชื่อที่กระทำความผิดทางวินัย
+    รายงานวินัยครับเขาให้อิงตามปีปฏิทิน
   </div>
 
   <div class="q-pa-sm q-gutter-sm">
@@ -367,7 +367,7 @@ onMounted(async () => {
                       dense
                       outlined
                       :model-value="Number(year) + 543"
-                      :label="`${'ปีงบประมาณ'}`"
+                      :label="`${'ปีพ.ศ.'}`"
                     >
                       <template v-slot:prepend>
                         <q-icon
diff --git a/src/modules/18_command/components/Step/2_ListPersons.vue b/src/modules/18_command/components/Step/2_ListPersons.vue
index ce1c04a45..68dfa6867 100644
--- a/src/modules/18_command/components/Step/2_ListPersons.vue
+++ b/src/modules/18_command/components/Step/2_ListPersons.vue
@@ -454,7 +454,7 @@ onMounted(async () => {
                             ? `${props.row.amount.toLocaleString()}${
                                 props.row.amountSpecial !== 0 &&
                                 props.row.amountSpecial
-                                  ? `(${props.row.amountSpecial.toLocaleString()})`
+                                  ? ` (${props.row.amountSpecial.toLocaleString()})`
                                   : ""
                               }`
                             : "-"
diff --git a/src/modules/18_command/components/Step/Dialog2_Salary.vue b/src/modules/18_command/components/Step/Dialog2_Salary.vue
index 73aad1c4b..c8a913f5c 100644
--- a/src/modules/18_command/components/Step/Dialog2_Salary.vue
+++ b/src/modules/18_command/components/Step/Dialog2_Salary.vue
@@ -139,6 +139,7 @@ watch(
         const list = props.selectPersonData;
         formData.amount = list.amount;
         formData.positionSalaryAmount = list.positionSalaryAmount;
+        formData.amountSpecial = list.amountSpecial;
         formData.monthSalaryAmount = list.mouthSalaryAmount;
         formData.remarkVertical = list.remarkVertical;
         formData.remarkHorizontal = list.remarkHorizontal;
@@ -170,7 +171,7 @@ watch(
                   lazy-rules
                   hide-bottom-space
                   v-model="formData.amount"
-                  :class="getClass(!readonly)"
+                  :class="getClass(storeDetail.isSalary)"
                   mask="###,###,###,###,###,###"
                   reverse-fill-mask
                   :readonly="!storeDetail.isSalary"
@@ -188,7 +189,7 @@ watch(
                   lazy-rules
                   hide-bottom-space
                   v-model="formData.amountSpecial"
-                  :class="getClass(!readonly)"
+                  :class="getClass(storeDetail.isSalary)"
                   :readonly="!storeDetail.isSalary"
                   mask="###,###,###,###,###,###"
                   reverse-fill-mask
@@ -205,7 +206,7 @@ watch(
                   lazy-rules
                   hide-bottom-space
                   v-model="formData.positionSalaryAmount"
-                  :class="getClass(!readonly)"
+                  :class="getClass(storeDetail.isSalary)"
                   :readonly="!storeDetail.isSalary"
                   mask="###,###,###,###,###,###"
                   reverse-fill-mask
@@ -223,7 +224,7 @@ watch(
                   lazy-rules
                   hide-bottom-space
                   v-model="formData.monthSalaryAmount"
-                  :class="getClass(!readonly)"
+                  :class="getClass(storeDetail.isSalary)"
                   :readonly="!storeDetail.isSalary"
                   mask="###,###,###,###,###,###"
                   reverse-fill-mask