fix Eva

src/modules/12_evaluatePersonal/components/Detail/viewstep/tableStep1.vue

@@ -1,5 +1,9 @@
 <script setup lang="ts">
 import { ref, computed } from "vue";
+import { useCounterMixin } from "@/stores/mixin";
+
+const { findOrgNameHtml } = useCounterMixin();
+
 const props = defineProps({
   columns: {
     type: Array as () => any[],
@@ -47,7 +51,20 @@ const pagination = ref({
     <template v-slot:body="props">
       <q-tr :props="props">
         <q-td v-for="col in props.cols" :key="col.name" :props="props">
-          <div>
+          <div v-if="col.name == 'organization'" class="text-html">
+            {{
+              props.row
+                ? findOrgNameHtml({
+                    root: props.row.orgRoot,
+                    child1: props.row.orgChild1,
+                    child2: props.row.orgChild2,
+                    child3: props.row.orgChild3,
+                    child4: props.row.orgChild4,
+                  })
+                : "-"
+            }}
+          </div>
+          <div v-else>
             {{ !col.value ? "-" : col.value }}
           </div>
         </q-td>

src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue

@@ -84,33 +84,7 @@ onMounted(() => {
         }))
       : [];
 
-    formDetail.salaries = props.data.salaries
-      ? props.data.salaries.map((e: any) => ({
-          amount: e.amount,
-          date: date2Thai(e.date),
-          mouthSalaryAmount: e.mouthSalaryAmount ? e.mouthSalaryAmount : 0,
-          posNo: e.posNo,
-          position: e.position,
-          positionSalaryAmount: e.positionSalaryAmount
-            ? e.positionSalaryAmount
-            : 0,
-          refCommandDate: e.refCommandDate ? e.refCommandDate : "",
-
-          refCommandNo: e.refCommandNo ? e.refCommandNo : "",
-          salaryClass: e.salaryClass ? e.salaryClass : "",
-          salaryRef: e.salaryRef ? e.salaryRef : "",
-          salaryStatus: e.salaryStatus ? e.salariesStatus : "",
-          //
-          oc: "-",
-          lineWork: "-",
-          side: "-",
-          positionType: "-",
-          level: "-",
-          positionsAdministrative: "-",
-          aspectAdministrative: "-",
-        }))
-      : [];
-
+    formDetail.salaries = props.data.salaries;
     formDetail.trainings = props.data.trainings
       ? props.data.trainings.map((e: any) => ({
           dateOrder: date2Thai(e.dateOrder),
@@ -319,7 +293,7 @@ onMounted(() => {
               <q-input
                 borderless
                 readonly
-                :model-value="education.degree ? education.degree:'-'"
+                :model-value="education.degree ? education.degree : '-'"
                 label="วุฒิการศึกษา"
               />
             </div>
@@ -336,7 +310,7 @@ onMounted(() => {
               <q-input
                 borderless
                 readonly
-                :model-value="education.fundName? education.fundName:'-'"
+                :model-value="education.fundName ? education.fundName : '-'"
                 label="ทุน"
               />
             </div>
@@ -345,7 +319,7 @@ onMounted(() => {
               <q-input
                 borderless
                 readonly
-                :model-value="education.gpa ? education.gpa :'-'"
+                :model-value="education.gpa ? education.gpa : '-'"
                 label="เกรดเฉลี่ย"
               />
             </div>
@@ -416,12 +390,13 @@ onMounted(() => {
           <span class="q-ml-lg q-my-sm">ผลงานที่เคยเสนอขอประเมิน (ถ้ามี)</span>
         </div>
         <div class="col-12"><q-separator /></div>
-        <div class="col-10">
+        <div class="col-12 q-pa-sm">-</div>
+        <!-- <div class="col-10">
           <TableData
             :columns="columnAssessments"
             :row="formDetail.assessments"
           />
-        </div>
+        </div> -->
       </q-card>
     </div>
   </q-card>