From 577d2d818219688fd922e97370415889ed0a29ca Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 29 Oct 2024 14:57:49 +0700
Subject: [PATCH] =?UTF-8?q?ui=20=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B8=95=E0=B8=B4=E0=B8=94=E0=B9=80=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B9=84=E0=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../19_condition/components/DialogCondition.vue   |  2 +-
 src/modules/19_condition/view/Main.vue            | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/modules/19_condition/components/DialogCondition.vue b/src/modules/19_condition/components/DialogCondition.vue
index 6401d18f8..531c588cd 100644
--- a/src/modules/19_condition/components/DialogCondition.vue
+++ b/src/modules/19_condition/components/DialogCondition.vue
@@ -59,7 +59,7 @@ function onSubmit() {
         />
         <q-separator />
 
-        <q-card-section>
+        <q-card-section class="q-pt-none">
           <div class="row q--col-gutter-sm">
             <div class="col-12">
               <q-checkbox
diff --git a/src/modules/19_condition/view/Main.vue b/src/modules/19_condition/view/Main.vue
index e47ec4797..5169701b7 100644
--- a/src/modules/19_condition/view/Main.vue
+++ b/src/modules/19_condition/view/Main.vue
@@ -96,7 +96,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "isCondition",
     align: "left",
-    label: "ตำแหน่งติดเงื่อนไง",
+    label: "ตำแหน่งติดเงื่อนไข",
     sortable: false,
     field: "isCondition",
     headerStyle: "font-size: 14px",
@@ -256,7 +256,18 @@ async function fetchDataTable() {
       const data = await res.data.result;
       totalRow.value = data.total;
       totalPage.value = Math.ceil(data.total / pageSize.value);
-      rows.value = data.data;
+      rows.value = data.data.map((e: any) => ({
+        ...e,
+        profilePosition: e.profilePosition
+          ? e.profilePosition
+          : e.positions[0].positionName,
+        profilePostype: e.profilePostype
+          ? e.profilePostype
+          : e.positions[0].posTypeName,
+        profilePoslevel: e.profilePoslevel
+          ? e.profilePoslevel
+          : e.positions[0].posTypeName,
+      }));
     })
     .catch((err) => {
       messageError($q, err);