diff --git a/src/modules/09_leave/views/06_ReportMain.vue b/src/modules/09_leave/views/06_ReportMain.vue
index bc10b0d54..e248b24c8 100644
--- a/src/modules/09_leave/views/06_ReportMain.vue
+++ b/src/modules/09_leave/views/06_ReportMain.vue
@@ -624,6 +624,7 @@ onMounted(() => {
                     <div class="row q-col-gutter-y-xs">
                       <div class="text-grey-8 text-caption">เลือกช่วงเวลา</div>
                       <div class="col-12">
+
                         <q-select
                           class="bg-white"
                           dense
@@ -641,18 +642,16 @@ onMounted(() => {
                           map-options
                           option-label="name"
                           option-value="id"
-                          @update:model-value="(value:any)=>(updateValue(value),updateLeaveday)"
+                          @update:model-value="(value:any)=>(updateValue(value),updateLeaveday())"
                         >
                         </q-select>
                       </div>
                       <div
                         class="col-12"
                         v-if="
-                          leaveType !== 'DAY' &&
-                          leaveType !== 'MONTH' &&
-                          leaveType !== 'WEEKLY' &&
                           yearType !== 'MONTH' &&
-                          yearType !== 'WEEKLY'
+                          typeReport !== '3' &&
+                          typeReport !== '4'
                         "
                       >
                         <datepicker
@@ -690,11 +689,9 @@ onMounted(() => {
                       <div
                         class="col-12"
                         v-if="
-                          leaveType !== 'DAY' &&
-                          leaveType !== 'MONTH' &&
-                          leaveType !== 'WEEKLY' &&
                           yearType !== 'MONTH' &&
-                          yearType !== 'WEEKLY'
+                          typeReport !== '3' &&
+                          typeReport !== '4'
                         "
                       >
                         <datepicker
@@ -736,11 +733,9 @@ onMounted(() => {
                       <div
                         class="col-12"
                         v-if="
-                          leaveType !== 'DAY' &&
-                          leaveType !== 'MONTH' &&
-                          leaveType !== 'WEEKLY' &&
                           yearType !== 'MONTH' &&
-                          yearType !== 'WEEKLY'
+                          typeReport !== '3' &&
+                          typeReport !== '4'
                         "
                       >
                         <datepicker
@@ -779,7 +774,12 @@ onMounted(() => {
                       </div>
                       <div
                         class="col-12"
-                        v-if="leaveType == 'MONTH' && yearType == 'MONTH'"
+                        v-if="
+                          (typeReport == '1' && yearType == 'MONTH') ||
+                          (typeReport == '2' && yearType == 'MONTH') ||
+                          (typeReport == '3' && leaveType == 'MONTH') ||
+                          (typeReport == '4' && leaveType == 'MONTH')
+                        "
                       >
                         <datepicker
                           v-model="dateMonth"
@@ -814,7 +814,12 @@ onMounted(() => {
                       </div>
                       <div
                         class="col-12"
-                        v-if="leaveType == 'WEEKLY' && yearType == 'WEEKLY'"
+                        v-if="
+                          (typeReport == '1' && yearType == 'WEEKLY') ||
+                          (typeReport == '2' && yearType == 'WEEKLY') ||
+                          (typeReport == '3' && leaveType == 'WEEKLY') ||
+                          (typeReport == '4' && leaveType == 'WEEKLY')
+                        "
                       >
                         <datepicker
                           v-model="dateWeek"
@@ -846,7 +851,13 @@ onMounted(() => {
                           </template>
                         </datepicker>
                       </div>
-                      <div class="col-12" v-if="leaveType == 'DAY'">
+                      <div
+                        class="col-12"
+                        v-if="
+                          (leaveType == 'DAY' && typeReport == '3') ||
+                          (leaveType == 'DAY' && typeReport == '4')
+                        "
+                      >
                         <datepicker
                           menu-class-name="modalfix"
                           v-model="date"