From e99a4bebc1f8de3a483760749babbc7a62ca42e9 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 10 Dec 2024 13:54:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=20=E0=B8=84=E0=B8=AD=E0=B8=A1=E0=B8=A1=E0=B9=88=E0=B8=B2=20/()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/Salary/01_PositionSalary.vue          |  2 +-
 .../18_command/components/Step/2_ListPersons.vue | 16 +++++++++++++++-
 2 files changed, 16 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 55029e7f3..200191af5 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -756,7 +756,7 @@ onMounted(() => {
           <div v-else-if="col.name == 'amount'">
             {{
               props.row.amount
-                ? `${props.row.amount}${
+                ? `${props.row.amount.toLocaleString()}${
                     props.row.amountSpecial !== 0 && props.row.amountSpecial
                       ? `(${props.row.amountSpecial.toLocaleString()})`
                       : ""
diff --git a/src/modules/18_command/components/Step/2_ListPersons.vue b/src/modules/18_command/components/Step/2_ListPersons.vue
index 63e30f59a..ce1c04a45 100644
--- a/src/modules/18_command/components/Step/2_ListPersons.vue
+++ b/src/modules/18_command/components/Step/2_ListPersons.vue
@@ -448,7 +448,21 @@ onMounted(async () => {
                       :key="col.name"
                       :props="props"
                     >
-                      {{ col.value ?? "-" }}
+                      <div v-if="col.name == 'amount'">
+                        {{
+                          props.row.amount
+                            ? `${props.row.amount.toLocaleString()}${
+                                props.row.amountSpecial !== 0 &&
+                                props.row.amountSpecial
+                                  ? `(${props.row.amountSpecial.toLocaleString()})`
+                                  : ""
+                              }`
+                            : "-"
+                        }}
+                      </div>
+                      <div v-else>
+                        {{ col.value ?? "-" }}
+                      </div>
                     </q-td>
                   </q-tr>
                 </template>