From a7265402b6bfb671de63c65952ea5d997d5f6a43 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Mon, 11 Sep 2023 15:04:40 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99=E0=B8=97=E0=B8=94=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../probation/FormEvaluation/FormReport.vue   | 25 ++++++++++---------
 .../components/probation/MainProbation.vue    |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index 3197433f3..cca4a51d7 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -49,6 +49,17 @@ onMounted(() => {
   fecthResult(assignId.value);
 });
 
+const date_start = ref<Date>(new Date());
+const date_finish = ref<Date>();
+const develop = ref<number>();
+const result = ref<number>();
+const expand_month = ref<string>();
+const reson = ref<string>("");
+const chairman_dated = ref<Date>();
+const director1_dated = ref<any>("");
+const director2_dated = ref<any>("");
+const fullname = ref<string>("");
+
 const fecthAssign = async (id: string) => {
   showLoader();
   await http
@@ -56,8 +67,8 @@ const fecthAssign = async (id: string) => {
     .then((res) => {
       // assign.value = res.data.data.assign;
       mentors.value = res.data.data.mentors;
-      // date_start.value = assign.value.date_start;
-      // date_finish.value = assign.value.date_finish;
+      date_start.value = res.data.data.assign.date_start;
+      date_finish.value = res.data.data.assign.date_finish;
 
       director_id.value = res.data.data.chairman.name;
       director_id2.value = res.data.data.commander.name;
@@ -74,16 +85,6 @@ const fecthAssign = async (id: string) => {
       hideLoader();
     });
 };
-const date_start = ref<Date>(new Date());
-const date_finish = ref<Date>();
-const develop = ref<number>();
-const result = ref<number>();
-const expand_month = ref<string>();
-const reson = ref<string>("");
-const chairman_dated = ref<Date>();
-const director1_dated = ref<any>("");
-const director2_dated = ref<any>("");
-const fullname = ref<string>("");
 
 const fecthResult = async (id: string) => {
   await http
diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index 458cb4532..4443f49b7 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -185,7 +185,7 @@ const getpersonalList = async () => {
         position_level_id: item.position_level_id,
         organization: item.organization,
         probation_no: item.probation_no,
-        order_number: item.order_number,
+        order_number: item.order_number != "xx/2566" ? item.order_number : "-",
         probation_status: statusProbationMain(Number(item.probation_status)),
       }));
     })