From 838ae1ae3c8234850c31b50f6e8c4ec6d78f83b7 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 18 Apr 2024 16:24:31 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=97?=
 =?UTF-8?q?=E0=B8=B8=E0=B8=99=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=9E?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=92=E0=B8=99=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/scholarship/DetailView.vue       | 17 +++++++++++++++++
 .../interface/request/Scholarship.ts            |  5 +++++
 .../interface/response/Scholarship.ts           |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index 0578c03fb..c7c17ac50 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -118,6 +118,11 @@ const formBody = reactive<FormsSholarship>({
   guarantorCitizenId: "", //เลขประจำตัวประชาชน(ผู้ค้ำ)
   guarantorPosition: "", //ตำแหน่ง(ผู้ค้ำ)
   guarantorPosExecutive: "", //ชื่อตำแหน่งทางการบริหาร(ผู้ค้ำ)
+  guarantorOrg: "",
+  guarantorRootId: null,
+  guarantorRoot: "",
+  guarantorOrgRootShortName: "",
+  guarantorOrgRevisionId: null,
   posLevelguarantorId: null, //ไอดีระดับตำแหน่ง(ผู้ค้ำ)
   posTypeguarantorId: null, //ไอดีประเภทตำแหน่ง(ผู้ค้ำ)
   scholarshipYear: null, //ปีงบประมาณที่ได้รับทุน
@@ -178,6 +183,11 @@ function fetchDataDetail(id: string) {
       formBody.guarantorCitizenId = data.guarantorCitizenId;
       formBody.guarantorPosition = data.guarantorPosition;
       formBody.guarantorPosExecutive = data.guarantorPosExecutive;
+      formBody.guarantorOrg = data.guarantorOrg;
+      formBody.guarantorRootId = data.guarantorRootId;
+      formBody.guarantorRoot = data.guarantorRoot;
+      formBody.guarantorOrgRootShortName = data.guarantorOrgRootShortName;
+      formBody.guarantorOrgRevisionId = data.guarantorOrgRevisionId;
       formBody.posLevelguarantorId = data.posLevelguarantorId;
       formBody.posTypeguarantorId = data.posTypeguarantorId;
       formBody.scholarshipYear = data.scholarshipYear;
@@ -239,6 +249,7 @@ function fetchDataDetail(id: string) {
       dataGuarantor.positionSide = data.guarantorPosExecutive
         ? data.guarantorPosExecutive
         : "-";
+      dataGuarantor.org = data.guarantorOrg ? data.guarantorOrg : "-";
       isStatus.value = data.status;
       isGov.value = data.citizenId ? true : false;
       isGuarantor.value = data.guarantorCitizenId ? true : false;
@@ -415,6 +426,11 @@ function upDate(data: DataPerson) {
     formBody.posTypeguarantorId = data.posTypeId;
     formBody.posLevelguarantorId = data.posLevelId;
     formBody.guarantorPosExecutive = data.positionSide;
+    formBody.guarantorOrg = data.org;
+    formBody.guarantorRootId = data.rootId;
+    formBody.guarantorRoot = data.root;
+    formBody.guarantorOrgRootShortName = data.orgRootShortName;
+    formBody.guarantorOrgRevisionId = data.orgRevisionId;
 
     dataGuarantor.id = data.id ? data.id : "-";
     dataGuarantor.citizenId = data.citizenId ? data.citizenId : "-";
@@ -423,6 +439,7 @@ function upDate(data: DataPerson) {
     dataGuarantor.type = data.type ? data.type : "-";
     dataGuarantor.level = data.level ? data.level : "-";
     dataGuarantor.positionSide = data.positionSide ? data.positionSide : "-";
+    dataGuarantor.org = data.org ? data.org : "-";
 
     isGuarantor.value = true;
   }
diff --git a/src/modules/15_development/interface/request/Scholarship.ts b/src/modules/15_development/interface/request/Scholarship.ts
index 9ec9baa54..d73ecf407 100644
--- a/src/modules/15_development/interface/request/Scholarship.ts
+++ b/src/modules/15_development/interface/request/Scholarship.ts
@@ -21,6 +21,11 @@ interface FormsSholarship {
   guarantorCitizenId: string; //เลขประจำตัวประชาชน(ผู้ค้ำ)
   guarantorPosition: string; //ตำแหน่ง(ผู้ค้ำ)
   guarantorPosExecutive: string; //ชื่อตำแหน่งทางการบริหาร(ผู้ค้ำ)
+  guarantorOrg: string;
+  guarantorRootId: string | null;
+  guarantorRoot: string;
+  guarantorOrgRootShortName: string;
+  guarantorOrgRevisionId: string | null;
   posLevelguarantorId: string | null; //ไอดีระดับตำแหน่ง(ผู้ค้ำ)
   posTypeguarantorId: string | null; //ไอดีประเภทตำแหน่ง(ผู้ค้ำ)
   scholarshipYear: number | null; //ปีงบประมาณที่ได้รับทุน
diff --git a/src/modules/15_development/interface/response/Scholarship.ts b/src/modules/15_development/interface/response/Scholarship.ts
index c14f378dc..16b58f81f 100644
--- a/src/modules/15_development/interface/response/Scholarship.ts
+++ b/src/modules/15_development/interface/response/Scholarship.ts
@@ -28,6 +28,11 @@ interface DataSholarship {
   guarantorCitizenId: string; //เลขประจำตัวประชาชน(ผู้ค้ำ)
   guarantorPosition: string; //ตำแหน่ง(ผู้ค้ำ)
   guarantorPosExecutive: string; //ชื่อตำแหน่งทางการบริหาร(ผู้ค้ำ)
+  guarantorOrg: string;
+  guarantorRootId: string | null;
+  guarantorRoot: string;
+  guarantorOrgRootShortName: string;
+  guarantorOrgRevisionId: string | null;
   posLevelguarantorId: string; //ไอดีระดับตำแหน่ง(ผู้ค้ำ)
   posTypeguarantorId: string; //ไอดีประเภทตำแหน่ง(ผู้ค้ำ)
   posTypeguarantorName: string; //ไอดีระดับตำแหน่ง(ผู้ค้ำ)