From 9f6c33ee54e590fed99d6b48b3f685cb09b83c75 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 19 Mar 2025 10:09:09 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/GovernmentInformation/07_Position.vue          | 7 ++-----
 .../components/detail/Salary/01_PositionSalary.vue        | 8 +++-----
 2 files changed, 5 insertions(+), 10 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 361e419b1..d6befdc8e 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -178,7 +178,7 @@ const baseColumns = ref<QTableColumn[]>([
     field: "commandNo",
     format(val, row) {
       return row.commandNo && row.commandYear
-        ? `${row.commandNo}/${row.commandYear}`
+        ? `${row.commandNo}/${Number(row.commandYear) + 543}`
         : "";
     },
     headerStyle: "font-size: 14px",
@@ -929,7 +929,7 @@ onMounted(async () => {
             :class="props.row.isEntry ? 'text-red' : ''"
           >
             <div
-              v-if="col.name == 'refCommandNo' && props.row.commandId"
+              v-if="col.name == 'commandNo' && props.row.commandId"
               @click="col.value ? onRefCommand(props.row) : null"
               :class="
                 col.value
@@ -940,9 +940,6 @@ onMounted(async () => {
               {{ col.value ? col.value : "-" }}
               <q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
             </div>
-            <div v-else-if="col.name == 'refCommandNo' && !props.row.commandId">
-              -
-            </div>
 
             <div v-else-if="col.name == 'organization'" class="table_ellipsis">
               {{ col.value ? col.value : "-" }}
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 d9c170eed..c8cd9b208 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -211,7 +211,7 @@ const baseColumns = ref<QTableColumn[]>([
     field: "commandNo",
     format(val, row) {
       return row.commandNo && row.commandYear
-        ? `${row.commandNo}/${row.commandYear}`
+        ? `${row.commandNo}/${Number(row.commandYear) + 543}`
         : "";
     },
     headerStyle: "font-size: 14px",
@@ -897,7 +897,7 @@ onMounted(async () => {
             :class="props.row.isEntry ? 'text-red' : ''"
           >
             <div
-              v-if="col.name == 'refCommandNo' && props.row.commandId"
+              v-if="col.name == 'commandNo' && props.row.commandId"
               @click="col.value ? onRefCommand(props.row) : null"
               :class="
                 col.value
@@ -908,9 +908,7 @@ onMounted(async () => {
               {{ col.value ? col.value : "-" }}
               <q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
             </div>
-            <div v-else-if="col.name == 'refCommandNo' && !props.row.commandId">
-              -
-            </div>
+
             <div v-else-if="col.name == 'organization'" class="table_ellipsis">
               {{ col.value ? col.value : "-" }}
             </div>