From d326d7b1446779e00877e7061461a921fedfb973 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 24 Feb 2025 14:11:50 +0700
Subject: [PATCH] add field

---
 .../components/detail/GovernmentInformation/07_Position.vue    | 3 +++
 .../detail/GovernmentInformation/07_PositionHistory.vue        | 3 +++
 .../components/detail/Salary/01_PositionSalary.vue             | 3 +++
 .../components/detail/Salary/01_PositionSalaryHistory.vue      | 3 +++
 src/modules/04_registryPerson/interface/response/Salary.ts     | 1 +
 5 files changed, 13 insertions(+)

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 a378bf804..7752d284c 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -108,6 +108,9 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "posNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return row.posNoAbb && row.posNo ? `${row.posNoAbb.row.posNo}` : "-";
+    },
   },
   {
     name: "positionName",
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue
index 8f50b09f4..4a6ae75ac 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue
@@ -99,6 +99,9 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "posNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return row.posNoAbb && row.posNo ? `${row.posNoAbb.row.posNo}` : "-";
+    },
   },
   {
     name: "positionLine",
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 82d0cb7df..847b8a74b 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -108,6 +108,9 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "posNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return row.posNoAbb && row.posNo ? `${row.posNoAbb.row.posNo}` : "-";
+    },
   },
   {
     name: "positionName",
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
index 6fad3db7b..fb132f16a 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
@@ -99,6 +99,9 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "posNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return row.posNoAbb && row.posNo ? `${row.posNoAbb.row.posNo}` : "-";
+    },
   },
   {
     name: "positionLine",
diff --git a/src/modules/04_registryPerson/interface/response/Salary.ts b/src/modules/04_registryPerson/interface/response/Salary.ts
index b7871ea70..08c588e88 100644
--- a/src/modules/04_registryPerson/interface/response/Salary.ts
+++ b/src/modules/04_registryPerson/interface/response/Salary.ts
@@ -32,6 +32,7 @@ interface ResListSalary {
   commandYear: string;
   positionName: string;
   positionCee: string;
+  posNoAbb: string;
 }
 
 interface ResType {