From d203a319b517b1915e508b980db12d2f98d1b1ab Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 12 Jun 2025 15:46:10 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20step=202=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=20=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=84?=
 =?UTF-8?q?=E0=B8=94=E0=B9=89=E0=B8=94=E0=B8=B6=E0=B8=87=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=AA=E0=B8=B1=E0=B8=87?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B1=E0=B8=94=E0=B8=A1=E0=B8=B2=E0=B9=81=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=94=E0=B8=87=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99=E0=B8=84?=
 =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B9=80=E0=B8=A3=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=95=E0=B9=89=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_evaluate/components/step/step2.vue     |  5 ++--
 .../06_evaluate/components/step/step6.vue     | 30 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/modules/06_evaluate/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue
index bfeab2b..70e3757 100644
--- a/src/modules/06_evaluate/components/step/step2.vue
+++ b/src/modules/06_evaluate/components/step/step2.vue
@@ -272,11 +272,13 @@ function getCommander() {
     .get(config.API.searchCommander)
     .then((res) => {
       const data = res.data.result;
-       formCommand.author = data.fullname;
+      formCommand.author = data.fullname;
       formCommand.commanderFullname = data.commanderFullname;
       formCommand.commanderPosition = data.commanderPosition;
       formCommand.commanderAboveFullname = data.commanderAboveFullname;
       formCommand.commanderAbovePosition = data.commanderAbovePosition;
+      formCommand.commanderOrg = data.commanderOrg;
+      formCommand.commanderAboveOrg = data.commanderAboveOrg;
     })
     .catch((e) => {
       console.log(e);
@@ -316,7 +318,6 @@ watch(
 onMounted(async () => {
   const user = await tokenParsed();
 
-
   try {
     showLoader();
     await Promise.all([
diff --git a/src/modules/06_evaluate/components/step/step6.vue b/src/modules/06_evaluate/components/step/step6.vue
index 9907555..f1c21aa 100644
--- a/src/modules/06_evaluate/components/step/step6.vue
+++ b/src/modules/06_evaluate/components/step/step6.vue
@@ -195,20 +195,22 @@ async function checkDoc() {
     });
 }
 
-function getCommander() {
-  http
-    .get(config.API.searchCommander)
-    .then((res) => {
-      const data = res.data.result;
-      formCommand.commanderFullname = data.commanderFullname;
-      formCommand.commanderPosition = data.commanderPosition;
-      formCommand.commanderAboveFullname = data.commanderAboveFullname;
-      formCommand.commanderAbovePosition = data.commanderAbovePosition;
-    })
-    .catch((e) => {
-      messageError($q, e);
-    });
-}
+// function getCommander() {
+//   http
+//     .get(config.API.searchCommander)
+//     .then((res) => {
+//       const data = res.data.result;
+//       formCommand.commanderFullname = data.commanderFullname;
+//       formCommand.commanderPosition = data.commanderPosition;
+//       formCommand.commanderAboveFullname = data.commanderAboveFullname;
+//       formCommand.commanderAbovePosition = data.commanderAbovePosition;
+//       formCommand.commanderOrg = data.commanderOrg;
+//       formCommand.commanderAboveOrg = data.commanderAboveOrg;
+//     })
+//     .catch((e) => {
+//       messageError($q, e);
+//     });
+// }
 
 function onAddSubject() {
   formCommand.subject.push("");