Merge branch 'develop' into devTee

src/modules/13_salary/components/04_salaryLists/TabMain.vue

@@ -488,8 +488,8 @@ const updateIsShowRetire = async () => {
       @click="() => (modalDialogInfoCriteria = true)"
     />
   </q-tabs>
-  <q-separator />
+  <!-- <q-separator /> -->
-  <q-tab-panels v-model="store.tabGroup" animated class="bg-grey-1 q-pt-md">
+  <q-tab-panels v-model="store.tabGroup" animated class="bg-grey-1">
     <q-tab-panel
       style="padding: 0px"
       v-for="(item, index) in itemsTabGroup"

src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue

@@ -442,7 +442,7 @@ onMounted(() => {
           </div>
         </div>
       </div>
-      <q-separator />
+      <!-- <q-separator /> -->
 
       <!-- Tab ขั้น -->
       <q-card flat bordered>

src/modules/13_salary/views/04_salaryLists.vue

@@ -386,6 +386,9 @@ onMounted(async () => {
     <div class="toptitle text-dark row items-center q-py-xs">
       รายการเลื่อนเงินเดือนข้าราชการ ฯ
     </div>
+  </div>
+
+  <div class="row items-center">
     <q-space />
     <div class="row q-col-gutter-sm items-center q-py-xs">
       <div>

src/modules/13_salary/views/05_salaryListsEmployee.vue

@@ -374,7 +374,7 @@ async function fetchCheckisOfficer() {
     });
 }
 
-onMounted(async() => {
+onMounted(async () => {
   await Promise.all([getRound(), fetchCheckisOfficer()]);
 });
 </script>
@@ -384,6 +384,9 @@ onMounted(async() => {
     <div class="toptitle text-dark row items-center q-py-xs">
       รายการเลื่อนค่าจ้างลูกจ้างประจำ
     </div>
+  </div>
+
+  <div class="row items-center">
     <q-space />
     <div class="row q-col-gutter-sm items-center q-py-xs">
       <div>