From 44593ce57b310da07f6bba5b61ba0f5f979cf7a9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 11 Oct 2023 11:03:21 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20Table=20?=
 =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B9=84=E0=B8=9B=E0=B8=AD=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=20=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99=20=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=95=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B9=89=E0=B8=87=E0=B8=A5=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=88=E0=B8=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AppointEmployee/Dialogbody.vue | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue b/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
index 6034e5f87..8d3ea898b 100644
--- a/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
@@ -86,9 +86,9 @@ const columns2 = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 ]);
-const pageNext = (item: object) => {
-  props.nextPage?.(item);
-};
+// const pageNext = (item: object) => {
+//   props.nextPage?.(item);
+// };
 const emit = defineEmits([
   "update:filterKeyword2",
   "update:type",
@@ -240,18 +240,20 @@ watchEffect(() => {
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
-              <q-td key="citizenId" :props="props" @click="pageNext(props.row)">
+              <q-td key="citizenId" :props="props">
                 {{ props.row.citizenId }}
               </q-td>
-              <q-td key="fullname" :props="props" @click="pageNext(props.row)">
+              <q-td key="fullname" :props="props">
                 {{ props.row.fullname }}
               </q-td>
-              <q-td
-                key="organizationName"
-                :props="props"
-                @click="pageNext(props.row)"
-              >
-                <div
+              <q-td key="organizationName" :props="props">
+                {{ props.row.orgName !== null ? props.row.orgName : "-" }}
+                {{
+                  props.row.organizationShortName !== null
+                    ? `(${props.row.organizationShortName})`
+                    : ""
+                }}
+                <!-- <div
                   v-if="
                     props.row.orgName !== null ||
                     props.row.positionPath !== null
@@ -284,9 +286,9 @@ watchEffect(() => {
                   <div class="col-4">
                     <div class="text-weight-medium">-</div>
                   </div>
-                </div>
+                </div> -->
               </q-td>
-              <q-td key="birthday" :props="props" @click="pageNext(props.row)">
+              <q-td key="birthday" :props="props">
                 {{ props.row.birthday }}
               </q-td>
             </q-tr>