diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 0bdbf2899..4887f4d72 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -665,6 +665,106 @@ onMounted(async () => {
                     </div>
                   </q-card>
                 </div>
+                <datepicker
+                  :readonly="isReadonly"
+                  menu-class-name="modalfix"
+                  for="#dateAllegation"
+                  v-model="formData.disciplinaryDateInvestigation"
+                  class="col-xs-12 col-sm-3"
+                  :locale="'th'"
+                  autoApply
+                  borderless
+                  :enableTimePicker="false"
+                  week-start="0"
+                  @update:model-value="changeFormData()"
+                >
+                  <template #year="{ year }">
+                    {{ year + 543 }}
+                  </template>
+                  <template #year-overlay-value="{ value }">
+                    {{ parseInt(value + 543) }}
+                  </template>
+                  <template #trigger>
+                    <q-input
+                      :readonly="isReadonly"
+                      outlined
+                      dense
+                      class="col-xs-12 col-sm-4"
+                      hide-bottom-space
+                      :model-value="
+                        formData.disciplinaryDateInvestigation != null
+                          ? date2Thai(formData.disciplinaryDateInvestigation)
+                          : null
+                      "
+                      :label="`${'วันที่มีคำสั่งให้สอบสวน'}`"
+                      :rules="[
+                        (val) =>
+                          !!val || `${'กรุณาเลือกวันที่มีคำสั่งให้สอบสวน'}`,
+                      ]"
+                      lazy-rules
+                    >
+                      <template v-slot:prepend>
+                        <q-icon
+                          name="event"
+                          class="cursor-pointer"
+                          style="color: var(--q-primary)"
+                        >
+                        </q-icon>
+                      </template>
+                    </q-input>
+                  </template>
+                </datepicker>
+                <datepicker
+                  :readonly="isReadonly"
+                  menu-class-name="modalfix"
+                  for="#dateAllegation"
+                  v-model="formData.disciplinaryDateAllegation"
+                  class="col-xs-12 col-sm-3"
+                  :locale="'th'"
+                  autoApply
+                  borderless
+                  :enableTimePicker="false"
+                  week-start="0"
+                  @update:model-value="changeFormData()"
+                >
+                  <template #year="{ year }">
+                    {{ year + 543 }}
+                  </template>
+                  <template #year-overlay-value="{ value }">
+                    {{ parseInt(value + 543) }}
+                  </template>
+                  <template #trigger>
+                    <q-input
+                      :readonly="isReadonly"
+                      ref="disciplinaryDateAllegationRef"
+                      outlined
+                      dense
+                      class="col-xs-12 col-sm-4"
+                      hide-bottom-space
+                      :model-value="
+                        formData.disciplinaryDateAllegation != null
+                          ? date2Thai(formData.disciplinaryDateAllegation)
+                          : null
+                      "
+                      :label="`${'วันที่รับทราบข้อกล่าวหา'}`"
+                      :rules="[
+                        (val) =>
+                          !!val || `${'กรุณาเลือกวันที่รับทราบข้อกล่าวหา'}`,
+                      ]"
+                      lazy-rules
+                    >
+                      <template v-slot:prepend>
+                        <q-icon
+                          name="event"
+                          class="cursor-pointer"
+                          style="color: var(--q-primary)"
+                        >
+                        </q-icon>
+                      </template>
+                    </q-input>
+                  </template>
+                </datepicker>
+
 
                 <div class="row col-12">
                   <q-card
@@ -842,106 +942,6 @@ onMounted(async () => {
                   </q-card>
                 </div>
 
-                <datepicker
-                  :readonly="isReadonly"
-                  menu-class-name="modalfix"
-                  for="#dateAllegation"
-                  v-model="formData.disciplinaryDateAllegation"
-                  class="col-xs-12 col-sm-3"
-                  :locale="'th'"
-                  autoApply
-                  borderless
-                  :enableTimePicker="false"
-                  week-start="0"
-                  @update:model-value="changeFormData()"
-                >
-                  <template #year="{ year }">
-                    {{ year + 543 }}
-                  </template>
-                  <template #year-overlay-value="{ value }">
-                    {{ parseInt(value + 543) }}
-                  </template>
-                  <template #trigger>
-                    <q-input
-                      :readonly="isReadonly"
-                      ref="disciplinaryDateAllegationRef"
-                      outlined
-                      dense
-                      class="col-xs-12 col-sm-4"
-                      hide-bottom-space
-                      :model-value="
-                        formData.disciplinaryDateAllegation != null
-                          ? date2Thai(formData.disciplinaryDateAllegation)
-                          : null
-                      "
-                      :label="`${'วันที่รับทราบข้อกล่าวหา'}`"
-                      :rules="[
-                        (val) =>
-                          !!val || `${'กรุณาเลือกวันที่รับทราบข้อกล่าวหา'}`,
-                      ]"
-                      lazy-rules
-                    >
-                      <template v-slot:prepend>
-                        <q-icon
-                          name="event"
-                          class="cursor-pointer"
-                          style="color: var(--q-primary)"
-                        >
-                        </q-icon>
-                      </template>
-                    </q-input>
-                  </template>
-                </datepicker>
-
-                <datepicker
-                  :readonly="isReadonly"
-                  menu-class-name="modalfix"
-                  for="#dateAllegation"
-                  v-model="formData.disciplinaryDateInvestigation"
-                  class="col-xs-12 col-sm-3"
-                  :locale="'th'"
-                  autoApply
-                  borderless
-                  :enableTimePicker="false"
-                  week-start="0"
-                  @update:model-value="changeFormData()"
-                >
-                  <template #year="{ year }">
-                    {{ year + 543 }}
-                  </template>
-                  <template #year-overlay-value="{ value }">
-                    {{ parseInt(value + 543) }}
-                  </template>
-                  <template #trigger>
-                    <q-input
-                      :readonly="isReadonly"
-                      outlined
-                      dense
-                      class="col-xs-12 col-sm-4"
-                      hide-bottom-space
-                      :model-value="
-                        formData.disciplinaryDateInvestigation != null
-                          ? date2Thai(formData.disciplinaryDateInvestigation)
-                          : null
-                      "
-                      :label="`${'วันที่มีคำสั่งให้สอบสวน'}`"
-                      :rules="[
-                        (val) =>
-                          !!val || `${'กรุณาเลือกวันที่มีคำสั่งให้สอบสวน'}`,
-                      ]"
-                      lazy-rules
-                    >
-                      <template v-slot:prepend>
-                        <q-icon
-                          name="event"
-                          class="cursor-pointer"
-                          style="color: var(--q-primary)"
-                        >
-                        </q-icon>
-                      </template>
-                    </q-input>
-                  </template>
-                </datepicker>
 
                 <datepicker
                   :readonly="isReadonly"