เลื่อนเงืนเดือน

src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue

@@ -87,20 +87,20 @@ const columns = ref<QTableProps["columns"]>([
   },
 
   {
-    name: "postionTypeName",
+    name: "positionType",
     align: "left",
     label: "ตำแหน่งประเภท",
     sortable: true,
-    field: "postionTypeName",
+    field: "positionType",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
   {
-    name: "positionLevelName",
+    name: "positionLevel",
     align: "left",
     label: "ระดับ",
     sortable: true,
-    field: "positionLevelName",
+    field: "positionLevel",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -130,8 +130,8 @@ const visibleColumns = ref<string[]>([
   "positionSalaryAmount",
   "mouthSalaryAmount",
   "posNo",
-  "postionTypeName",
+  "positionType",
-  "positionLevelName",
+  "positionLevel",
   "templateDoc",
   "refCommandNo",
 ]);
@@ -247,7 +247,9 @@ function fetchType() {
 }
 
 async function updateSelectType(val: string, status: boolean = false) {
-  const listLevel = await dataLevel.value.find((e: any) => e.id === val);
+  const listLevel = await dataLevel.value.find(
+    (e: any) => e.posTypeName === val
+  );
   if (listLevel) {
     posLevelOptionMain.value = listLevel.posLevels.map((e: any) => ({
       id: e.id,
@@ -630,7 +632,15 @@ onMounted(() => {
               </div>
 
               <div class="col-xs-6 col-sm-6 col-md-4">
-                <q-select
+                <q-input
+                  outlined
+                  dense
+                  lazy-rules
+                  v-model="formDataSalary.positionLine"
+                  hide-bottom-space
+                  :label="`${'สายงาน'}`"
+                />
+                <!-- <q-select
                   outlined
                   dense
                   lazy-rules
@@ -648,7 +658,7 @@ onMounted(() => {
                   @filter="(inputValue: any,
                         doneFn: Function) => filterSelector(inputValue, doneFn, 'positionLine'
                         )"
-                />
+                /> -->
               </div>
 
               <div class="col-xs-6 col-sm-6 col-md-4">
@@ -687,7 +697,7 @@ onMounted(() => {
                   map-options
                   option-label="name"
                   :options="posTypeOptions"
-                  option-value="id"
+                  option-value="name"
                   hide-bottom-space
                   use-input
                   input-debounce="0"
@@ -713,7 +723,7 @@ onMounted(() => {
                   map-options
                   option-label="name"
                   :options="posLevelOption"
-                  option-value="id"
+                  option-value="name"
                   hide-bottom-space
                   use-input
                   input-debounce="0"

src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted, reactive, computed } from "vue";
+import { ref, watch, onMounted, reactive, computed } from "vue";
 import type { QTableProps } from "quasar";
 
 import { useSalaryEmployeeListSDataStore } from "@/modules/13_salary/store/SalaryEmployeeListsStore";
@@ -238,7 +238,6 @@ const columns = computed(() => {
       : [];
   return columnsss;
 });
-
 const visibleColumns = ref<string[]>(
   store.roundMainCode === "APR"
     ? ["org", "total", "fifteenPercent", "chosen", "remaining", "totalBackup"]
@@ -256,22 +255,22 @@ const visibleColumns = ref<string[]>(
     : []
 );
 
-const gruup = ref<string>("กลุ่ม 1");
+const isLoad = ref<boolean>(true);
-const options = ref(["ทั้งหมด", "กลุ่ม 1", "กลุ่ม 2"]);
+watch(
+  () => store.roundMainCode,
+  () => {
+    isLoad.value = false;
+    setTimeout(() => {
+      isLoad.value = true;
+    }, 200);
+  }
+);
 </script>
 
 <template>
   <!-- Card โควต้า -->
-  <q-toolbar class="q-pa-md">
+
-    <q-select
+  <div v-if="isLoad">
-      dense
-      outlined
-      v-model="gruup"
-      :options="options"
-      label="กลุ่ม"
-      style="width: 150px"
-    />
-  </q-toolbar>
     <div class="row col-12 q-pa-md bg-grey-2">
       <div class="row col-12 q-col-gutter-sm">
         <div
@@ -327,12 +326,11 @@ const options = ref(["ทั้งหมด", "กลุ่ม 1", "กลุ่
         ref="table"
         :columns="columns"
         :rows="rows"
-      row-key="subject"
+        row-key="id"
         flat
         bordered
         dense
         class="custom-header-table"
-      :visible-columns="visibleColumns"
       >
         <template v-slot:header="props">
           <q-tr :props="props">
@@ -352,6 +350,7 @@ const options = ref(["ทั้งหมด", "กลุ่ม 1", "กลุ่
         </template>
       </d-table>
     </div>
+  </div>
 </template>
 
 <style scoped></style>

src/modules/13_salary/components/SalaryLists/Dashboard.vue

@@ -256,7 +256,7 @@ const visibleColumns = ref<string[]>(
     : []
 );
 
-const gruup = ref<string>("กลุ่ม 1");
+const gruup = ref<string>("ทั้งหมด");
 const options = ref(["ทั้งหมด", "กลุ่ม 1", "กลุ่ม 2"]);
 </script>
 
@@ -327,12 +327,10 @@ const options = ref(["ทั้งหมด", "กลุ่ม 1", "กลุ่
       ref="table"
       :columns="columns"
       :rows="rows"
-      row-key="subject"
+      row-key="id"
       flat
       bordered
       dense
-      class="custom-header-table"
-      :visible-columns="visibleColumns"
     >
       <template v-slot:header="props">
         <q-tr :props="props">

src/modules/13_salary/components/SalaryLists/TabMain.vue

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

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

@@ -206,6 +206,7 @@ async function getAgencyPosition(id: string) {
  * @param snap id รอบ
  */
 function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
+  if (rootId !== "ALL") {
     showLoader();
     isLoad.value = false;
     const body = {
@@ -230,6 +231,7 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
           hideLoader();
         }, 800);
       });
+  }
 }
 
 /** function เปลี่ยนรอบการขั้นเงินเดือน*/
@@ -238,9 +240,14 @@ async function onChangeRound() {
   store.isClosedRound = roundFilter.value.isClose;
 
   await getSnap(roundFilter.value.shortCode);
-  await getAgency(roundFilter.value.revisionId);
+  // await getAgency(roundFilter.value.revisionId);
-  await getAgencyPosition(roundFilter.value.revisionId);
+  // await getAgencyPosition(roundFilter.value.revisionId);
   if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
+    fetchSalalyPeriod(
+      agencyFilter.value,
+      roundFilter.value.id,
+      snapFilter.value
+    );
     store.tabType = "PENDING";
     store.roundMainCode = roundFilter.value.shortCode;
   } else {

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

@@ -206,6 +206,7 @@ async function getAgencyPosition(id: string) {
  * @param snap id รอบ
  */
 function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
+  if (rootId !== "ALL") {
     showLoader();
     isLoad.value = false;
     const body = {
@@ -218,6 +219,9 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
       .post(config.API.salaryListPeriodLatest, body)
       .then(async (res) => {
         const data = res.data.result;
+
+        console.log(roundFilter.value.shortCode);
+
         if (roundFilter.value.shortCode !== "SPECIAL") {
           if (Object.values(data).includes(null)) {
             isLoad.value = false;
@@ -240,6 +244,7 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
           hideLoader();
         }, 800);
       });
+  }
 }
 
 /** function เปลี่ยนรอบการขั้นเงินเดือน*/
@@ -249,15 +254,15 @@ async function onChangeRound() {
   if (roundFilter.value.shortCode === "SPECIAL") {
     store.tabGroup = "group1";
   }
-  await getSnap(roundFilter.value.shortCode);
+  getSnap(roundFilter.value.shortCode);
-  await getAgency(roundFilter.value.revisionId);
+  // await getAgency(roundFilter.value.revisionId);
-  await getAgencyPosition(roundFilter.value.revisionId);
+  // await getAgencyPosition(roundFilter.value.revisionId);
   if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
-    // await fetchSalalyPeriod(
+    fetchSalalyPeriod(
-    //   agencyFilter.value,
+      agencyFilter.value,
-    //   roundFilter.value.id,
+      roundFilter.value.id,
-    //   snapFilter.value
+      snapFilter.value
-    // );
+    );
     store.tabType = "PENDING";
     store.roundMainCode = roundFilter.value.shortCode;
     store.roundYear = roundFilter.value.year;