From 8139ddd0cdc7162967e524b8a3a0039d8989df31 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 13 Jul 2023 09:47:48 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20filter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/05_placement/components/Main.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/05_placement/components/Main.vue b/src/modules/05_placement/components/Main.vue
index 5effa66d9..a1c513c89 100644
--- a/src/modules/05_placement/components/Main.vue
+++ b/src/modules/05_placement/components/Main.vue
@@ -136,6 +136,7 @@ const fetchPlacementData = async (val: number) => {
       // rows.value = DataStore.DataMainOrig;
       DataStore.DataMainOrig.map((e: any) => {
         rows.value.push({
+          id: e.id,
           examRound: e.examRound,
           examOrder: e.examOrder,
           examTypeName: e.examTypeName,
@@ -245,6 +246,7 @@ const searchFilterTable = async () => {
     // rows.value = DataStore.DataMainUpdate;
     DataStore.DataMainUpdate.map((e: any) => {
       rows.value.push({
+        id: e.id,
         examRound: e.examRound,
         examOrder: e.examOrder,
         examTypeName: e.examTypeName,

From 3ff2461ec4b0a56595de26c8bb5015c5c7684260 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Thu, 13 Jul 2023 10:11:13 +0700
Subject: [PATCH 2/2] edit filter column

---
 .../05_placement/components/pass/Table.vue    | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/modules/05_placement/components/pass/Table.vue b/src/modules/05_placement/components/pass/Table.vue
index 7b573e7e1..f0e0fb7ee 100644
--- a/src/modules/05_placement/components/pass/Table.vue
+++ b/src/modules/05_placement/components/pass/Table.vue
@@ -143,9 +143,11 @@ const getTable = async () => {
         const rowData = {
           personalId: data.personalId,
           idCard: data.idCard,
-          fullName: data.fullName,
+          fullName: data.fullName + ' ' + data.idCard,
+          name: data.fullName,
           profilePhoto: data.profilePhoto,
-          organizationName: data.organizationName,
+          organizationName: data.organizationName + ' ' + data.organizationShortName + ' ' + data.positionNumber + ' ' + data.positionPath,
+          orgName: data.organizationName,
           organizationShortName: data.organizationShortName,
           positionNumber: data.positionNumber,
           positionPath: data.positionPath,
@@ -423,30 +425,29 @@ const pagination = ref({
                 />
                 <img v-else :src="props.row.avatar" class="col-4 img-info" />
                 <div class="col-4">
-                  <div class="text-weight-medium">{{ props.row.fullName }}</div>
-                  <div class="text-weight-light">{{ props.row.idCard }}</div>
+                        <div class="text-weight-medium">{{ props.row.name }}</div>
+                    <div class="text-weight-light">{{ props.row.idCard }}</div>
+                  </div>
                 </div>
-              </div>
-            </template>
-            <template v-else-if="col.name === 'number'">
-              <div class="text-weight-medium">
-                {{ props.row.number !== null ? props.row.number : "-" }}
-              </div>
-            </template>
+              </template>
+              <template v-else-if="col.name === 'number'">
+                <div class="text-weight-medium">
+                  {{ props.row.number !== null ? props.row.number : "-" }}
+                </div>
+              </template>
 
-            <template v-else-if="col.name === 'organizationName'">
-              <div
-                v-if="
-                  props.row.organizationName !== null ||
-                  props.row.positionPath !== null
-                "
-              >
-                <div class="col-4">
-                  <div class="text-weight-medium">
-                    {{
-                      props.row.organizationName !== null
-                        ? props.row.organizationName
-                        : "-"
+              <template v-else-if="col.name === 'organizationName'">
+                <div
+                  v-if="props.row.orgName !== null ||
+                    props.row.positionPath !== null
+                    "
+                >
+                  <div class="col-4">
+                    <div class="text-weight-medium">
+                      {{
+                        props.row.orgName !== null
+                        ? props.row.orgName
+                                              : "-"
                     }}
                     {{
                       props.row.organizationShortName !== null