รายการเลื่อนเงินเดือนข้าราชการ ฯ => ปรับ API Report

src/modules/01_metadataNew/components/Indicators/indicatorByPlan/IndicatorByPlan.vue

@@ -1,4 +1,3 @@
-divdivdivdivdivdivdiv
 <script setup lang="ts">
 import { ref, reactive, onMounted } from "vue";
 import { QForm, useQuasar } from "quasar";
@@ -273,6 +272,7 @@ onMounted(() => {
 </script>
 
 <template>
+  
   <q-card>
     <q-form @submit.prevent greedy @validation-success="onSubmit()">
       <q-card-section>

src/modules/01_metadataNew/views/indicatorByPlan.vue

@@ -49,6 +49,7 @@ const filterMain = ref<string>("");
 const visibleColumns = ref<string[]>(["including", "includingName"]);
 
 const roundOp = ref<DataOption[]>([
+  { id: "", name: "ทั้งหมด" },
   { id: "APR", name: "รอบเมษายน" },
   { id: "OCT", name: "รอบตุลาคม" },
 ]);
@@ -66,6 +67,7 @@ const nodeData = reactive<any>({
 });
 
 function fetchList() {
+  if (nodeData.nodeId) {
     showLoader();
     http
       .post(config.API.kpiPlan + `/search`, {
@@ -89,6 +91,7 @@ function fetchList() {
       .finally(() => {
         hideLoader();
       });
+  }
 }
 
 function onClickAddOrView(status: boolean = false, id: string = "") {
@@ -187,9 +190,8 @@ function onClickHistory(id: string) {
     });
 }
 
-onMounted(async () => {
+onMounted(() => {
-  await fetchActive();
+  fetchActive();
-  // await fetchList();
 });
 </script>
 

src/modules/01_metadataNew/views/indicatorByRole.vue

@@ -25,24 +25,14 @@ const router = useRouter();
 const { showLoader, hideLoader, dialogRemove, success, messageError } =
   useCounterMixin();
 
-const positionOp = ref<DataOption[]>([]);
+const positionOp = ref<DataOption[]>([{ id: "", name: "ทั้งหมด" }]);
-const positionMainOp = ref<DataOption[]>([]);
+const positionMainOp = ref<DataOption[]>([{ id: "", name: "ทั้งหมด" }]);
 
 const maxPage = ref<number>(1);
-const totalList = ref<number>(1); //จำนวนข้อมูลรายการ
 
 /** หัวตาราง */
 const rows = ref<any>([]);
 const columns = ref<QTableProps["columns"]>([
-  // {
-  //   name: "no",
-  //   align: "left",
-  //   label: "ลำดับตัวชี้วัด ",
-  //   sortable: true,
-  //   field: "no",
-  //   headerStyle: "font-size: 14px",
-  //   style: "font-size: 14px",
-  // },
   {
     name: "including",
     align: "left",
@@ -79,6 +69,7 @@ const pagination = ref({
 
 /** Option  รอบการประเมิน*/
 const roundOp = ref<DataOption[]>([
+  { id: "", name: "ทั้งหมด" },
   { id: "APR", name: "รอบเมษายน" },
   { id: "OCT", name: "รอบตุลาคม" },
 ]);
@@ -173,6 +164,7 @@ function getOptions() {
     .then((res) => {
       const dataOp = res.data.result;
       const uniqueNames = new Set();
+
       const filteredData = dataOp
         .filter((item: any) => {
           if (!uniqueNames.has(item.positionName)) {
@@ -186,7 +178,8 @@ function getOptions() {
           name: item.positionName,
         }));
 
-      positionMainOp.value = filteredData;
+      positionMainOp.value.push(...filteredData);
+      positionOp.value.push(...filteredData);
     })
     .catch((err) => {
       messageError($q, err);
@@ -196,19 +189,6 @@ function getOptions() {
     });
 }
 
-function statusTothai(val: string) {
-  switch (val) {
-    case "SPECIAL":
-      return "รอบพิเศษ";
-    case "APR":
-      return "รอบเมษายน";
-    case "OCT":
-      return "รอบตุลาคม";
-    default:
-      return "-";
-  }
-}
-
 function setModel(val: string) {
   formFilter.position = val;
 }
@@ -245,11 +225,10 @@ onMounted(async () => {
     รายการตัวชี้วัดตามตำแหน่ง
   </div>
   <q-card flat bordered class="q-pa-md">
-
     <div class="row q-gutter-sm no-wrap q-mb-sm">
       <q-select
         dense
-          :model-value="formFilter.position"
+        v-model="formFilter.position"
         label="ตำแหน่ง"
         outlined
         emit-value
@@ -261,21 +240,19 @@ onMounted(async () => {
         option-value="id"
         :options="positionOp"
         use-input
-          @input-value="setModel"
         @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn) "
-          @update:model-value="fetchList"
+        @update:model-value="(formFilter.page = 1), fetchList()"
       >
         <template v-slot:no-option>
           <q-item>
             <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
           </q-item>
         </template>
-          <template v-if="formFilter.position" v-slot:append>
+        <template v-if="formFilter.position !== ''" v-slot:append>
           <q-icon
             name="cancel"
             @click.stop.prevent="
-                formFilter.position = '';
+              (formFilter.position = ''), (formFilter.page = 1), fetchList()
-                fetchList();
             "
             class="cursor-pointer"
           />
@@ -338,13 +315,15 @@ onMounted(async () => {
         option-value="id"
         emit-value
         map-options
-          @update:model-value="fetchList"
+        @update:model-value="(formFilter.page = 1), fetchList()"
         style="width: 160px"
       >
-          <template v-if="formFilter.round" v-slot:append>
+        <template v-if="formFilter.round !== ''" v-slot:append>
           <q-icon
             name="cancel"
-              @click.stop.prevent="(formFilter.round = ''), fetchList()"
+            @click.stop.prevent="
+              (formFilter.round = ''), (formFilter.page = 1), fetchList()
+            "
             class="cursor-pointer"
           />
         </template>
@@ -370,7 +349,7 @@ onMounted(async () => {
         outlined
         debounce="300"
         placeholder="ค้นหา"
-          @keyup.enter="fetchList()"
+        @keyup.enter="(formFilter.page = 1), fetchList()"
       >
         <template v-slot:append>
           <q-icon v-if="formFilter.keyword == ''" name="search" />
@@ -399,7 +378,6 @@ onMounted(async () => {
       />
     </div>
 
-
     <div class="col-12">
       <d-table
         for="table"

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

@@ -332,14 +332,21 @@ function onClickDownload(data: DataOption) {
       });
   } else {
     if (props.rootId && props.periodId) {
-      http
+      const url = config.API.salaryReportListsByid(
-        .get(
-          config.API.salaryReportListsByid(
         data.id,
         props.rootId,
         props.periodId
-          )
+      );
-        )
+
+      const isGovernmentId =
+        data.id === "gov-01" ||
+        data.id === "gov-04" ||
+        data.id === "gov-05" ||
+        data.id === "gov-07";
+
+      const finalUrl = isGovernmentId ? `${url}/${store.tabGroup}` : url;
+      http
+        .get(finalUrl)
         .then((res) => {
           const dataList = res.data.result;
           genReportXLSX(dataList, data.name);