From 1cbf5e3f06303d0ce649be816ee989476b2a4298 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Thu, 10 Aug 2023 10:46:57 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A5=E0=B9=80=E0=B8=95?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A3=E0=B9=8C=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=94=E0=B8=B9=E0=B9=80?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/05_placement/api.probation.ts                 |  3 ++-
 .../05_placement/components/probation/FormAssign.vue  | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/api/05_placement/api.probation.ts b/src/api/05_placement/api.probation.ts
index 1d3f01bfb..99f49901c 100644
--- a/src/api/05_placement/api.probation.ts
+++ b/src/api/05_placement/api.probation.ts
@@ -24,6 +24,7 @@ export default {
     `${finish}/probation-assign?personal_id=${personalId}`,
   personalAdd: () => `${personal}/add`,
   probationGetAssignList: (personalId:string) => 
-  `${finish}/probation-assign-list?personal_id=${personalId}`
+  `${finish}/probation-assign-list?personal_id=${personalId}`,
+  probationsGetAssign: (assignId:string) =>`${finish}/probation-assign?assign_id=${assignId}`
   // clearPosition: (personalId:string) => `${placement}/position/clear/${personalId}`
 };
diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index daa51c5e6..298772d7e 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -156,7 +156,7 @@
                 <q-select
                   :rules="[(val) => !!val || 'กรุณาเลือกผู้ดูเเล']"
                   option-value="personal_id"
-                  :options="OPcaretaker"
+                  :options="filtermantor(OPcaretaker, [caretaker2])"
                   class="col-xs-12 col-sm-6"
                   :readonly="routeName != 'probationWorkAdd'"
                   dense
@@ -169,7 +169,7 @@
                 />
                 <q-select
                   :rules="[(val) => !!val || 'กรุณาเลือกผู้ดูเเล']"
-                  :options="OPcaretaker"
+                  :options="filtermantor(OPcaretaker, [caretaker1])"
                   option-value="personal_id"
                   option-label="name"
                   hide-bottom-space
@@ -1494,6 +1494,11 @@ const filterData = (options: any[], excludedGroups: any[]) => {
     (item) => !excludedGroups.some((group) => group && group.id === item.id)
   );
 };
+const filtermantor = (options: any[], excludedGroups: any[]) => {
+  return options.filter(
+    (item) => !excludedGroups.some((group) => group && group.personal_id === item.personal_id)
+  );
+};
 const filterMain = (options: any[], excludedGroups: any[]) => {
   return options.filter(
     (item) => !excludedGroups.some((group) => group && group.id === item.id)
@@ -1563,7 +1568,7 @@ const clearDateExam2 = () => {
   date_finish.value = undefined;
 };
 const isDatePicker2Readonly = computed(() => {
-  return date_start.value === null;
+  return date_start.value === undefined;
 });
 const routeName = router.currentRoute.value.name;
 const name = ref<string>("");