From a3dcc4a66a75b1aa046207b99a13dafc53b4cb54 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 30 Oct 2024 18:17:09 +0700
Subject: [PATCH] updated placement

---
 .../components/PersonalList/Table.vue         | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index cb661aba0..a4e14c3ac 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -93,7 +93,6 @@ const dataInfo = reactive({
   reliefDoc: "",
 });
 
-
 const examId = route.params.examId;
 const examIdString = Array.isArray(examId) ? examId[0] : examId;
 const personalId = ref<string>("");
@@ -315,6 +314,7 @@ async function getTable() {
             examNumber: data.examNumber,
             root: data.root,
             rootId: data.rootId,
+            rootIdOld: data.rootIdOld, // หน่วยงานเดิม
             rootShortName: data.rootShortName,
             child1: data.child1,
             child1Id: data.child1Id,
@@ -745,11 +745,20 @@ function openModalOrder(val: boolean) {
   // ยังไม่ได้ดัก ส่ง ไป ทั้ง object #e.draft == "รอส่งตัว" &&
   rowsOrder.value = rows.value.filter(
     (e: any) =>
-      e.draft == "ส่งตัวแล้ว" &&
-      e.nodeName !== null &&
-      e.reportingDate !== null &&
-      e.statusId !== "REPORT" &&
-      e.statusId !== "DONE"
+      (DataStore.isStaff &&
+        (e.rootId == e.rootIdOld || e.bmaOfficer == "บุคคลภายนอก") &&
+        e.draft == "ส่งตัวแล้ว" &&
+        e.nodeName !== null &&
+        e.reportingDate !== null &&
+        e.statusId !== "REPORT" &&
+        e.statusId !== "DONE") ||
+      (DataStore.isOfficer &&
+        e.rootId != e.rootIdOld &&
+        e.draft == "ส่งตัวแล้ว" &&
+        e.nodeName !== null &&
+        e.reportingDate !== null &&
+        e.statusId !== "REPORT" &&
+        e.statusId !== "DONE")
   );
   modalOrder.value = val;
 }
@@ -810,9 +819,9 @@ async function getWorkFlow() {
     .finally(() => {});
 }
 
-function onclickViewinfo(id:string) {
+function onclickViewinfo(id: string) {
   modalPersonal.value = true;
-  personalId.value = id
+  personalId.value = id;
 }
 
 function updatemodalPersonal(modal: boolean) {