diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index 893e7ff26..f65c1dab8 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -361,6 +361,7 @@ onMounted(async () => {
               "
               :enableTimePicker="false"
               week-start="0"
+              :max-date="date_finish"
             >
               <template #year="{ year }">
                 {{ year + 543 }}
@@ -400,17 +401,18 @@ onMounted(async () => {
           <div class="col-xs-12 col-sm-6">
             <datepicker
               menu-class-name="modalfix"
-              v-model="date_finish"
-              :locale="'th'"
-              autoApply
               :readonly="
                 !status ||
                 checkRoutePermisson ||
                 probationStore.dataPermissions?.tab6.isEdit == false
               "
+              v-model="date_finish"
+              :locale="'th'"
+              autoApply
               borderless
               :enableTimePicker="false"
               week-start="0"
+              :min-date="date_start"
             >
               <template #year="{ year }">
                 {{ year + 543 }}