From 6ff3eabd6d665394be2681c53d320006f0210b94 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 7 Oct 2024 16:26:06 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=9F?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_Achievement/06_DevelopmentPlan.vue     | 65 ++-----------------
 1 file changed, 6 insertions(+), 59 deletions(-)

diff --git a/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue b/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
index 7a56c7d..2596775 100644
--- a/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
+++ b/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
@@ -29,9 +29,9 @@ const visibleColumns = ref<string[]>([
   "no",
   "name",
   "developmentProjects",
-  "target",
+  "developmentTarget",
   "developmentResults",
-  "point",
+  "developmentReport",
 ]);
 
 const columns = ref<QTableProps["columns"]>([
@@ -68,11 +68,11 @@ const columns = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "target",
+    name: "developmentTarget",
     align: "left",
     label: "เป้าหมายการพัฒนา",
     sortable: true,
-    field: "target",
+    field: "developmentTarget",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -90,11 +90,11 @@ const columns = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "point",
+    name: "developmentReport",
     align: "left",
     label: "รายงานผลการพัฒนา",
     sortable: true,
-    field: "point",
+    field: "developmentReport",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -260,31 +260,6 @@ onMounted(() => {
                   />
                 </div>
               </div>
-              <div v-else-if="col.name == 'developmentResults'">
-                <div class="column">
-                  <span>
-                    {{
-                      props.row.achievement10
-                        ? `- ${props.row.achievement10} (10)`
-                        : ""
-                    }}
-                  </span>
-                  <span>
-                    {{
-                      props.row.achievement5
-                        ? `- ${props.row.achievement5} (5)`
-                        : ""
-                    }}
-                  </span>
-                  <span>
-                    {{
-                      props.row.achievement0
-                        ? `- ${props.row.achievement10} (0)`
-                        : ""
-                    }}
-                  </span>
-                </div>
-              </div>
               <div v-else class="table_ellipsis">
                 {{ col.value ? col.value : "-" }}
               </div>
@@ -352,34 +327,6 @@ onMounted(() => {
                     </div>
                   </q-item-section>
 
-                  <q-item-section
-                    v-else-if="col.name == 'developmentResults'"
-                    class="fix_top"
-                  >
-                    <div class="column">
-                      <span>
-                        {{
-                          props.row.achievement10
-                            ? `- ${props.row.achievement10} (10)`
-                            : ""
-                        }}
-                      </span>
-                      <span>
-                        {{
-                          props.row.achievement5
-                            ? `- ${props.row.achievement5} (5)`
-                            : ""
-                        }}
-                      </span>
-                      <span>
-                        {{
-                          props.row.achievement0
-                            ? `- ${props.row.achievement10} (0)`
-                            : ""
-                        }}
-                      </span>
-                    </div>
-                  </q-item-section>
                   <q-item-section v-else class="fix_top">
                     <q-item-label class="text-dark text-weight-medium">{{
                       col.value ? col.value : "-"