Merge branch 'develop' into devTee

src/modules/21_report/views/02_reportRegistry.vue

@@ -1346,7 +1346,6 @@ watch(
                       <div class="text-grey-8 text-caption">ช่วงเวลาบรรจุ</div>
                       <div class="col-12">
                         <datepicker
-                          menu-class-name="modalfix"
                           v-model="dateStart"
                           :locale="'th'"
                           autoApply
@@ -1392,7 +1391,6 @@ watch(
                       </div>
                       <div class="col-12">
                         <datepicker
-                          menu-class-name="modalfix"
                           v-model="dateEnd"
                           :locale="'th'"
                           autoApply

src/modules/21_report/views/03_reportDevelopment.vue

@@ -366,7 +366,6 @@ onMounted(async () => {
                   />
                   <div class="col-12 q-px-sm q-pb-xs" v-if="typeReport">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="year"
                       :locale="'th'"
                       autoApply

src/modules/21_report/views/04_reportEvaluate.vue

@@ -63,8 +63,7 @@ async function fetchReport() {
   loadingBtn.value = true;
   await http
     .get(
-      config.API.evaluationReport +
+      config.API.evaluationReport + `?year=${year.value}&rootId=${nodeId.value}`
-        `?year=${year.value}&rootId=${nodeId.value}`
     )
     .then(async (res) => {
       const data = await res.data.result;
@@ -320,7 +319,6 @@ onMounted(() => {
                   <q-separator />
                   <div class="col-12 q-px-sm">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="year"
                       :locale="'th'"
                       autoApply

src/modules/21_report/views/05_reportSalary.vue

@@ -391,7 +391,6 @@ onMounted(() => {
                 <q-card-section class="q-pa-none">
                   <div class="col-12 q-px-sm">
                     <datepicker
-                      menu-class-name="modalfix"
                       v-model="year"
                       :locale="'th'"
                       autoApply