ปรับ แสดงผล

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,14 +1052,12 @@ onMounted(async () => {
       />
       <q-separator />
 
-      <q-card>
+      <q-card-section class="q-pa-md">
-        <div 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">
@@ -1070,16 +1073,12 @@ onMounted(async () => {
               <div class="col-3">
                 {{ evaluator.posTypeName ? evaluator.posTypeName : "-" }}
                 {{
-                    evaluator.posLevelName
+                  evaluator.posLevelName ? ` (${evaluator.posLevelName})` : "-"
-                      ? ` (${evaluator.posLevelName})`
-                      : "-"
                 }}
               </div>
               <div class="col-3">
                 {{
-                    evaluator.posExecutiveName
+                  evaluator.posExecutiveName ? evaluator.posExecutiveName : "-"
-                      ? evaluator.posExecutiveName
-                      : "-"
                 }}
               </div>
               <div class="col-3">
@@ -1091,13 +1090,17 @@ onMounted(async () => {
               <div class="col-12">รักษาการในตำแหน่ง/การรักษาราชการแทน</div>
             </div>
             <div class="row">
-                <div class="col-12">-</div>
+              <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>
         </div>
       </q-card-section>
     </q-card>
-    </q-card>
   </q-dialog>
   <!-- <q-dialog v-model="modalScore" persistent>
     <q-card bordered style="width: 50vh">