From 85677820e4decea3695299de76bbb07273142b22 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Tue, 20 Aug 2024 10:12:57 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20?=
 =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=9C=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/08_KPI/views/form.vue | 83 ++++++++++++++++---------------
 1 file changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/modules/08_KPI/views/form.vue b/src/modules/08_KPI/views/form.vue
index bc532ac..923ba48 100644
--- a/src/modules/08_KPI/views/form.vue
+++ b/src/modules/08_KPI/views/form.vue
@@ -490,6 +490,9 @@ const evaluator = ref<any>({
   posTypeName: "",
   posLevelName: "",
   org: "",
+  posmasterAct: "",
+  isPosmasterAct: false,
+  posmasterAct: [],
 });
 async function fetchProfileEvaluator(id: string) {
   showLoader();
@@ -503,6 +506,8 @@ async function fetchProfileEvaluator(id: string) {
       evaluator.value.position = data.position;
       evaluator.value.posTypeName = data.posTypeName;
       evaluator.value.posLevelName = data.posLevelName;
+      evaluator.value.isPosmasterAct = data.isPosmasterAct;
+      evaluator.value.posmasterAct = data.posmasterAct[0];
       evaluator.value.org = findOrgName(data);
     })
     .catch((e) => {
@@ -1047,56 +1052,54 @@ onMounted(async () => {
       />
       <q-separator />
 
-      <q-card>
-        <div class="q-pa-md">
+      <q-card-section class="q-pa-md">
+        <div class="q-pb-md">
           <span class="text-teal text-weight-bold text-body2">{{
             evaluator.fullName
           }}</span>
         </div>
-
-        <q-card-section class="q-pa-md">
-          <div class="row">
-            <div class="col-12 column justify-center no-wrap">
-              <div class="row text-grey-6">
-                <div class="col-3">ตำแหน่งในสายงาน</div>
-                <div class="col-3">ตำแหน่งประเภท</div>
-                <div class="col-3">ตำแหน่งทางการบริหาร</div>
-                <div class="col-3">สังกัด</div>
+        <div class="row">
+          <div class="col-12 column justify-center no-wrap">
+            <div class="row text-grey-6">
+              <div class="col-3">ตำแหน่งในสายงาน</div>
+              <div class="col-3">ตำแหน่งประเภท</div>
+              <div class="col-3">ตำแหน่งทางการบริหาร</div>
+              <div class="col-3">สังกัด</div>
+            </div>
+            <div class="row">
+              <div class="col-3">
+                {{ evaluator.position ? evaluator.position : "-" }}
               </div>
-              <div class="row">
-                <div class="col-3">
-                  {{ evaluator.position ? evaluator.position : "-" }}
-                </div>
-                <div class="col-3">
-                  {{ evaluator.posTypeName ? evaluator.posTypeName : "-" }}
-                  {{
-                    evaluator.posLevelName
-                      ? ` (${evaluator.posLevelName})`
-                      : "-"
-                  }}
-                </div>
-                <div class="col-3">
-                  {{
-                    evaluator.posExecutiveName
-                      ? evaluator.posExecutiveName
-                      : "-"
-                  }}
-                </div>
-                <div class="col-3">
-                  {{ evaluator.org ? evaluator.org : "-" }}
-                </div>
+              <div class="col-3">
+                {{ evaluator.posTypeName ? evaluator.posTypeName : "-" }}
+                {{
+                  evaluator.posLevelName ? ` (${evaluator.posLevelName})` : "-"
+                }}
               </div>
-
-              <div class="row q-mt-md text-grey-6">
-                <div class="col-12">รักษาการในตำแหน่ง/การรักษาราชการแทน</div>
+              <div class="col-3">
+                {{
+                  evaluator.posExecutiveName ? evaluator.posExecutiveName : "-"
+                }}
               </div>
-              <div class="row">
-                <div class="col-12">-</div>
+              <div class="col-3">
+                {{ evaluator.org ? evaluator.org : "-" }}
               </div>
             </div>
+
+            <div class="row q-mt-md text-grey-6">
+              <div class="col-12">รักษาการในตำแหน่ง/การรักษาราชการแทน</div>
+            </div>
+            <div class="row">
+              <div class="col-12" v-if="evaluator.isPosmasterAct">
+                {{
+                  `${evaluator.posmasterAct.prefix}${evaluator.posmasterAct.firstName} ${evaluator.posmasterAct.lastName} (${evaluator.posmasterAct.posNo})`
+                }}
+              </div>
+              <div class="col-12" v-else>-</div>
+            </div>
           </div>
-        </q-card-section>
-      </q-card>
+        </div>
+      </q-card-section>
     </q-card>
   </q-dialog>
   <!-- <q-dialog v-model="modalScore" persistent>