diff --git a/src/api/05_placement/api.probation.ts b/src/api/05_placement/api.probation.ts
index 6cf5144e4..db4aadfa1 100644
--- a/src/api/05_placement/api.probation.ts
+++ b/src/api/05_placement/api.probation.ts
@@ -41,17 +41,17 @@ export default {
   //แบบประเมินผล (ผู้บังคับบัญชา)
   evaluateCreate: (id: string) => `${evaluate}/evaluate/create?assign_id=${id}`,
   evaluatecommader: (id: string, no: string) => `${evaluate}/evaluate?assign_id=${id}&evaluate_no=${no}`,
-  createformCommader: (id: string) => `${evaluate}/evaluate?id=${id}`,
+  createformCommader: (id: string) => `${evaluate}/evaluate?assign_id=${id}`,
 
   //แบบประเมินผล (คณะกรรมการ)
   evaluateChairman: (id: string) => `${evaluate}/evaluate-chairman/create?assign_id=${id}`,
   evaluateRoundChairman: (id: string, no: string) => `${evaluate}/evaluate-chairman?assign_id=${id}&evaluate_no=${no}`,
-  createformChairman: (id: string) => `${evaluate}/evaluate-chairman?id=${id}`,
+  createformChairman: (id: string) => `${evaluate}/evaluate-chairman?assign_id=${id}`,
 
   //แบบรายงาน
   evaluateReportcreate: (id: string) => `${evaluate}/evaluate-result/create?assign_id=${id}`,
   evaluateReport: (id: string) => `${evaluate}/evaluate-result?assign_id=${id}`,
-  createformReport: (id: string) => `${evaluate}/evaluate-result?id=${id}`,
+  createformReport: (id: string) => `${evaluate}/evaluate-result?assign_id=${id}`,
 
 
 
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index 13621e6ba..d42e1c3a0 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -26,7 +26,7 @@ const assign = ref<any>([]);
 const mentors = ref<any>([]);
 const commander = ref<any>([]);
 const status = ref<boolean>(true);
-const evaluate = ref<any>([]);
+// const evaluate = ref<any>([]);
 
 onMounted(() => {
   fecthAssign(assignId.value);
@@ -68,7 +68,7 @@ const director1_dated = ref<any>("");
 const director2_dated = ref<any>("");
 const fecthResult = async (id: string) => {
   await http
-    .get(config.API.evaluateReport(id))
+    .get(config.API.createformReport(id))
     .then((res: any) => {
       let data = res.data.data.evaluate;
       console.log(data);
@@ -124,7 +124,7 @@ const postData = async () => {
     director2_dated: director2_dated.value,
   };
 
-  console.log("postData===>", data);
+  // console.log("postData===>", data);
   await http
     .post(config.API.createformReport(assignId.value), data)
     .then(() => {
@@ -146,15 +146,8 @@ const postData = async () => {
       <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
-              :enableTimePicker="false"
-              week-start="0"
-            >
+            <datepicker menu-class-name="modalfix" v-model="date_start" :locale="'th'" autoApply borderless
+              :enableTimePicker="false" week-start="0">
               <template #year="{ year }">
                 {{ year + 543 }}
               </template>
@@ -162,22 +155,10 @@ const postData = async () => {
                 {{ parseInt(value + 543) }}
               </template>
               <template #trigger>
-                <q-input
-                  outlined
-                  dense
-                  class="full-width datepicker"
-                  :model-value="
-                    date_start != null ? date2Thai(date_start) : null
-                  "
-                  :label="`${'ระหว่างวันที่'}`"
-                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"
-                >
+                <q-input outlined dense 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>
@@ -185,15 +166,8 @@ const postData = async () => {
             </datepicker>
           </div>
           <div class="col-xs-12 col-sm-6">
-            <datepicker
-              menu-class-name="modalfix"
-              v-model="date_finish"
-              :locale="'th'"
-              autoApply
-              borderless
-              :enableTimePicker="false"
-              week-start="0"
-            >
+            <datepicker menu-class-name="modalfix" v-model="date_finish" :locale="'th'" autoApply borderless
+              :enableTimePicker="false" week-start="0">
               <template #year="{ year }">
                 {{ year + 543 }}
               </template>
@@ -201,22 +175,10 @@ const postData = async () => {
                 {{ parseInt(value + 543) }}
               </template>
               <template #trigger>
-                <q-input
-                  outlined
-                  dense
-                  class="full-width datepicker"
-                  :model-value="
-                    date_finish != null ? date2Thai(date_finish) : null
-                  "
-                  :label="`${'ถึงวันที่'}`"
-                  :rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"
-                >
+                <q-input outlined dense 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>
@@ -228,63 +190,29 @@ const postData = async () => {
 
       <div class="col-12 row q-mt-xs">
         <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
-            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 emit-value map-options
+            option-label="label" option-value="value" outlined v-model="develop"
+            label="การพัฒนาในระหว่างทดลองปฏิบัติหน้าที่ราชการ" />
         </div>
       </div>
       <div class="col-12 row q-mt-lg">
         <div class="col-xs-12 col-sm-6">
-          <q-select
-            :rules="[
-              (val) =>
-                !!val || 'กรุณาเลือกผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ',
-            ]"
-            hide-bottom-space
-            :options="optionsResult"
-            class="col-xs-12 col-sm-6"
-            dense
-            borderless
-            emit-value
-            map-options
-            option-label="label"
-            option-value="value"
-            outlined
-            v-model="result"
-            label="ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ"
-          />
+          <q-select :rules="[
+            (val) =>
+              !!val || 'กรุณาเลือกผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ',
+          ]" hide-bottom-space :options="optionsResult" class="col-xs-12 col-sm-6" dense borderless emit-value
+            map-options option-label="label" option-value="value" outlined v-model="result"
+            label="ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ" />
         </div>
       </div>
 
       <div class="col-12 row q-mt-lg">
         <div class="col-12">
-          <q-input
-            hide-bottom-space
-            :readonly="edit"
-            dense
-            borderless
-            :outlined="!edit"
-            class="bg-white"
-            type="textarea"
-            v-model="reson"
-            label="เหตุผล"
-            :rules="[(val) => !!val || 'กรุณาระบุเหตุผล']"
-          />
+          <q-input hide-bottom-space :readonly="edit" dense borderless :outlined="!edit" class="bg-white" type="textarea"
+            v-model="reson" label="เหตุผล" :rules="[(val) => !!val || 'กรุณาระบุเหตุผล']" />
         </div>
       </div>
 
@@ -298,26 +226,11 @@ const postData = async () => {
             ประธานคณะกรรมการประเมินผลการปฏิบัติหน้าที่ราชการ
           </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'"
-                autoApply
-                borderless
-                :enableTimePicker="false"
-                week-start="0"
-              >
+              <datepicker menu-class-name="modalfix" v-model="chairman_dated" :locale="'th'" autoApply borderless
+                :enableTimePicker="false" week-start="0">
                 <template #year="{ year }">
                   {{ year + 543 }}
                 </template>
@@ -325,22 +238,10 @@ const postData = async () => {
                   {{ parseInt(value + 543) }}
                 </template>
                 <template #trigger>
-                  <q-input
-                    outlined
-                    dense
-                    class="full-width datepicker col-3"
-                    :model-value="
-                      chairman_dated != null ? date2Thai(chairman_dated) : null
-                    "
-                    :label="`${'ลงวันที่'}`"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
-                  >
+                  <q-input outlined dense 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>
@@ -356,25 +257,11 @@ const postData = async () => {
             <!-- ความเห็นของผู้มีอำนาจสั่งบรรจุตามมาตรา 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
-              :options="optionDirector"
-              label=""
-              option-label="name"
-            />
+            <q-select class="col-xs-12 col-sm-8" dense v-model="director_id2" outlined :options="optionDirector" label=""
+              option-label="name" />
             <div class="col-xs-12 col-sm-4">
-              <datepicker
-                menu-class-name="modalfix"
-                v-model="director1_dated"
-                :locale="'th'"
-                autoApply
-                borderless
-                :enableTimePicker="false"
-                week-start="0"
-              >
+              <datepicker menu-class-name="modalfix" v-model="director1_dated" :locale="'th'" autoApply borderless
+                :enableTimePicker="false" week-start="0">
                 <template #year="{ year }">
                   {{ year + 543 }}
                 </template>
@@ -382,24 +269,12 @@ const postData = async () => {
                   {{ parseInt(value + 543) }}
                 </template>
                 <template #trigger>
-                  <q-input
-                    outlined
-                    dense
-                    class="full-width datepicker col-3"
-                    :model-value="
-                      director1_dated != null
-                        ? date2Thai(director1_dated)
-                        : null
-                    "
-                    :label="`${'ลงวันที่'}`"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
-                  >
+                  <q-input outlined dense 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>
@@ -415,25 +290,11 @@ const postData = async () => {
             <!-- ผู้มีอำนาจสั่งบรรจุตามมาตรา 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
-              :options="optionDirector"
-              label=""
-              option-label="name"
-            />
+            <q-select class="col-xs-12 col-sm-8" dense v-model="director_id3" outlined :options="optionDirector" label=""
+              option-label="name" />
             <div class="col-xs-12 col-sm-4">
-              <datepicker
-                menu-class-name="modalfix"
-                v-model="director2_dated"
-                :locale="'th'"
-                autoApply
-                borderless
-                :enableTimePicker="false"
-                week-start="0"
-              >
+              <datepicker menu-class-name="modalfix" v-model="director2_dated" :locale="'th'" autoApply borderless
+                :enableTimePicker="false" week-start="0">
                 <template #year="{ year }">
                   {{ year + 543 }}
                 </template>
@@ -441,24 +302,12 @@ const postData = async () => {
                   {{ parseInt(value + 543) }}
                 </template>
                 <template #trigger>
-                  <q-input
-                    outlined
-                    dense
-                    class="full-width datepicker col-3"
-                    :model-value="
-                      director2_dated != null
-                        ? date2Thai(director2_dated)
-                        : null
-                    "
-                    :label="`${'ลงวันที่'}`"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
-                  >
+                  <q-input outlined dense 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>
@@ -471,12 +320,7 @@ const postData = async () => {
 
       <q-toolbar class="text-primary">
         <q-space />
-        <q-btn
-          label="บันทึก"
-          color="secondary"
-          @click="savaForm"
-          v-if="status"
-        />
+        <q-btn label="บันทึก" color="secondary" @click="savaForm" v-if="status" />
       </q-toolbar>
     </q-form>
   </div>
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
index 6ae8a75d0..a8f697e29 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
@@ -41,10 +41,11 @@ const props = defineProps({
 });
 
 onMounted(async () => {
-  // console.log("tab===>", props.tab);
+  console.log("form tab===>", props.tab);
 
   if (props.tab !== undefined) {
     round.value = props.tab.charAt(4);
+    console.log("round===>", round.value);
 
     // await fecthFormRound(assignId.value, round.value);
   }
@@ -55,7 +56,7 @@ const fecthFormdata = async (id: string) => {
   await http
     .get(config.API.formevaluateRecord(id))
     .then(async (res: any) => {
-      console.log(res);
+      // console.log(res);
       evaluate_no.value = res.data.data.evaluate_no;
       start_date.value = res.data.data.start_date;
       date_finish.value = res.data.data.end_date;
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
index 94cd50612..1a9de9f4d 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
@@ -48,7 +48,7 @@ const fecthAssign = async (id: string) => {
       // console.log(tabs.value);
     })
     .catch((e: any) => {
-      console.log(e);
+      // console.log(e);
       messageError($q, e);
     })
     .finally(() => {
@@ -75,40 +75,7 @@ const addData = () => {
     :loop="tabs.length"
     v-if="tabs.length > 0"
   />
-  <!-- <q-header class="bg-grey-1">
-    <div class="bg-grey-1">
-      <div class="col-12 row q-gutter-xs-md items-center">
-        <q-tabs dense v-model="tabHead" active-class="text-primary text-weight-medium" indicator-color="grey-1"
-          class="text-grey-7">
-          <q-tab v-for="tabData in tabs" :key="tabData.no" :name="tabData.no" :label="'ครั้งที่' + tabData.no"
-            @click="changeTab('save' + tabData.no)">
-            <q-btn size="12px" flat dense icon="mdi-download" :disable="tabHead !== tabData.no"
-              :color="tabHead !== tabData.no ? 'grey' : 'add'">
-              <q-tooltip>ดาวน์โหลด</q-tooltip>
-              <q-menu>
-                <q-list style="min-width: 150px">
-                  <q-item clickable v-close-popup>
-                    <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>
-                    <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>
-              </q-menu>
-            </q-btn>
-          </q-tab>
-        </q-tabs>
-        <div>
-          <q-btn color="blue" flat dense icon="mdi-plus" @click="nextPage">
-            <q-tooltip> เพิ่ม </q-tooltip>
-          </q-btn>
-        </div>
-      </div>
-      <q-separator />
-    </div>
-  </q-header> -->
+
   <q-page-container>
     <q-tab-panels v-model="tab" animated>
       <q-tab-panel
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
index 2726711d9..39f3a9380 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
@@ -41,14 +41,14 @@ onMounted(() => {
 const fecthAssign = async (id: string) => {
   showLoader();
   await http
-    .get(config.API.evaluateCreate(id))
+    .get(config.API.createformCommader(id))
     .then((res: any) => {
       if (res.data.data.evaluate_no > 0) {
         tabs.value = res.data.data.evaluate;
       }
     })
     .catch((e: any) => {
-      console.log(e);
+      // console.log(e);
       messageError($q, e);
     })
     .finally(() => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
index b98b81ea4..cb01dfab0 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
@@ -37,7 +37,7 @@ onMounted(() => {
 const fecthAssign = async (id: string) => {
   showLoader();
   await http
-    .get(config.API.evaluateChairman(id))
+    .get(config.API.createformChairman(id))
     .then((res: any) => {
       if (res.data.data.evaluate_no > 0) {
         tabs.value = res.data.data.evaluate;
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue
index fb54fdd4d..f788247ab 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template3.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { ref, defineAsyncComponent } from "vue";
-const tab = ref<string>("save1");
-const changeTab = (tabVal: string) => {
-  tab.value = tabVal
-}
+// const tab = ref<string>("save1");
+// const changeTab = (tabVal: string) => {
+//   tab.value = tabVal
+// }
 
-const Header = defineAsyncComponent(
-  () => import("@/modules/05_placement/components/probation/FormEvaluation/Header.vue")
-);
+// const Header = defineAsyncComponent(
+//   () => import("@/modules/05_placement/components/probation/FormEvaluation/Header.vue")
+// );
 const FormReport = defineAsyncComponent(
   () => import("@/modules/05_placement/components/probation/FormEvaluation/FormReport.vue")
 )
diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index a4a441b9a..3428c5fb5 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -75,7 +75,7 @@
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
       <div class="q-pl-sm text-weight-bold text-dark">ข้อมูลการลาออก</div>
       <q-space />
-      <div class="q-gutter-x-sm" v-if="dataDetail.status === 'PENDING'">
+      <div class="q-gutter-x-sm" v-if="dataDetail.status === 'WAITTING'">
         <q-btn
           outline
           color="primary"