From 4f9bf01f95a80c728da48715ce32a2e0dc7d8fa7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Jul 2023 17:44:08 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B9=89=20filter=20=E0=B8=AA=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/05_placement/components/PersonalList/Table.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index c72e71208..f1bd72119 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -253,7 +253,7 @@ const getTable = async () => {
         : rowsAll.value.filter((x: any) => x.statusId != "CONTAIN");
 
       rowsFilter.value = rows.value.filter(
-        (e: any) => e.draft == "รอส่งตัว" && e.positionNumber == null
+        (e: any) => e.draft == "รอส่งตัว" && e.positionNumber !== null
       );
       console.log(rowsFilter.value);
     })

From 5295fe241f66258cd6f68875a6dbb17458a247c5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Jul 2023 17:59:56 +0700
Subject: [PATCH 2/2] no message

---
 src/modules/05_placement/components/PersonalList/Table.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index f1bd72119..bb19d36fa 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -253,7 +253,10 @@ const getTable = async () => {
         : rowsAll.value.filter((x: any) => x.statusId != "CONTAIN");
 
       rowsFilter.value = rows.value.filter(
-        (e: any) => e.draft == "รอส่งตัว" && e.positionNumber !== null
+        (e: any) =>
+          e.draft == "รอส่งตัว" &&
+          e.positionNumber !== null &&
+          e.statusName == " เตรียมบรรจุ"
       );
       console.log(rowsFilter.value);
     })
@@ -703,7 +706,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
                   <q-item
                     v-if="
                       (roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
-                      props.row.draft === 'รอส่งตัว'
+                      props.row.draft === 'รอส่งตัว' && props.row.statusId !== 'DISCLAIM'
                     "
                     clickable
                     v-close-popup