From 9cad6dce3d58eae0a892830c1146a92bf85b0bca Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Wed, 9 Aug 2023 21:35:25 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=20-=20=E0=B8=AA=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=20personal=20id=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=83=E0=B8=99=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99?=
 =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=9F?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A3=E0=B9=8C=E0=B8=A1=E0=B8=A1=E0=B8=AD=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=A1=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/05_placement/api.probation.ts         | 23 ++++++++-----
 .../components/probation/FormAssign.vue       | 34 +++++++++----------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/api/05_placement/api.probation.ts b/src/api/05_placement/api.probation.ts
index 081de5a04..56033ced6 100644
--- a/src/api/05_placement/api.probation.ts
+++ b/src/api/05_placement/api.probation.ts
@@ -5,16 +5,23 @@ const calculate = `${env.API_PROBATION_URI}/calculate`;
 const finish = `${env.API_PROBATION_URI}/assign`;
 
 export default {
-  competencyOptions: () => `${dataOptions}/competency`,
-  competencyGroupOptions: () => `${dataOptions}/competency-group`,
-  knowledgeOptions: () => `${dataOptions}/knowledge`,
-  skillOptions: () => `${dataOptions}/skill`,
-  lawOptions: () => `${dataOptions}/law`,
+  competencyOptions: (personalId: string) =>
+    `${dataOptions}/competency?personal_id=${personalId}`,
+  competencyGroupOptions: (personalId: string) =>
+    `${dataOptions}/competency-group?personal_id=${personalId}`,
+  knowledgeOptions: (personalId: string) =>
+    `${dataOptions}/knowledge?personal_id=${personalId}`,
+  skillOptions: (personalId: string) =>
+    `${dataOptions}/skill?personal_id=${personalId}`,
+  lawOptions: (personalId: string) =>
+    `${dataOptions}/law?personal_id=${personalId}`,
   probationPersonalList: () => `${personal}/list`,
-  personal: (personalId:string) => `${personal}?personal_id=${personalId}`,
-  newAssign: (personalId:string) => `${dataOptions}/new-assign?personal_id=${personalId}`,
+  personal: (personalId: string) => `${personal}?personal_id=${personalId}`,
+  newAssign: (personalId: string) =>
+    `${dataOptions}/new-assign?personal_id=${personalId}`,
   calculateDate: () => `${calculate}/assign-finish`,
-  saveFinish: (personalId:string) => `${finish}/probation-assign?personal_id=${personalId}`,
+  saveFinish: (personalId: string) =>
+    `${finish}/probation-assign?personal_id=${personalId}`,
   personalAdd: () => `${personal}/add`,
   // 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 a3511744f..daa51c5e6 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -1557,10 +1557,10 @@ const OPgroup = ref<
   }>
 >([]);
 const clearDateExam = () => {
-  date_start.value = null;
+  date_start.value = undefined;
 };
 const clearDateExam2 = () => {
-  date_finish.value = null;
+  date_finish.value = undefined;
 };
 const isDatePicker2Readonly = computed(() => {
   return date_start.value === null;
@@ -1699,8 +1699,8 @@ const getAssignNew = async (id: string) => {
     position.value = data.person.OrganizationOrganization
   });
 };
-const getcompetency = async () => {
-  await http.get(config.API.competencyOptions()).then((res: any) => {
+const getcompetency = async (id: string) => {
+  await http.get(config.API.competencyOptions(id)).then((res: any) => {
     const data = res.data.data;
     OPmain.value = data;
     main.value = data[0];
@@ -1710,8 +1710,8 @@ const getcompetency = async () => {
     main5.value = data[4];
   });
 };
-const getCompetencyGroup = async () => {
-  await http.get(config.API.competencyGroupOptions()).then((res: any) => {
+const getCompetencyGroup = async (id: string) => {
+  await http.get(config.API.competencyGroupOptions(id)).then((res: any) => {
     const data = res.data.data;
     OPgroup.value = data;
     group.value = data[0];
@@ -1719,13 +1719,13 @@ const getCompetencyGroup = async () => {
     group3.value = data[2];
   });
 };
-const getKnowledge = async () => {
-  await http.get(config.API.knowledgeOptions()).then((res: any) => {
+const getKnowledge = async (id: string) => {
+  await http.get(config.API.knowledgeOptions(id)).then((res: any) => {
     OPknowledge.value = res.data.data;
   });
 };
-const getSkill = async () => {
-  await http.get(config.API.skillOptions()).then((res: any) => {
+const getSkill = async (id: string) => {
+  await http.get(config.API.skillOptions(id)).then((res: any) => {
     const skillData = res.data.data;
     OPcomputer.value = [skillData.computer];
     OPenglish.value = [skillData.english];
@@ -1737,8 +1737,8 @@ const getSkill = async () => {
     skill4.value = skillData.resourse;
   });
 };
-const getLaw = async () => {
-  await http.get(config.API.lawOptions()).then((res: any) => {
+const getLaw = async (id: string) => {
+  await http.get(config.API.lawOptions(id)).then((res: any) => {
     checkRule.value = res.data.data;
   });
 };
@@ -1936,11 +1936,11 @@ const OPresourse = ref<
 >([]);
 
 onMounted(async () => {
-  await getLaw();
-  await getcompetency();
-  await getCompetencyGroup();
-  await getSkill();
-  await getKnowledge();
+  await getLaw(personalId);
+  await getcompetency(personalId);
+  await getCompetencyGroup(personalId);
+  await getSkill(personalId);
+  await getKnowledge(personalId);
   await getAssignNew(personalId);
 });
 watch(