From e5551198491cd1a64a059fb3221da44f942b0309 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 1 Sep 2023 15:18:01 +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=97=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FormEvaluation/FormEvaluateScoreAdd.vue   |  82 ++--
 .../probation/FormEvaluation/FormReport.vue   | 355 ++++--------------
 .../probation/FormEvaluation/Template1.vue    |   2 +-
 .../probation/FormEvaluation/Template2.vue    |   2 +-
 .../FormEvaluation/Template2Format2.vue       |   2 +-
 .../components/probation/MainProbation.vue    |  15 +-
 6 files changed, 127 insertions(+), 331 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
index e62370d5a..84bf55383 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
@@ -28,19 +28,14 @@ const personalId = ref<string>(route.params.id.toString());
 
 const person = ref<any>([]);
 const assign = ref<any>([]);
-const evaluate_no = ref<string>("");
-const start_date = ref<Date>(new Date());
-const date_finish = ref<Date>(new Date());
+const evaluate_no = ref<any>("");
+const start_date = ref<any>();
+const date_finish = ref<any>();
 const status = ref<boolean>(true);
 const chairman = ref<any>([]);
 const commander = ref<any>([]);
 const mentors = ref<any>([{ name: "" }, { name: "" }]);
 
-const round = ref<any>();
-
-const props = defineProps({
-  tab: String,
-});
 onMounted(() => {
   fecthAssign(assignId.value);
 });
