Merge branch 'develop' into devTee

# Conflicts:
#	src/api/13_salary/api.salary.ts

src/modules/13_salary/views/salaryEmployeeLists.vue

@@ -52,7 +52,7 @@ function getRound() {
   showLoader();
   http
     .get(
-      config.API.salaryPeriod() +
+      config.API.salaryPeriodActive() +
         `?page=${page.value}&pageSize=${pageSize.value}&keyword=&year=0`
     )
     .then(async (res) => {

src/modules/13_salary/views/salaryEmployeeRate.vue

@@ -81,7 +81,7 @@ const itemMenu = ref<ItemsMenu[]>([
 
 const formFilter = reactive<FormFilter>({
   page: 1,
-  pageSize: 10,
+  pageSize: 100,
   keyword: "",
 });
 const maxPage = ref<number>(1);
@@ -90,6 +90,17 @@ const pagination = ref({
   page: formFilter.page,
   rowsPerPage: formFilter.pageSize,
 });
+const isActive = ref<boolean>(false);
+
+function fetchDataDetail() {
+  http
+    .get(config.API.salaryEmployeeChartByid(salaryEmployeeId.value))
+    .then((res) => {
+      isActive.value = res.data.result.isActive;
+    })
+    .catch((e) => {})
+    .finally(() => {});
+}
 
 function fetchSalalyEmployeeRate() {
   showLoader();
@@ -179,6 +190,7 @@ watch(
 
 onMounted(() => {
   fetchSalalyEmployeeRate();
+  fetchDataDetail();
 });
 </script>
 <template>
@@ -199,7 +211,7 @@ onMounted(() => {
   </div>
   <q-card flat bordered class="q-pa-md">
     <q-toolbar class="text-primary" style="padding: 0px">
-      <q-btn flat round dense icon="add" @click="onClickAdd">
+      <q-btn v-if="!isActive" flat round dense icon="add" @click="onClickAdd">
         <q-tooltip>เพิ่ม </q-tooltip>
       </q-btn>
       <q-space />
@@ -243,13 +255,14 @@ onMounted(() => {
         :rows-per-page-options="[10, 20, 50, 100]"
         :visible-columns="visibleColumns"
         @update:pagination="updatePageSize"
+        v-model:pagination="pagination"
       >
         <template v-slot:header="props">
           <q-tr :props="props">
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
               <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
-            <q-th auto-width />
+            <q-th auto-width v-if="!isActive" />
           </q-tr>
           <q-separator />
         </template>
@@ -264,7 +277,7 @@ onMounted(() => {
               </div>
               <div v-else>{{ col.value ? col.value : "-" }}</div>
             </q-td>
-            <q-td>
+            <q-td v-if="!isActive">
               <q-btn
                 flat
                 dense

src/modules/13_salary/views/salaryLists.vue

@@ -51,7 +51,7 @@ function getRound() {
   showLoader();
   http
     .get(
-      config.API.salaryPeriod() +
+      config.API.salaryPeriodActive() +
         `?page=${page.value}&pageSize=${pageSize.value}&keyword=&year=0`
     )
     .then(async (res) => {