From 91ea489bc7a5606b8ad1bcf389b74f175e357139 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 17 Jun 2025 11:31:54 +0700
Subject: [PATCH] registry add field positionExecutiveField

---
 .../detail/GovernmentInformation/07_Position.vue      | 11 +++++++++++
 .../components/detail/Salary/01_PositionSalary.vue    | 11 +++++++++++
 .../04_registryPerson/interface/index/government.ts   |  2 ++
 .../04_registryPerson/interface/request/Salary.ts     |  2 ++
 .../04_registryPerson/interface/response/Position.ts  |  2 ++
 5 files changed, 28 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 e1b37812a..a8f4c2b42 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -178,6 +178,11 @@ const baseColumns = ref<QTableColumn[]>([
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    format(val, row) {
+      return !row.positionExecutiveField
+        ? val
+        : `${val} (${row.positionExecutiveField})`;
+    },
   },
   {
     name: "commandNo",
@@ -361,6 +366,8 @@ const formData = reactive<FormPostition>({
   positionCee: "", //ระดับซี
   positionPathSide: "", //ด้าน/สาขา
   positionExecutive: "", //ตำแหน่งทางการบริหาร
+  positionExecutiveField: "", //ด้านทางการบริหาร
+  positionArea: "", //ด้าน/สาขา
   amount: null, //เงินเดือน
   amountSpecial: null, //เงินค่าตอบแทนพิเศษ
   orgRoot: "", //หน่วยงาน
@@ -672,6 +679,10 @@ async function onClickOpenDialog(
   formData.positionLine = statusEdit ? data.positionLine : "";
   formData.positionPathSide = statusEdit ? data.positionPathSide : "";
   formData.positionExecutive = statusEdit ? data.positionExecutive : "";
+  formData.positionExecutiveField = statusEdit
+    ? data.positionExecutiveField
+    : "";
+  formData.positionArea = statusEdit ? data.positionArea : "";
   formData.amount = statusEdit ? data.amount : null;
   formData.amountSpecial = statusEdit ? data.amountSpecial : null;
   formData.orgRoot = statusEdit ? data.orgRoot : "";
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 f0c2988de..9966a4e25 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -183,6 +183,11 @@ const baseColumns = ref<QTableColumn[]>([
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    format(val, row) {
+      return !row.positionExecutiveField
+        ? val
+        : `${val} (${row.positionExecutiveField})`;
+    },
   },
   {
     name: "commandNo",
@@ -414,6 +419,8 @@ const formData = reactive<FormSalary>({
   positionLine: "", // สายงาน
   positionPathSide: "", //ด้าน/สาขา
   positionExecutive: "", //ตำแหน่งทางการบริหาร
+  positionExecutiveField: "", //ด้านทางการบริหาร
+  positionArea: "", //ด้าน/สาขา
   amount: null, //เงินเดือน
   amountSpecial: null, //เงินค่าตอบแทนพิเศษ
   positionSalaryAmount: null, //เงินประจำตำแหน่ง
@@ -653,6 +660,10 @@ async function onClickOpenDialog(
   formData.positionLine = statusEdit ? data.positionLine : "";
   formData.positionPathSide = statusEdit ? data.positionPathSide : "";
   formData.positionExecutive = statusEdit ? data.positionExecutive : "";
+  formData.positionExecutiveField = statusEdit
+    ? data.positionExecutiveField
+    : "";
+  formData.positionArea = statusEdit ? data.positionArea : "";
   formData.amount = statusEdit ? data.amount : null;
   formData.amountSpecial = statusEdit ? data.amountSpecial : null;
   formData.positionSalaryAmount = statusEdit ? data.positionSalaryAmount : null;
diff --git a/src/modules/04_registryPerson/interface/index/government.ts b/src/modules/04_registryPerson/interface/index/government.ts
index 07dde7313..bf46d84fa 100644
--- a/src/modules/04_registryPerson/interface/index/government.ts
+++ b/src/modules/04_registryPerson/interface/index/government.ts
@@ -72,6 +72,8 @@ interface FormPostition {
   positionLine: string; // สายงาน
   positionPathSide: string; //ด้าน/สาขา
   positionExecutive: string; //ตำแหน่งทางการบริหาร
+  positionExecutiveField?: string; //ด้านทางการบริหาร
+  positionArea?: string; //ด้าน/สาขา
   positionCee: string; //ระดับซี
   amount: number | null; //เงินเดือน
   amountSpecial: number | null; //เงินค่าตอบแทนพิเศษ
diff --git a/src/modules/04_registryPerson/interface/request/Salary.ts b/src/modules/04_registryPerson/interface/request/Salary.ts
index 61b78b3ba..da895b49c 100644
--- a/src/modules/04_registryPerson/interface/request/Salary.ts
+++ b/src/modules/04_registryPerson/interface/request/Salary.ts
@@ -13,6 +13,8 @@ interface FormSalary {
   positionLine: string; // สายงาน
   positionPathSide: string; //ด้าน/สาขา
   positionExecutive: string; //ตำแหน่งทางการบริหาร
+  positionExecutiveField?: string; //ด้านทางการบริหาร
+  positionArea?: string; //ด้าน/สาขา
   amount: number | null; //เงินเดือน
   amountSpecial: number | null; //เงินค่าตอบแทนพิเศษ
   positionSalaryAmount: number | null; //เงินประจำตำแหน่ง
diff --git a/src/modules/04_registryPerson/interface/response/Position.ts b/src/modules/04_registryPerson/interface/response/Position.ts
index ce36b9402..ec16d1c36 100644
--- a/src/modules/04_registryPerson/interface/response/Position.ts
+++ b/src/modules/04_registryPerson/interface/response/Position.ts
@@ -29,6 +29,8 @@ interface DataPositions {
   posNoAbb: string;
   positionCee: string;
   positionExecutive: string;
+  positionExecutiveField?: string;
+  positionArea?: string;
   positionLevel: string;
   positionLine: string;
   positionPathSide: string;