From 6b6bbadf878f5b2ae5e74142e2422cdd5381c6d3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 29 Jan 2025 10:56:38 +0700
Subject: [PATCH 1/2] fix

---
 .../components/probation/FormEvaluation/Template3.vue           | 2 +-
 .../probation/FormEvaluation/TemplateSummaryScore.vue           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue
index 75fd09ac6..06119cf33 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue
@@ -125,7 +125,7 @@ onMounted(() => {
 
   <div class="q-gutter-md" v-else>
     <div class="flex justify-center items-center q-my-md q-gutter-md">
-      ยังไม่ได้รับการแบบประเมินผล
+      ยังไม่ได้ดำเนินการแบบประเมินผล
     </div>
   </div>
 </template>
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/TemplateSummaryScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/TemplateSummaryScore.vue
index a56c3b489..e8e4fd01f 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/TemplateSummaryScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/TemplateSummaryScore.vue
@@ -83,7 +83,7 @@ onMounted(() => {
 
   <div class="q-gutter-md" v-else>
     <div class="flex justify-center items-center q-my-md q-gutter-md">
-      ยังไม่ได้รับการแบบประเมินผล
+      ยังไม่ได้ดำเนินการแบบประเมินผล
     </div>
   </div>
 </template>

From 4a8da53183c285384201e2cf6d9487d19af93abf Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 30 Jan 2025 10:20:58 +0700
Subject: [PATCH 2/2] fix orgTreeDnaId Development

---
 .../15_development/interface/response/Main.ts       |  3 ++-
 src/modules/15_development/views/MainPage.vue       | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/modules/15_development/interface/response/Main.ts b/src/modules/15_development/interface/response/Main.ts
index c59dc686d..372cc4241 100644
--- a/src/modules/15_development/interface/response/Main.ts
+++ b/src/modules/15_development/interface/response/Main.ts
@@ -167,6 +167,7 @@ interface DataTree {
   totalRootPositionNextUse: number | null;
   totalRootPositionNextVacant: number | null;
   children: DataTree;
+  orgTreeDnaId: string;
 }
 
 interface ResHistory {
@@ -221,5 +222,5 @@ export type {
   ResHistory,
   ResPrefix,
   ResRisk,
-  PositionsType
+  PositionsType,
 };
diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index 194bebc77..f7c006988 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -205,8 +205,8 @@ function onSubmit() {
       http
         .post(config.API.developmentMain, formProject)
         .then(async (res) => {
-          await closeDialog();
-          await router.push(`/development/${res.data.result}`);
+          closeDialog();
+          router.push(`/development/${res.data.result}`);
         })
         .catch((e) => {
           messageError($q, e);
@@ -242,12 +242,15 @@ function updateSelected(data: DataTree) {
  * function เลือกหน่วยงานที่จะค้นหาโครงกา
  */
 function updateSelectedTreeMain(data: DataTree) {
-  if (formQuery.node === data.orgLevel && formQuery.nodeId === data.orgTreeId) {
+  if (
+    formQuery.node === data.orgLevel &&
+    formQuery.nodeId === data.orgTreeDnaId
+  ) {
     formQuery.node = null;
     formQuery.nodeId = null;
   } else {
     formQuery.node = data.orgLevel;
-    formQuery.nodeId = data.orgTreeId;
+    formQuery.nodeId = data.orgTreeDnaId;
   }
   fetchListProjectNew(); //  fetch โครงการ
 }
@@ -325,7 +328,7 @@ onMounted(() => {
                 <q-item
                   clickable
                   @click.stop="updateSelectedTreeMain(prop.node)"
-                  :active="formQuery.nodeId === prop.node.orgTreeId"
+                  :active="formQuery.nodeId === prop.node.orgTreeDnaId"
                   active-class="my-list-link text-primary text-weight-medium"
                   class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                 >