From abde02ba6482465242171558bbe98e68002feb32 Mon Sep 17 00:00:00 2001
From: oat_dev <nattapon@frappet.com>
Date: Wed, 17 Apr 2024 13:37:33 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B9=89=E0=B8=B2=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B2=E0=B8=A2:=20=E0=B8=9B=E0=B8=A3=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94?=
 =?UTF-8?q?=E0=B8=87=E0=B8=9C=E0=B8=A5+=E0=B9=81=E0=B8=81=E0=B9=89?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../15_development/components/Target.vue      | 70 +++++++++++++++----
 1 file changed, 57 insertions(+), 13 deletions(-)

diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue
index e41b2cd14..e9fab0556 100644
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@@ -59,7 +59,7 @@ const columnsPlannedGoals = ref<QTableProps["columns"]>([
     field: "posTypePlannedId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (val) => convertTypeGoals(val),
+    // format: (val) => convertTypeGoals(val),
   },
 
   {
@@ -92,7 +92,7 @@ const columnsActualGoals = ref<QTableProps["columns"]>([
     field: "posTypeActualId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (val) => convertTypeGoals(val),
+    // format: (val) => convertTypeGoals(val),
   },
 
   {
@@ -200,7 +200,6 @@ function fetchType() {
           id: e.id,
           name: e.posTypeName,
         }));
-        console.log(data);
       })
       .catch((err) => {
         messageError($q, err);
@@ -214,6 +213,7 @@ async function fetchData(id: string) {
     .get(config.API.developmentMainTab("tab2", id))
     .then(async (res) => {
       const data = res.data.result;
+
       actualGoals.value = data.actualGoals;
       actualPeoples.value = data.actualPeoples;
       plannedGoals.value = data.plannedGoals;
@@ -259,9 +259,9 @@ async function onSubmitGroup() {
           groupTarget: formGroupTarget.groupTarget,
           groupTargetSub: formGroupTarget.groupTargetSub,
           positions: formGroupTarget.positions.map((v) => ({
-            position: v.position,
-            posTypePlannedId: v.posTypePlannedId,
-            posLevelPlannedId: v.posLevelPlannedId,
+            position: v.position ? v.position : "",
+            posTypePlannedId: v.posTypePlannedId ? v.posTypePlannedId : "",
+            posLevelPlannedId: v.posLevelPlannedId ? v.posLevelPlannedId : "",
           })),
           type: formGroupTarget.type ? formGroupTarget.type : "",
           amount: formGroupTarget.amount,
@@ -431,9 +431,16 @@ function convertNamePeoples(id: string) {
   return data && data?.name;
 }
 
-function convertTypeGoals(id: string) {
-  const data = posTypeMain.value.find((e: ResGroup) => e.id === id);
-  return data && data?.posTypeName;
+function convertTypeGoals(row: ResActualGoals) {
+  const posTypeName = posTypeMain.value.find(
+    (e: ResGroup) => e.id === row.posTypeActualId
+  );
+  const posLevelName = posTypeName?.posLevels.find(
+    (e: any) => e.id === row.posLevelActualId
+  );
+  const fullName = posTypeName?.posTypeName + " " + posLevelName?.posLevelName;
+  // return posTypeName && posTypeName?.posTypeName;
+  return fullName;
 }
 
 const addGroupTargetData = async () => {
@@ -528,7 +535,18 @@ onMounted(() => {
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                <div class="table_ellipsis">
+                <div v-if="col.name === 'posTypePlannedId'">
+                  <div
+                    v-if="props.row.groupTarget !== 'OUTSIDERS'"
+                    v-for="row in props.row.plannedGoalPositions"
+                  >
+                    {{ `- ${row.position} (${row.posType} ${row.posLevel})` }}
+                  </div>
+                  <div v-else>
+                    {{ props.row.type ? props.row.type : "-" }}
+                  </div>
+                </div>
+                <div v-else class="table_ellipsis">
                   {{ col.value ? col.value : "-" }}
                 </div>
               </q-td>
@@ -673,7 +691,30 @@ onMounted(() => {
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                <div class="table_ellipsis">
+                <div v-if="col.name === 'posTypeActualId'">
+                  <div v-if="props.row.groupTarget !== 'OUTSIDERS'">
+                    {{
+                      `${props.row.position} (${props.row.posType} ${props.row.posLevel})`
+                    }}
+                  </div>
+                  <div v-else>
+                    {{ props.row.type ? props.row.type : "-" }}
+                  </div>
+                </div>
+                <div v-else class="table_ellipsis">
+                  {{ col.value ? col.value : "-" }}
+                </div>
+                <!-- <div
+                  v-if="col.name === 'posTypeActualId'"
+                  class="table_ellipsis"
+                >
+                  {{
+                    props.row.posTypeActualId !== null
+                      ? convertTypeGoals(props.row)
+                      : props.row.type
+                  }}
+                </div> -->
+                <div v-else class="table_ellipsis">
                   {{ col.value ? col.value : "-" }}
                 </div>
               </q-td>
@@ -876,8 +917,11 @@ onMounted(() => {
                 lazy-rules
                 class="inputgreen"
                 v-model="formGroupTarget.level"
-                :options="posLevelOp"
-                option-label="name"
+                :options="
+                  posTypeMain.find((v) => formGroupTarget.posType === v.id)
+                    ?.posLevels || []
+                "
+                option-label="posLevelName"
                 option-value="id"
                 emit-value
                 map-options