Merge branch 'develop' into devTee

src/interface/request/main/main.ts

@@ -452,7 +452,7 @@ const menuList = readonly<any[]>([
         role: "discipline",
       },
       {
-        key: 11.6,
+        key: 11.5,
         label: "รายงาน",
         path: "disciplineReport",
         role: "discipline",
@@ -460,7 +460,7 @@ const menuList = readonly<any[]>([
       {
         label: "ข้อมูลพื้นฐาน",
         path: "",
-        key: 11.6,
+        key: 11.7,
         role: "discipline",
         children: [
           {

src/modules/09_leave/components/1_Work/DialogDetail.vue

@@ -167,7 +167,7 @@ watch(
                   </q-item-section>
                 </q-item>
               </div>
-              <div class="col-2">
+              <div class="col-2" v-if="props.typeTab === 'time-record'">
                 <q-item>
                   <q-item-section>
                     <q-item-label class="text-grey-8"
@@ -177,7 +177,7 @@ watch(
                   </q-item-section>
                 </q-item>
               </div>
-              <div class="col-2">
+              <div class="col-2" v-if="props.typeTab === 'time-record'">
                 <q-item>
                   <q-item-section>
                     <q-item-label class="text-grey-8"

src/modules/09_leave/components/1_Work/TableList.vue

@@ -97,6 +97,7 @@ watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => {
     dense
     class="custom-header-table"
     :visible-columns="workStore.visibleColumns"
+    :rows-per-page-options="[10, 25, 50, 100]"
     v-model:pagination="pagination"
   >
     <template v-slot:header="props">