From e11b75baaf594cf279997c9a47eac19defbc2042 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Tue, 9 Jul 2024 16:21:24 +0700
Subject: [PATCH] =?UTF-8?q?=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=B9=80=E0=B8=A3=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B8=95=E0=B9=89=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/org/api.org.ts                        |  1 +
 .../06_evaluate/components/ExpertPage.vue     | 35 +++++++++++++++----
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/api/org/api.org.ts b/src/api/org/api.org.ts
index 92faa28..4eae586 100644
--- a/src/api/org/api.org.ts
+++ b/src/api/org/api.org.ts
@@ -63,6 +63,7 @@ export default {
   dataUserOtherHistory: (id: string) => `${profileOrg}/other/history/${id}`,
 
   orgCheckAvatar: (id: string) => `${profileOrg}/avatar/profileId/${id}`,
+  orgSearchCommander: () => `${profileOrg}/search/commander`,
 
   orgActive: `${org}/active`,
   /** struct-chart*/
diff --git a/src/modules/06_evaluate/components/ExpertPage.vue b/src/modules/06_evaluate/components/ExpertPage.vue
index e56a184..b05507c 100644
--- a/src/modules/06_evaluate/components/ExpertPage.vue
+++ b/src/modules/06_evaluate/components/ExpertPage.vue
@@ -230,6 +230,29 @@ async function onClickDowloadFile(
   };
   await genReport(body, fileName); //สร้างไฟล์ต้นแบบ
 }
+
+function getData(){
+  showLoader()
+  http
+  .get(config.API.orgSearchCommander())
+  .then((res)=>{
+    const data = res.data.result
+    formData.author = data.fullname
+    formData.commanderFullname = data.commanderFullname
+    formData.commanderPosition = data.commanderPosition
+    formData.commanderAboveFullname = data.commanderAboveFullname
+    formData.commanderAbovePosition = data.commanderAbovePosition
+  })
+  .catch((e)=>{
+    messageError($q,e)
+  }).finally(()=>{
+    hideLoader()
+  })
+}
+
+onMounted(()=>{
+  getData()
+})
 </script>
 
 <template>
@@ -268,7 +291,7 @@ async function onClickDowloadFile(
                       <q-input
                         ref="subjectRef"
                         dense
-                        class="col-xs-12 col-sm-6"
+                        class="col-xs-12 col-sm-6 inputgreen"
                         outlined
                         label="ชื่อผลงาน"
                         v-model="formData.subject"
@@ -278,7 +301,7 @@ async function onClickDowloadFile(
                       />
                       <q-input
                         ref="authorRef"
-                        class="col-xs-12 col-sm-6"
+                        class="col-xs-12 col-sm-6 inputgreen"
                         dense
                         outlined
                         v-model="formData.author"
@@ -311,7 +334,7 @@ async function onClickDowloadFile(
                           <q-input
                             ref="commanderFullnameRef"
                             dense
-                            class="col-xs-12 col-sm-6"
+                            class="col-xs-12 col-sm-6 inputgreen"
                             outlined
                             label="ชื่อ-นามสกุล"
                             v-model="formData.commanderFullname"
@@ -323,7 +346,7 @@ async function onClickDowloadFile(
                           />
                           <q-input
                             ref="commanderPositionRef"
-                            class="col-xs-12 col-sm-6"
+                            class="col-xs-12 col-sm-6 inputgreen"
                             dense
                             outlined
                             v-model="formData.commanderPosition"
@@ -344,7 +367,7 @@ async function onClickDowloadFile(
                           <q-input
                             ref="commanderAboveFullnameRef"
                             dense
-                            class="col-xs-12 col-sm-6"
+                            class="col-xs-12 col-sm-6 inputgreen"
                             outlined
                             v-model="formData.commanderAboveFullname"
                             label="ชื่อ-นามสกุล"
@@ -356,7 +379,7 @@ async function onClickDowloadFile(
                           />
                           <q-input
                             ref="commanderAbovePositionRef"
-                            class="col-xs-12 col-sm-6"
+                            class="col-xs-12 col-sm-6 inputgreen"
                             dense
                             outlined
                             v-model="formData.commanderAbovePosition"