diff --git a/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
index b2d4480..f2b4cd8 100644
--- a/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
+++ b/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
@@ -75,8 +75,8 @@ const formDetail = reactive<any>({
   strategyId: "",
   strategyName: "",
   documentInfoEvidence: "",
-  startDate:null,
-  endDate:null
+  startDate: null,
+  endDate: null,
 });
 
 /** Option  รอบการประเมิน*/
@@ -125,8 +125,8 @@ function fetchListPlanByid(id: string) {
       formDetail.achievement5 = data.achievement5;
       formDetail.documentInfoEvidence = data.documentInfoEvidence;
 
-      formDetail.startDate = data.startDate
-      formDetail.endDate = data.endDate
+      formDetail.startDate = data.startDate;
+      formDetail.endDate = data.endDate;
 
       listCheckID.value = data.kpiPlanId;
     })
@@ -178,8 +178,8 @@ function fetchRoleByid(id: string) {
       formDetail.achievement4 = data.achievement4;
       formDetail.achievement5 = data.achievement5;
       formDetail.documentInfoEvidence = data.documentInfoEvidence;
-      formDetail.startDate = data.startDate
-      formDetail.endDate = data.endDate
+      formDetail.startDate = data.startDate;
+      formDetail.endDate = data.endDate;
 
       listCheckID.value = data.kpiRoleId;
       // clickList(data.kpiRoleId, true);
@@ -240,8 +240,8 @@ function fetchspecialByid(id: string) {
       formDetail.formula = data.formula;
       formDetail.meaning = data.meaning;
       formDetail.documentInfoEvidence = data.documentInfoEvidence;
-      formDetail.startDate = data.startDate
-      formDetail.endDate = data.endDate
+      formDetail.startDate = data.startDate;
+      formDetail.endDate = data.endDate;
     })
     .catch((err) => {
       messageError($q, err);
@@ -326,8 +326,8 @@ function closeDialog() {
   formDetail.strategy = "";
   formDetail.strategyId = "";
   formDetail.documentInfoEvidence = "";
-  formDetail.startDate = null
-  formDetail.endDate = null
+  formDetail.startDate = null;
+  formDetail.endDate = null;
 
   formFilter.isAll = false;
   formFilter.keyword = "";
@@ -362,7 +362,7 @@ function onSubmit() {
         achievement5: formDetail.achievement5,
         documentInfoEvidence: formDetail.documentInfoEvidence,
         startDate: formDetail.startDate ? formDetail.startDate : undefined,
-        endDate: formDetail.endDate ? formDetail.endDate: undefined,
+        endDate: formDetail.endDate ? formDetail.endDate : undefined,
         including: numpage.value === 3 ? formDetail.including : undefined,
         includingName:
           numpage.value === 3 ? formDetail.includingName : undefined,
@@ -863,6 +863,7 @@ const title = computed(() => {
                     autoApply
                     :enableTimePicker="false"
                     week-start="0"
+                    @update:model-value="formDetail.endDate = null"
                   >
                     <template #year="{ year }">{{ year + 543 }}</template>
                     <template #year-overlay-value="{ value }">{{
@@ -874,7 +875,9 @@ const title = computed(() => {
                         outlined
                         class="inputgreen"
                         :model-value="
-                          formDetail.startDate ? date2Thai(formDetail.startDate) : null
+                          formDetail.startDate
+                            ? date2Thai(formDetail.startDate)
+                            : null
                         "
                         :label="`${'ช่วงเวลาเริ่มต้น'}`"
                         hide-bottom-space
@@ -906,6 +909,7 @@ const title = computed(() => {
                     autoApply
                     :enableTimePicker="false"
                     week-start="0"
+                    :min-date="formDetail.startDate"
                   >
                     <template #year="{ year }">{{ year + 543 }}</template>
                     <template #year-overlay-value="{ value }">{{
@@ -917,7 +921,9 @@ const title = computed(() => {
                         outlined
                         class="inputgreen"
                         :model-value="
-                          formDetail.endDate ? date2Thai(formDetail.endDate) : null
+                          formDetail.endDate
+                            ? date2Thai(formDetail.endDate)
+                            : null
                         "
                         :label="`${'ช่วงเวลาสิ้นสุด'}`"
                         hide-bottom-space