From 5562f2349f0a13a3cd5d0dcfcb94c1f6d7c4a64b Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 17 Jun 2025 13:31:53 +0700
Subject: [PATCH] rootDnaId

---
 src/modules/15_development/components/history/DialogGov.vue | 2 ++
 .../15_development/components/scholarship/DetailView.vue    | 6 ++++++
 src/modules/15_development/interface/request/Scholarship.ts | 2 ++
 .../15_development/interface/response/Scholarship.ts        | 2 ++
 4 files changed, 12 insertions(+)

diff --git a/src/modules/15_development/components/history/DialogGov.vue b/src/modules/15_development/components/history/DialogGov.vue
index 1b81d4f67..c81a24dfc 100644
--- a/src/modules/15_development/components/history/DialogGov.vue
+++ b/src/modules/15_development/components/history/DialogGov.vue
@@ -150,6 +150,7 @@ function onSubmit() {
       posNo: data.posNo,
       org: data.org,
       rootId: data.rootId,
+      rootDnaId: data.rootDnaId,
       root: data.root,
       orgRootShortName: data.orgRootShortName,
       orgRevisionId: data.orgRevisionId,
@@ -202,6 +203,7 @@ function searchFilter() {
         posNo: item.posNo ? item.posNo : null,
         org: item.org ? item.org : null,
         rootId: item.rootId ? item.rootId : null,
+        rootDnaId: item.rootId ? item.rootDnaId : null,
         root: item.root ? item.root : null,
         orgRootShortName: item.orgRootShortName ? item.orgRootShortName : null,
         orgRevisionId: item.orgRevisionId ? item.orgRevisionId : null,
diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index c462cc770..134cc079b 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -146,6 +146,7 @@ const formBody = reactive<FormsSholarship>({
   posTypeId: null, //ไอดีประเภทตำแหน่ง
   org: "",
   rootId: null,
+  rootDnaId: null,
   root: "",
   orgRootShortName: "",
   orgRevisionId: null,
@@ -158,6 +159,7 @@ const formBody = reactive<FormsSholarship>({
   guarantorPosExecutive: "", //ชื่อตำแหน่งทางการบริหาร(ผู้ค้ำ)
   guarantorOrg: "",
   guarantorRootId: null,
+  guarantorRootDnaId: null,
   guarantorRoot: "",
   guarantorOrgRootShortName: "",
   guarantorOrgRevisionId: null,
@@ -211,6 +213,7 @@ async function fetchDataDetail(id: string) {
       const data: DataSholarship = await res.data.result;
 
       formBody.profileId = data.profileId;
+      formBody.rootDnaId = data.rootDnaId;
       formBody.rank = data.rank;
       formBody.prefix = data.prefix;
       formBody.firstName = data.firstName;
@@ -229,6 +232,7 @@ async function fetchDataDetail(id: string) {
       formBody.guarantorPosExecutive = data.guarantorPosExecutive;
       formBody.guarantorOrg = data.guarantorOrg;
       formBody.guarantorRootId = data.guarantorRootId;
+      formBody.guarantorRootDnaId = data.guarantorRootDnaId;
       formBody.guarantorRoot = data.guarantorRoot;
       formBody.guarantorOrgRootShortName = data.guarantorOrgRootShortName;
       formBody.guarantorOrgRevisionId = data.guarantorOrgRevisionId;
@@ -471,6 +475,7 @@ function upDate(data: DataPerson) {
     formBody.posExecutive = data.positionSide;
     formBody.org = data.org;
     formBody.rootId = data.rootId;
+    formBody.rootDnaId = data.rootDnaId;
     formBody.root = data.root;
     formBody.orgRootShortName = data.orgRootShortName;
     formBody.orgRevisionId = data.orgRevisionId;
@@ -496,6 +501,7 @@ function upDate(data: DataPerson) {
     formBody.guarantorPosExecutive = data.positionSide;
     formBody.guarantorOrg = data.org;
     formBody.guarantorRootId = data.rootId;
+    formBody.guarantorRootDnaId = data.rootDnaId;
     formBody.guarantorRoot = data.root;
     formBody.guarantorOrgRootShortName = data.orgRootShortName;
     formBody.guarantorOrgRevisionId = data.orgRevisionId;
diff --git a/src/modules/15_development/interface/request/Scholarship.ts b/src/modules/15_development/interface/request/Scholarship.ts
index 7f5ddc4c0..ca8ea3e82 100644
--- a/src/modules/15_development/interface/request/Scholarship.ts
+++ b/src/modules/15_development/interface/request/Scholarship.ts
@@ -11,6 +11,7 @@ interface FormsSholarship {
   posTypeId: string | null; //ไอดีประเภทตำแหน่ง
   org: string;
   rootId: string | null;
+  rootDnaId: string | null;
   root: string;
   orgRootShortName: string;
   orgRevisionId: string | null;
@@ -23,6 +24,7 @@ interface FormsSholarship {
   guarantorPosExecutive: string; //ชื่อตำแหน่งทางการบริหาร(ผู้ค้ำ)
   guarantorOrg: string;
   guarantorRootId: string | null;
+  guarantorRootDnaId: string | null;
   guarantorRoot: string;
   guarantorOrgRootShortName: string;
   guarantorOrgRevisionId: string | null;
diff --git a/src/modules/15_development/interface/response/Scholarship.ts b/src/modules/15_development/interface/response/Scholarship.ts
index 00d2b709d..5992c2206 100644
--- a/src/modules/15_development/interface/response/Scholarship.ts
+++ b/src/modules/15_development/interface/response/Scholarship.ts
@@ -31,6 +31,8 @@ interface DataSholarship {
   guarantorPosExecutive: string; //ชื่อตำแหน่งทางการบริหาร(ผู้ค้ำ)
   guarantorOrg: string;
   guarantorRootId: string | null;
+  guarantorRootDnaId: string | null;
+  rootDnaId: string | null;
   guarantorRoot: string;
   guarantorOrgRootShortName: string;
   guarantorOrgRevisionId: string | null;