@@ -49,15 +44,14 @@ const fecthAssign = async (id: string) => {
   await http
     .get(config.API.evaluateChairman(id))
     .then(async (res: any) => {
-      person.value = res.data.data.person;
-      assign.value = res.data.data.assign;
-      evaluate_no.value = res.data.data.evaluate_no;
-      start_date.value = res.data.data.start_date;
-      date_finish.value = res.data.data.end_date;
-      chairman.value = res.data.data.chairman;
-      commander.value = res.data.data.commander;
-      mentors.value = res.data.data.mentors;
-      round.value = res.data.data.evaluate_no;
+      person.value = await res.data.data.person;
+      assign.value = await res.data.data.assign;
+      evaluate_no.value = await res.data.data.evaluate_no;
+      start_date.value = await res.data.data.start_date;
+      date_finish.value = await res.data.data.end_date;
+      chairman.value = await res.data.data.chairman;
+      commander.value = await res.data.data.commander;
+      mentors.value = await res.data.data.mentors;
     })
     .catch((e) => {
       messageError($q, e);
@@ -385,7 +379,7 @@ const putformData = () => {
             </div>
             <div class="col-12 text-top0 row items-center">
               <q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
-              <span class="text-primary q-pr-sm">{{ "ครั้งที่ " + round }}</span>
+              <span class="text-primary q-pr-sm">{{ `ครั้งที่ ${evaluate_no}` }}</span>
               ระหว่างวันที่
               <span class="text-black q-px-sm">{{
                 date2Thai(start_date)
@@ -416,7 +410,7 @@ const putformData = () => {
                       1.1. ความสามารถในการเรียนรู้งาน</q-item-label>
                   </q-item-section>
                   <q-item-section side>
-                    <q-rating :disable="!status" v-model="learn_level" max="5" size="sm" color="grey"
+                    <q-rating  v-model="learn_level" max="5" size="sm" color="grey"
                       :color-selected="ratingColors" label="ระดับการประเมินพฤติกรรม">
                       <template v-slot:tip-1>
                         <q-tooltip>ต่ำกว่าความคาดหวังมาก</q-tooltip>
@@ -449,7 +443,7 @@ const putformData = () => {
                       ความสามารถในการปรับใช้ความรู้กับงานในหน้าที่</q-item-label>
                   </q-item-section>
                   <q-item-section side>
-                    <q-rating :disable="!status" v-model="apply_level" max="5" size="sm" color="grey"
+                    <q-rating  v-model="apply_level" max="5" size="sm" color="grey"
                       :color-selected="ratingColors" label="ระดับการประเมินพฤติกรรม">
                       <template v-slot:tip-1>
                         <q-tooltip>ต่ำกว่าความคาดหวังมาก</q-tooltip>
@@ -481,7 +475,7 @@ const putformData = () => {
                       1.3. ความสำเร็จของงานที่ได้รับมอบหมาย</q-item-label>
                   </q-item-section>
                   <q-item-section side>
-                    <q-rating :disable="!status" v-model="success_level" max="5" size="sm" color="grey"
+                    <q-rating  v-model="success_level" max="5" size="sm" color="grey"
                       :color-selected="ratingColors" label="ระดับการประเมินพฤติกรรม">
                       <template v-slot:tip-1>
                         <q-tooltip>ต่ำกว่าความคาดหวังมาก</q-tooltip>
@@ -511,7 +505,7 @@ const putformData = () => {
                     <q-item-label>
                       <q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
                       1.4 อื่นๆ
-                      <q-checkbox :disable="!status" class="q-ml-sm" dense v-model="etc" @click="
+                      <q-checkbox class="q-ml-sm" dense v-model="etc" @click="
                         (achievement_other.text = ''),
                         (achievement_other.level = 0)
                         " /></q-item-label>
@@ -525,7 +519,7 @@ const putformData = () => {
                 <q-item dense tag="label" v-ripple>
                   <q-item-section class="q-ml-md">
                     <q-item-label>
-                      <q-input :disable="!status" v-model="achievement_other.text" label="กรอกอื่นๆ" dense lazy-rules
+                      <q-input  v-model="achievement_other.text" label="กรอกอื่นๆ" dense lazy-rules
                         autogrow hide-bottom-space outlined class="bg-white" :rules="[
                           (val) =>
                             (val && val.length > 0) || 'กรุณากรอกข้อความ',
@@ -533,7 +527,7 @@ const putformData = () => {
                     </q-item-label>
                   </q-item-section>
                   <q-item-section side>
-                    <q-rating :disable="!status" v-model="achievement_other.level" max="5" size="sm" color="grey"
+                    <q-rating  v-model="achievement_other.level" max="5" size="sm" color="grey"
                       :color-selected="ratingColors" label="ระดับการประเมินพฤติกรรม">
                       <template v-slot:tip-1>
                         <q-tooltip>ต่ำกว่าความคาดหวังมาก</q-tooltip>
@@ -583,7 +577,7 @@ const putformData = () => {
                       <q-item-label>{{ list.label }}</q-item-label>
                     </q-item-section>
                     <q-item-section side>
-                      <q-rating :disable="!status" v-model="conduct_level[i]" :val="list.id" max="5" size="sm"
+                      <q-rating  v-model="conduct_level[i]" :val="list.id" max="5" size="sm"
                         color="grey" :color-selected="ratingColors" label="ระดับการประเมินพฤติกรรม">
                         <template v-slot:tip-1>
                           <q-tooltip>ต่ำกว่าความคาดหวังมาก</q-tooltip>
@@ -619,7 +613,7 @@ const putformData = () => {
                       <q-item-label>{{ list.label }}</q-item-label>
                     </q-item-section>
                     <q-item-section side>
-                      <q-rating :disable="!status" v-model="moral_level[i]" :val="list.id" max="5" size="sm" color="grey"
+                      <q-rating  v-model="moral_level[i]" :val="list.id" max="5" size="sm" color="grey"
                         :color-selected="ratingColors" label="ระดับการประเมินพฤติกรรม">
                         <template v-slot:tip-1>
                           <q-tooltip>ต่ำกว่าความคาดหวังมาก</q-tooltip>
@@ -655,7 +649,7 @@ const putformData = () => {
                       <q-item-label>{{ list.label }}</q-item-label>
                     </q-item-section>
                     <q-item-section side>
-                      <q-rating :disable="!status" v-model="discipline_level[i]" :val="list.id" max="5" size="sm"
+                      <q-rating  v-model="discipline_level[i]" :val="list.id" max="5" size="sm"
                         color="grey" :color-selected="ratingColors" label="ระดับการประเมินพฤติกรรม">
                         <template v-slot:tip-1>
                           <q-tooltip>ต่ำกว่าความคาดหวังมาก</q-tooltip>
@@ -683,7 +677,7 @@ const putformData = () => {
               <div class="col-12 text-top0 row items-center q-pl-lg">
                 <q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
                 2.4 อื่นๆ
-                <q-checkbox :disable="!status" class="q-ml-sm" dense v-model="etc2" @click="
+                <q-checkbox  class="q-ml-sm" dense v-model="etc2" @click="
                   (behavio_orther.text = ''), (behavio_orther.level = 0)
                   " />
               </div>
@@ -692,7 +686,7 @@ const putformData = () => {
                   <q-item dense tag="label" v-ripple>
                     <q-item-section>
                       <q-item-label>
-                        <q-input :disable="!status" v-model="behavio_orther.text" label="กรอกอื่นๆ" dense lazy-rules
+                        <q-input  v-model="behavio_orther.text" label="กรอกอื่นๆ" dense lazy-rules
                           autogrow hide-bottom-space outlined class="bg-white" :rules="[
                             (val) =>
                               (val && val.length > 0) || 'กรุณากรอกข้อความ',
@@ -700,7 +694,7 @@ const putformData = () => {
                       </q-item-label>
                     </q-item-section>
                     <q-item-section side>
-                      <q-rating :disable="!status" v-model="behavio_orther.level" max="5" size="sm" color="grey"
+                      <q-rating  v-model="behavio_orther.level" max="5" size="sm" color="grey"
                         :color-selected="ratingColors" label="ระดับการประเมินพฤติกรรม">
                         <template v-slot:tip-1>
                           <q-tooltip>ต่ำกว่าความคาดหวังมาก</q-tooltip>
@@ -856,30 +850,30 @@ const putformData = () => {
                 <div class="row q-gutter-md align-center q-pl-md">
                   <div class="col-8">1. การปฐมนิเทศ</div>
                   <div class="col">
-                    <q-input outlined :disable="!status" dense type="number" v-model="orientation" />
+                    <q-input outlined  dense type="number" v-model="orientation" />
                   </div>
                   <div class="col">
-                    <q-input outlined :disable="!status" dense type="number" v-model="orientation_percent" />
+                    <q-input outlined  dense type="number" v-model="orientation_percent" />
                   </div>
                 </div>
                 <q-separator class="q-my-xs" />
                 <div class="row q-gutter-md align-center q-pl-md">
                   <div class="col-8">2. การเรียนรู้ด้วยตนเอง</div>
                   <div class="col">
-                    <q-input outlined :disable="!status" dense type="number" v-model="self_learning" />
+                    <q-input outlined  dense type="number" v-model="self_learning" />
                   </div>
                   <div class="col">
-                    <q-input outlined :disable="!status" dense type="number" v-model="self_learning_percent" />
+                    <q-input outlined  dense type="number" v-model="self_learning_percent" />
                   </div>
                 </div>
                 <q-separator class="q-my-xs" />
                 <div class="row q-gutter-md align-center q-pl-md">
                   <div class="col-8">3. การอบรมสัมนาร่วมกัน</div>
                   <div class="col">
-                    <q-input outlined :disable="!status" dense type="number" v-model="training_seminar" />
+                    <q-input outlined  dense type="number" v-model="training_seminar" />
                   </div>
                   <div class="col">
-                    <q-input outlined :disable="!status" dense type="number" v-model="training_seminar_percent" />
+                    <q-input outlined  dense type="number" v-model="training_seminar_percent" />
                   </div>
                 </div>
                 <q-separator class="q-my-xs" />
@@ -888,10 +882,10 @@ const putformData = () => {
                     4. การอบรมอื่น ๆ ตามที่หน่วยงานกำหนด (ถ้ามี)
                   </div>
                   <div class="col">
-                    <q-input outlined :disable="!status" dense type="number" v-model="other_training" />
+                    <q-input outlined  dense type="number" v-model="other_training" />
                   </div>
                   <div class="col">
-                    <q-input outlined :disable="!status" dense type="number" v-model="other_training_percent" />
+                    <q-input outlined  dense type="number" v-model="other_training_percent" />
                   </div>
                 </div>
                 <!-- <q-list dense>
@@ -1012,7 +1006,7 @@ const putformData = () => {
                 สรุปผลการพัฒนา
               </div>
               <div class="col-12">
-                <q-select :disable="!status" class="col-xs-12" dense v-model="develop_result" outlined
+                <q-select  class="col-xs-12" dense v-model="develop_result" outlined
                   :options="develop_result_option" option-label="name" option-value="value"
                   label="เลือกสรุปผลการพัฒนา" map-options emit-value />
               </div>
@@ -1026,7 +1020,7 @@ const putformData = () => {
                 สรุปผล การประเมินผลทดลองปฎิบัติหน้าที่ราชการ
               </div>
               <div class="col-12">
-                <q-select :disable="!status" class="col-xs-12" dense v-model="evaluate_result" outlined
+                <q-select  class="col-xs-12" dense v-model="evaluate_result" outlined
                   :options="evaluate_result_option" option-label="name" option-value="value"
                   label="เลือกสรุปผล การประเมินผลทดลองปฎิบัติหน้าที่ราชการ" map-options emit-value />
               </div>
@@ -1053,7 +1047,7 @@ const putformData = () => {
                       {{ parseInt(value + 543) }}
                     </template>
                     <template #trigger>
-                      <q-input hide-bottom-space outlined :disable="!status" dense class="full-width datepicker col-3" :model-value="dateAutherise != null
+                      <q-input hide-bottom-space outlined  dense class="full-width datepicker col-3" :model-value="dateAutherise != null
                         ? date2Thai(dateAutherise)
                         : null
                         " :label="`${'ลงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]">
@@ -1077,7 +1071,7 @@ const putformData = () => {
                       {{ parseInt(value + 543) }}
                     </template>
                     <template #trigger>
-                      <q-input hide-bottom-space :disable="!status" outlined dense class="full-width datepicker col-3" :model-value="dateAutherise != null
+                      <q-input hide-bottom-space  outlined dense class="full-width datepicker col-3" :model-value="dateAutherise != null
                         ? date2Thai(dateAutherise)
                         : null
                         " :label="`${'ลงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]">
@@ -1100,7 +1094,7 @@ const putformData = () => {
                       {{ parseInt(value + 543) }}
                     </template>
                     <template #trigger>
-                      <q-input hide-bottom-space :disable="!status" outlined dense class="full-width datepicker col-3" :model-value="dateAutherise != null
+                      <q-input hide-bottom-space  outlined dense class="full-width datepicker col-3" :model-value="dateAutherise != null
                         ? date2Thai(dateAutherise)
                         : null
                         " :label="`${'ลงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]">
@@ -1131,7 +1125,7 @@ const putformData = () => {
                       {{ parseInt(value + 543) }}
                     </template>
                     <template #trigger>
-                      <q-input :disable="!status" outlined dense class="full-width datepicker col-3" :model-value="dateAutherise != null
+                      <q-input  outlined dense class="full-width datepicker col-3" :model-value="dateAutherise != null
                         ? date2Thai(dateAutherise)
                         : null
                         " :label="`${'ลงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]">
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index b0dd406eb..4a1e8211d 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -52,11 +52,11 @@ const fecthAssign = async (id: string) => {
       date_start.value = assign.value.date_start;
       date_finish.value = assign.value.date_finish;
 
-      director_id.value = res.data.data.commander.name;
-      director_id2.value = mentors.value[0].name;
-      director_id3.value = mentors.value[1].name;
+      director_id.value = res.data.data.chairman.name;
+      director_id2.value = res.data.data.commander.name;
+      director_id3.value = mentors.value[0].name;
 
-      commander.value.push(res.data.data.commander);
+      commander.value = res.data.data.commander;
       optionDirector.value = mentors.value;
     })
     .catch((e) => {
@@ -80,21 +80,25 @@ const fullname = ref<string>("");
 const fecthResult = async (id: string) => {
   await http
     .get(config.API.createformReport(id))
-    .then((res: any) => {
-      let data = res.data.data.evaluate;
-      fullname.value = res.data.data.profile.name;
-      date_start.value = data.date_start;
-      date_finish.value = data.date_finish;
-      develop.value = Number(data.develop_complete);
-      result.value = Number(data.pass_result);
-      reson.value = data.reson;
-      chairman_dated.value = data.chairman_dated;
-      director1_dated.value = data.director1_dated;
-      director2_dated.value = data.director2_dated;
-      status.value = false;
-      action.value = "edit";
+    .then(async(res: any) => {
+      if (res.data.data != null) {
+        const data = await res.data.data.evaluate;
+        console.log("data ===>", data);
+
+        fullname.value = res.data.data.profile.name;
+        date_start.value = data.date_start;
+        date_finish.value = data.date_finish;
+        develop.value = await Number(data.develop_complete);
+        result.value = await Number(data.pass_result);
+        reson.value = await data.reson;
+        chairman_dated.value = await data.chairman_dated;
+        director1_dated.value = await data.director1_dated;
+        director2_dated.value = await data.director2_dated;
+        status.value = false;
+        action.value = "edit";
+      }
     })
-    .catch((e) => {});
+    .catch((e) => { });
 };
 
 // part new
@@ -185,27 +189,16 @@ const selectRuslt = () => {
     <div class="toptitle text-dark col-12 row items-center q-gutter-md">
       <div>แบบรายงานการประเมินฯ</div>
       <!-- <q-space /> -->
-      <q-btn
-        v-if="!status"
-        size="12px"
-        flat
-        dense
-        icon="mdi-download"
-        color="primary"
-      >
+      <q-btn v-if="!status" size="12px" flat dense icon="mdi-download" color="primary">
         <q-tooltip>ดาวน์โหลด</q-tooltip>
         <q-menu>
           <q-list style="min-width: 150px">
             <q-item clickable v-close-popup @click="clickdownloadFile('pdf')">
-              <q-item-section avatar
-                ><q-icon color="red" name="mdi-file-pdf"
-              /></q-item-section>
+              <q-item-section avatar><q-icon color="red" name="mdi-file-pdf" /></q-item-section>
               <q-item-section>ไฟล์ .PDF</q-item-section>
             </q-item>
             <q-item clickable v-close-popup @click="clickdownloadFile('docx')">
-              <q-item-section avatar
-                ><q-icon color="blue" name="mdi-file-word"
-              /></q-item-section>
+              <q-item-section avatar><q-icon color="blue" name="mdi-file-word" /></q-item-section>
               <q-item-section>ไฟล์ .docx</q-item-section>
             </q-item>
           </q-list>
@@ -214,14 +207,7 @@ const selectRuslt = () => {
 
       <div v-if="action == 'edit'">
         <div v-if="status == false">
-          <q-btn
-            dense
-            flat
-            round
-            color="primary"
-            @click="edit()"
-            icon="mdi-pencil-outline"
-          >
+          <q-btn dense flat round color="primary" @click="edit()" icon="mdi-pencil-outline">
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
         </div>
@@ -229,15 +215,8 @@ const selectRuslt = () => {
           <q-btn dense flat round color="red" @click="cancel()" icon="mdi-undo">
             <q-tooltip>ยกเลิก</q-tooltip>
           </q-btn>
-          <q-btn
-            dense
-            flat
-            round
-            class="q-ml-sm"
-            color="public"
-            @click="saveEdit(assignId)"
-            icon="mdi-content-save-outline"
-          >
+          <q-btn dense flat round class="q-ml-sm" color="public" @click="saveEdit(assignId)"
+            icon="mdi-content-save-outline">
             <q-tooltip>บันทึกข้อมูล</q-tooltip>
           </q-btn>
         </div>
@@ -247,16 +226,8 @@ const selectRuslt = () => {
       <div class="row col-12">
         <div class="col-12 row q-col-gutter-md">
           <div class="col-xs-12 col-sm-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="date_start"
-              :locale="'th'"
-              autoApply
-              borderless
-              :readonly="!status"
-              :enableTimePicker="false"
-              week-start="0"
-            >
+            <datepicker menu-class-name="modalfix" v-model="date_start" :locale="'th'" autoApply borderless
+              :readonly="!status" :enableTimePicker="false" week-start="0">
               <template #year="{ year }">
                 {{ year + 543 }}
               </template>
@@ -264,23 +235,10 @@ const selectRuslt = () => {
                 {{ parseInt(value + 543) }}
               </template>
               <template #trigger>
-                <q-input
-                  outlined
-                  dense
-                  :disable="!status"
-                  class="full-width datepicker"
-                  :model-value="
-                    date_start != null ? date2Thai(date_start) : null
-                  "
-                  :label="`${'ระหว่างวันที่'}`"
-                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"
-                >
+                <q-input outlined dense :disable="!status" class="full-width datepicker" :model-value="date_start != null ? date2Thai(date_start) : null
+                  " :label="`${'ระหว่างวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]">
                   <template v-slot:prepend>
-                    <q-icon
-                      name="event"
-                      class="cursor-pointer"
-                      style="color: var(--q-primary)"
-                    >
+                    <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
                     </q-icon>
                   </template>
                 </q-input>
@@ -288,16 +246,8 @@ const selectRuslt = () => {
             </datepicker>
           </div>
           <div class="col-xs-12 col-sm-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="date_finish"
-              :locale="'th'"
-              autoApply
-              :readonly="!status"
-              borderless
-              :enableTimePicker="false"
-              week-start="0"
-            >
+            <datepicker menu-class-name="modalfix" v-model="date_finish" :locale="'th'" autoApply :readonly="!status"
+              borderless :enableTimePicker="false" week-start="0">
               <template #year="{ year }">
                 {{ year + 543 }}
               </template>
@@ -305,23 +255,10 @@ const selectRuslt = () => {
                 {{ parseInt(value + 543) }}
               </template>
               <template #trigger>
-                <q-input
-                  outlined
-                  dense
-                  :disable="!status"
-                  class="full-width datepicker"
-                  :model-value="
-                    date_finish != null ? date2Thai(date_finish) : null
-                  "
-                  :label="`${'ถึงวันที่'}`"
-                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"
-                >
+                <q-input outlined dense :disable="!status" class="full-width datepicker" :model-value="date_finish != null ? date2Thai(date_finish) : null
+                  " :label="`${'ถึงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]">
                   <template v-slot:prepend>
-                    <q-icon
-                      name="event"
-                      class="cursor-pointer"
-                      style="color: var(--q-primary)"
-                    >
+                    <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
                     </q-icon>
                   </template>
                 </q-input>
@@ -334,78 +271,35 @@ const selectRuslt = () => {
       <div class="col-12 row q-mt-xs">
         <div class="col-12 row q-col-gutter-md">
           <div class="col-xs-12 col-sm-6">
-            <q-select
-              :rules="[
-                (val) =>
-                  !!val ||
-                  'กรุณาเลือกการพัฒนาในระหว่างทดลองปฏิบัติหน้าที่ราชการ',
-              ]"
-              hide-bottom-space
-              :options="options"
-              class="col-xs-12 col-sm-6"
-              dense
-              borderless
-              :disable="!status"
-              emit-value
-              map-options
-              option-label="label"
-              option-value="value"
-              outlined
-              v-model="develop"
-              label="การพัฒนาในระหว่างทดลองปฏิบัติหน้าที่ราชการ"
-            />
+            <q-select :rules="[
+              (val) =>
+                !!val ||
+                'กรุณาเลือกการพัฒนาในระหว่างทดลองปฏิบัติหน้าที่ราชการ',
+            ]" hide-bottom-space :options="options" class="col-xs-12 col-sm-6" dense borderless :disable="!status"
+              emit-value map-options option-label="label" option-value="value" outlined v-model="develop"
+              label="การพัฒนาในระหว่างทดลองปฏิบัติหน้าที่ราชการ" />
           </div>
           <div class="col-xs-12 col-sm-6">
             <div class="row">
-              <q-select
-                class="col-sm-12"
-                :rules="[
-                  (val) =>
-                    !!val ||
-                    'กรุณาเลือกผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ',
-                ]"
-                hide-bottom-space
-                :options="optionsResult"
-                :disable="!status"
-                dense
-                borderless
-                emit-value
-                map-options
-                option-label="label"
-                option-value="value"
-                outlined
-                v-model="result"
-                label="ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ"
-                @update:model-value="selectRuslt"
-              />
+              <q-select class="col-sm-12" :rules="[
+                (val) =>
+                  !!val ||
+                  'กรุณาเลือกผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ',
+              ]" hide-bottom-space :options="optionsResult" :disable="!status" dense borderless emit-value
+                map-options option-label="label" option-value="value" outlined v-model="result"
+                label="ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ" @update:model-value="selectRuslt" />
             </div>
             <div class="row q-mt-xs" v-if="result === 3">
-              <q-input
-                outlined
-                dense
-                v-model="expand_month"
-                label="จำนวนเดือน"
-                :rules="[(val) => !!val || 'กรุณากรอกจำนวนเดือน']"
-                type="number"
-              />
+              <q-input outlined dense v-model="expand_month" label="จำนวนเดือน"
+                :rules="[(val) => !!val || 'กรุณากรอกจำนวนเดือน']" type="number" />
             </div>
           </div>
         </div>
       </div>
       <div class="col-12 row q-mt-lg">
         <div class="col-12">
-          <q-input
-            hide-bottom-space
-            dense
-            borderless
-            outlined
-            :disable="!status"
-            class="bg-white"
-            type="textarea"
-            v-model="reson"
-            label="เหตุผล"
-            :rules="[(val) => !!val || 'กรุณาระบุเหตุผล']"
-          />
+          <q-input hide-bottom-space dense borderless outlined :disable="!status" class="bg-white" type="textarea"
+            v-model="reson" label="เหตุผล" :rules="[(val) => !!val || 'กรุณาระบุเหตุผล']" />
         </div>
       </div>
 
@@ -419,27 +313,11 @@ const selectRuslt = () => {
             ประธานคณะกรรมการประเมินผลการปฏิบัติหน้าที่ราชการ
           </div>
           <div class="col-12 row q-col-gutter-md">
-            <q-select
-              class="col-xs-12 col-sm-8"
-              dense
-              v-model="director_id"
-              outlined
-              :options="commander"
-              label="ชื่อ-นามสกุล"
-              option-label="name"
-              disable
-            />
+            <q-select class="col-xs-12 col-sm-8" dense v-model="director_id" outlined :options="commander"
+              label="ชื่อ-นามสกุล" option-label="name" disable />
             <div class="col-xs-12 col-sm-4">
-              <datepicker
-                menu-class-name="modalfix"
-                v-model="chairman_dated"
-                :locale="'th'"
-                :readonly="!status"
-                autoApply
-                borderless
-                :enableTimePicker="false"
-                week-start="0"
-              >
+              <datepicker menu-class-name="modalfix" v-model="chairman_dated" :locale="'th'" :readonly="!status" autoApply
+                borderless :enableTimePicker="false" week-start="0">
                 <template #year="{ year }">
                   {{ year + 543 }}
                 </template>
@@ -447,23 +325,10 @@ const selectRuslt = () => {
                   {{ parseInt(value + 543) }}
                 </template>
                 <template #trigger>
-                  <q-input
-                    outlined
-                    dense
-                    :disable="!status"
-                    class="full-width datepicker col-3"
-                    :model-value="
-                      chairman_dated != null ? date2Thai(chairman_dated) : null
-                    "
-                    :label="`${'ลงวันที่'}`"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
-                  >
+                  <q-input outlined dense :disable="!status" class="full-width datepicker col-3" :model-value="chairman_dated != null ? date2Thai(chairman_dated) : null
+                    " :label="`${'ลงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]">
                     <template v-slot:prepend>
-                      <q-icon
-                        name="event"
-                        class="cursor-pointer"
-                        style="color: var(--q-primary)"
-                      >
+                      <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
                       </q-icon>
                     </template>
                   </q-input>
@@ -479,27 +344,11 @@ const selectRuslt = () => {
             <!-- ความเห็นของผู้มีอำนาจสั่งบรรจุตามมาตรา 52 -->
           </div>
           <div class="col-12 row q-col-gutter-md">
-            <q-select
-              class="col-xs-12 col-sm-8"
-              dense
-              v-model="director_id2"
-              outlined
-              label="ชื่อ-นามสกุล"
-              :disable="!status"
-              :options="optionDirector"
-              option-label="name"
-            />
+            <q-select class="col-xs-12 col-sm-8" dense v-model="director_id2" outlined label="ชื่อ-นามสกุล"
+              disable :options="optionDirector" option-label="name" />
             <div class="col-xs-12 col-sm-4">
-              <datepicker
-                menu-class-name="modalfix"
-                v-model="director1_dated"
-                :locale="'th'"
-                autoApply
-                borderless
-                :readonly="!status"
-                :enableTimePicker="false"
-                week-start="0"
-              >
+              <datepicker menu-class-name="modalfix" v-model="director1_dated" :locale="'th'" autoApply borderless
+                :readonly="!status" :enableTimePicker="false" week-start="0">
                 <template #year="{ year }">
                   {{ year + 543 }}
                 </template>
@@ -507,25 +356,12 @@ const selectRuslt = () => {
                   {{ parseInt(value + 543) }}
                 </template>
                 <template #trigger>
-                  <q-input
-                    outlined
-                    dense
-                    :disable="!status"
-                    class="full-width datepicker col-3"
-                    :model-value="
-                      director1_dated != null
-                        ? date2Thai(director1_dated)
-                        : null
-                    "
-                    :label="`${'ลงวันที่'}`"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
-                  >
+                  <q-input outlined dense :disable="!status" class="full-width datepicker col-3" :model-value="director1_dated != null
+                      ? date2Thai(director1_dated)
+                      : null
+                    " :label="`${'ลงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]">
                     <template v-slot:prepend>
-                      <q-icon
-                        name="event"
-                        class="cursor-pointer"
-                        style="color: var(--q-primary)"
-                      >
+                      <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
                       </q-icon>
                     </template>
                   </q-input>
@@ -541,27 +377,11 @@ const selectRuslt = () => {
             <!-- ผู้มีอำนาจสั่งบรรจุตามมาตรา 52 -->
           </div>
           <div class="col-12 row q-col-gutter-md">
-            <q-select
-              class="col-xs-12 col-sm-8"
-              dense
-              v-model="director_id3"
-              outlined
-              label="ชื่อ-นามสกุล"
-              :options="optionDirector"
-              :disable="!status"
-              option-label="name"
-            />
+            <q-select class="col-xs-12 col-sm-8" dense v-model="director_id3" outlined label="ชื่อ-นามสกุล"
+              :options="optionDirector" disable option-label="name" />
             <div class="col-xs-12 col-sm-4">
-              <datepicker
-                menu-class-name="modalfix"
-                v-model="director2_dated"
-                :locale="'th'"
-                autoApply
-                :readonly="!status"
-                borderless
-                :enableTimePicker="false"
-                week-start="0"
-              >
+              <datepicker menu-class-name="modalfix" v-model="director2_dated" :locale="'th'" autoApply
+                :readonly="!status" borderless :enableTimePicker="false" week-start="0">
                 <template #year="{ year }">
                   {{ year + 543 }}
                 </template>
@@ -569,25 +389,12 @@ const selectRuslt = () => {
                   {{ parseInt(value + 543) }}
                 </template>
                 <template #trigger>
-                  <q-input
-                    outlined
-                    dense
-                    :disable="!status"
-                    class="full-width datepicker col-3"
-                    :model-value="
-                      director2_dated != null
-                        ? date2Thai(director2_dated)
-                        : null
-                    "
-                    :label="`${'ลงวันที่'}`"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
-                  >
+                  <q-input outlined dense :disable="!status" class="full-width datepicker col-3" :model-value="director2_dated != null
+                      ? date2Thai(director2_dated)
+                      : null
+                    " :label="`${'ลงวันที่'}`" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]">
                     <template v-slot:prepend>
-                      <q-icon
-                        name="event"
-                        class="cursor-pointer"
-                        style="color: var(--q-primary)"
-                      >
+                      <q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
                       </q-icon>
                     </template>
                   </q-input>
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
index 9a4964b7b..f9bcd791f 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
@@ -41,7 +41,7 @@ const fecthAssign = async (id: string) => {
     .get(config.API.formevaluate(id))
     .then(async (res: any) => {
       await fecthdataAssign(res.data.data);
-      fullname.value = res.data.data.person.name;
+      fullname.value = res.data.data.experimentee ? res.data.data.experimentee.name : "";
       dataArrayNumber.value = 1;
     })
     .catch((e: any) => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
index 9a0903b30..23ff1d94b 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
@@ -52,7 +52,7 @@ const fecthAssign = async (id: string) => {
       await fecthdataAssign(res.data.data);
       evaluate.value = assignStore.evaluate;
       tabs.value = evaluate.value;
-      fullname.value = res.data.data.person.name;
+      fullname.value = res.data.data.experimentee ? res.data.data.experimentee.name : "";
       dataArrayNumber.value = 1;
     })
     .catch((e: any) => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
index e05efbff4..2ebee1e93 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
@@ -47,7 +47,7 @@ const fecthAssign = async (id: string) => {
     .then(async (res: any) => {
       await fecthdataAssign(res.data.data);
       evaluate.value = assignStore.evaluate;
-      fullname.value = res.data.data.person.name;
+      fullname.value = res.data.data.experimentee ? res.data.data.experimentee.name : "";
       tabs.value = evaluate.value;
       dataArrayNumber.value = 1;
     })
diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index 7ce476fae..37cce33fe 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -94,7 +94,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "probation_status",
     align: "left",
-    label: "สถานะทดลองงาน",
+    label: "สถานะการทดลองงาน",
     sortable: true,
     field: "probation_status",
     headerStyle: "font-size: 14px",
@@ -251,7 +251,7 @@ const findlist = async (id: string) => {
     position: e.position,
     level: e.positionEmployeeLevel,
     organizationOrganization: e.oc,
-    status: statusProbation(e.probation),
+    status: e.probation,
   }));
   modal.value = true;
 };
@@ -306,14 +306,6 @@ const statusProbationMain = (val: number) => {
       return " ";
   }
 };
-const statusProbation = (val: boolean) => {
-  switch (val) {
-    case true:
-      return "ทดลองงาน";
-    default:
-      return " ";
-  }
-};
 
 // ค้นหาในตาราง
 const filterKeyword = ref<string>("");
@@ -482,6 +474,9 @@ const paginationLabel2 = (start: string, end: string, total: string) => {
                     <div v-if="col.name == 'no'">
                       {{ props.rowIndex + 1 }}
                     </div>
+                    <div v-else-if="col.name == 'status'">
+                      <q-icon v-if="col.value === true" name="mdi-check" color="positive" />
+                    </div>
                     <div v-else>
                       {{ col.value }}
                     </div>