From 140a3197180ecf1564b1d5ff906a27cbba461adf Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 6 Jan 2025 16:37:28 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=95=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=80=E0=B8=97=E0=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_evaluate/components/EvaluateStepMain.vue    |  2 ++
 src/modules/06_evaluate/components/step/step8.vue  | 14 +++++++++++++-
 .../06_evaluate/components/viewstep/viewStep1.vue  |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue
index 572ebde..c06916f 100644
--- a/src/modules/06_evaluate/components/EvaluateStepMain.vue
+++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue
@@ -294,7 +294,9 @@ async function saveStep1() {
 
   const evaluateType = route.params.type.toString();
   const form = {
+    root: formDetail.value.root,
     userId: formDetail.value.id,
+    orgRootId: formDetail.value.rootId,
     citizenId: formDetail.value.citizenId,
     prefix: formDetail.value.prefix,
     fullName: `${formDetail.value.prefix}${formDetail.value.firstName} ${formDetail.value.lastName}`,
diff --git a/src/modules/06_evaluate/components/step/step8.vue b/src/modules/06_evaluate/components/step/step8.vue
index b911678..c223835 100644
--- a/src/modules/06_evaluate/components/step/step8.vue
+++ b/src/modules/06_evaluate/components/step/step8.vue
@@ -27,7 +27,7 @@ const modalView = ref<boolean>(false);
 const numOfPages = ref<number>(0);
 const page = ref<number>(1);
 const pdfSrc = ref<any>();
-
+const evaluationResult = ref<string>("");
 /** ไปหน้าต่อไปของรายงาน */
 function nextPage() {
   if (page.value < numOfPages.value) {
@@ -149,6 +149,7 @@ async function fetcheSigner(id: string) {
       author.value = data.authorDoc2;
       subject.value = data.subjectDoc2;
       assignedPosition.value = data.assignedPosition;
+      evaluationResult.value = data.evaluationResult;
     })
     .catch(() => {})
     .finally(() => {
@@ -243,6 +244,17 @@ onMounted(async () => {
           </div>
         </q-card>
       </div>
+      <div
+        v-if="evaluationResult !== 'PENDING'"
+        align="right"
+        :class="
+          evaluationResult == 'PASS'
+            ? `full-width text-green`
+            : `full-width text-orange`
+        "
+      >
+        ผลการพิจารณา : {{ evaluationResult == "PASS" ? "ผ่าน" : "ไม่ผ่าน" }}
+      </div>
     </div>
   </div>
 
diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
index d200008..1cd8c0a 100644
--- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue
+++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
@@ -72,6 +72,8 @@ async function fetchDetail() {
     .get(config.API.positionBykeycloak())
     .then((res) => {
       const data = res.data.result;
+      formDetail.root = data.root;
+      formDetail.rootId = data.rootId;
       formDetail.userId = data.id;
       formDetail.citizenId = data.citizenId;
       formDetail.prefix = data.prefix;