From 891955e26e6a1b5fa67e9f9a277bba50f32e0fce Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 13 Aug 2024 14:49:34 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=20=3D>=20pemission=20?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B8=84=E0=B9=88?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=A5=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=88=E0=B8=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SalaryEmployeeLists/Dashboard.vue         |  2 +-
 .../SalaryEmployeeLists/ProcessStep.vue       | 43 +++++++++++++----
 .../SalaryEmployeeLists/TabMain.vue           | 48 +++++++------------
 .../SalaryEmployeeLists/TableTypeOther.vue    | 25 ++++++----
 .../SalaryEmployeeLists/TableTypePending.vue  | 37 ++++++++------
 .../components/SalaryLists/Dashboard.vue      |  2 +-
 .../components/SalaryLists/TableTypeOther.vue |  2 +-
 .../13_salary/views/salaryEmployeeLists.vue   |  7 +--
 src/modules/13_salary/views/salaryLists.vue   |  1 +
 9 files changed, 96 insertions(+), 71 deletions(-)

diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue
index c1ae16265..3538d50e2 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue
@@ -523,7 +523,7 @@ watch([() => props?.snapShot, () => props.roundFilter], () => {
           </q-tr>
         </template>
         <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
+          <q-tr :props="props">
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
               <div class="table_ellipsis">
                 {{ col.value }}
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/ProcessStep.vue b/src/modules/13_salary/components/SalaryEmployeeLists/ProcessStep.vue
index 9e42eb3d1..5bc5fbc0b 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/ProcessStep.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/ProcessStep.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
 import { useQuasar } from "quasar";
+import { checkPermission } from "@/utils/permissions";
 import axios from "axios";
 
 import http from "@/plugins/http";
@@ -248,7 +249,10 @@ onMounted(() => {
   <div class="row col-12 q-pa-md">
     <q-toolbar style="padding: 0px">
       <q-file
-        v-if="store.statusQuota == 'PENDING'"
+        v-if="
+          store.statusQuota == 'PENDING' &&
+          checkPermission($route)?.attrIsUpdate
+        "
         bg-color="white"
         clearable
         outlined
@@ -274,7 +278,10 @@ onMounted(() => {
       <div>
         <!-- การเจ้าหน้าที่ของหน่วยงานส่งเอกสารให้ ผอ. หน่วยงานตรวจสอบ -->
         <q-btn
-          v-if="store.statusQuota == 'PENDING'"
+          v-if="
+            store.statusQuota == 'PENDING' &&
+            checkPermission($route)?.attrIsUpdate
+          "
           unelevated
           color="public"
           label="ส่งเอกสารให้ ผอ. ตรวจสอบ"
@@ -283,7 +290,10 @@ onMounted(() => {
 
         <!-- ผอ. หน่วยงานทำการยืนยันและส่งให้ สกจ. -->
         <q-btn
-          v-if="store.statusQuota == 'WAITHEAD1'"
+          v-if="
+            store.statusQuota == 'WAITHEAD1' &&
+            checkPermission($route)?.attrIsUpdate
+          "
           unelevated
           color="public"
           label="ยืนยันและส่งเอกสารให้ สกจ."
@@ -292,7 +302,10 @@ onMounted(() => {
 
         <!-- สกจ. ตรวจสอบเอกสารและข้อมูลรายการเงินเดือนที่แต่ละหน่วยงานส่งมา ไม่มีปรับโควต้า -->
         <q-btn
-          v-if="store.statusQuota == 'WAITOWNER1'"
+          v-if="
+            store.statusQuota == 'WAITOWNER1' &&
+            checkPermission($route)?.attrIsUpdate
+          "
           unelevated
           color="green"
           label="ยืนยันการตรวจสอบ"
@@ -301,7 +314,10 @@ onMounted(() => {
 
         <!-- สกจ. ตรวจสอบเอกสารและข้อมูลรายการเงินเดือนที่แต่ละหน่วยงานส่งมา มีปรับโควต้า -->
         <q-btn
-          v-if="store.statusQuota == 'WAITOWNER1'"
+          v-if="
+            store.statusQuota == 'WAITOWNER1' &&
+            checkPermission($route)?.attrIsUpdate
+          "
           class="q-ml-sm"
           unelevated
           color="warning"
@@ -311,7 +327,10 @@ onMounted(() => {
 
         <!-- ผอ.หน่วยงานส่งคำแนะนำให้การเจ้าหน้าที่หน่วยงาน -->
         <q-btn
-          v-if="store.statusQuota == 'WAITHEAD2'"
+          v-if="
+            store.statusQuota == 'WAITHEAD2' &&
+            checkPermission($route)?.attrIsUpdate
+          "
           unelevated
           color="public"
           label="ส่งคำแนะนำให้การเจ้าหน้าที่หน่วยงาน"
@@ -321,13 +340,19 @@ onMounted(() => {
         />
 
         <q-btn
-          v-if="store.statusQuota == 'WAITOFFICER2'"
+          v-if="
+            store.statusQuota == 'WAITOFFICER2' &&
+            checkPermission($route)?.attrIsUpdate
+          "
           unelevated
           color="public"
           label="ส่งไปออกคำสั่ง"
         />
         <q-btn
-          v-if="store.statusQuota == 'REPORT'"
+          v-if="
+            store.statusQuota == 'REPORT' &&
+            checkPermission($route)?.attrIsUpdate
+          "
           unelevated
           color="public"
           disable
@@ -348,6 +373,7 @@ onMounted(() => {
               <div class="row">
                 <div>
                   <q-btn
+                    v-if="checkPermission($route)?.attrIsGet"
                     dense
                     flat
                     round
@@ -361,6 +387,7 @@ onMounted(() => {
                 </div>
                 <div>
                   <q-btn
+                    v-if="checkPermission($route)?.attrIsDelete"
                     dense
                     flat
                     round
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue
index 61acfb222..b524faeb1 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref, onMounted, reactive, computed } from "vue";
 import { useQuasar } from "quasar";
+import { checkPermission } from "@/utils/permissions";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import genReportXLSX from "@/plugins/genreportxlsx";
@@ -250,6 +251,7 @@ function fetchDataQuota(id: string) {
  * @param id กลุ่ม
  */
 function fetchDataPeriod(id: string) {
+  showLoader();
   rows.value = [];
   let formData = {
     page: formFilter.page.toString(),
@@ -273,6 +275,11 @@ function fetchDataPeriod(id: string) {
     })
     .catch((err) => {
       messageError($q, err);
+    })
+    .finally(() => {
+      setTimeout(() => {
+        hideLoader();
+      }, 1000);
     });
 }
 
@@ -356,41 +363,13 @@ onMounted(() => {
 });
 
 const isRetire = ref<boolean | string>(false);
-const updateIsShowRetire = async () => {
-  isRetire.value = await !isRetire.value;
+const updateIsShowRetire = () => {
+  isRetire.value = !isRetire.value;
   fetchDataPeriodNew();
 };
 </script>
 
 <template>
-  <!-- Tab กลุ่ม -->
-  <!-- <q-tabs
-    v-model="store.tabGroup"
-    dense
-    class="text-grey"
-    active-color="primary"
-    active-class="bg-teal-1"
-    indicator-color="primary"
-    align="left"
-  >
-    <div
-      v-for="(item, index) in itemsTabGroup"
-      :key="index"
-      @click="changeTabGroup"
-    >
-      <q-tab :name="item.name" :label="item.lable" />
-    </div>
-
-    <q-space />
-    <q-btn
-      dense
-      flat
-      icon="info"
-      class="q-mr-sm"
-      label="หลักเกณฑ์การพิจารณาเลื่อนขั้นเงินข้าราชการ"
-      @click="() => (modalDialogInfoCriteria = true)"
-    />
-  </q-tabs> -->
   <!-- <q-separator /> -->
   <q-tab-panels v-model="store.tabGroup" animated class="bg-grey-1">
     <q-tab-panel
@@ -403,7 +382,9 @@ const updateIsShowRetire = async () => {
       <div class="row col-12 q-pa-md" v-if="store.roundMainCode !== 'SPECIAL'">
         <div
           :class="`row col-12 ${
-            store.roundMainCode === 'APR' ? `q-col-gutter-md` : `q-gutter-md`
+            store.roundMainCode === 'APR'
+              ? `q-col-gutter-md`
+              : `q-col-gutter-md`
           } items-start`"
         >
           <div
@@ -435,7 +416,10 @@ const updateIsShowRetire = async () => {
           </div>
           <div
             class="row col justify-end self-center"
-            v-if="store.roundMainCode !== 'SPECIAL'"
+            v-if="
+              store.roundMainCode !== 'SPECIAL' &&
+              checkPermission($route)?.attrIsGet
+            "
           >
             <q-btn-dropdown color="blue-5" label="ดาวน์โหลด">
               <q-list>
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue
index 16b3d80ff..702f7a278 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref, watch, computed } from "vue";
 import { useQuasar } from "quasar";
+import { checkPermission } from "@/utils/permissions";
 import config from "@/app.config";
 import http from "@/plugins/http";
 
@@ -300,7 +301,7 @@ watch(
 <template>
   <q-toolbar class="text-primary" style="padding: 0px">
     <q-btn
-      v-if="!store.isClosedRound"
+      v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
       flat
       round
       dense
@@ -375,21 +376,28 @@ watch(
       </q-tr>
     </template>
     <template v-slot:body="props">
-      <q-tr :props="props" class="cursor-pointer">
+      <q-tr :props="props">
         <q-td>
           <q-btn
-            v-if="!store.isClosedRound"
+            v-if="
+              !store.isClosedRound &&
+              (checkPermission($route)?.attrIsUpdate ||
+                checkPermission($route)?.attrIsDelete)
+            "
             flat
             dense
-            icon="mdi-dots-vertical"
-            class="q-pa-none q-ml-xs"
-            color="grey-13"
-            size="12px"
+            color="secondary"
+            icon="mdi-dots-horizontal-circle-outline"
+            round
           >
             <q-menu>
               <q-list dense style="min-width: 150px">
                 <q-item
-                  v-for="(item, index) in store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'properties')"
+                  v-for="(item, index) in checkPermission($route)?.attrIsUpdate && !checkPermission($route)?.attrIsDelete 
+                  ? store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'properties' && x.type !== 'delete')
+                  : !checkPermission($route)?.attrIsUpdate && checkPermission($route)?.attrIsDelete 
+                  ? store.itemMenu.filter((x:any)=> x.type === 'delete') 
+                  : store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'properties' )"
                   :key="index"
                   clickable
                   v-close-popup
@@ -500,7 +508,6 @@ watch(
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue
index c26b59beb..810ffeb99 100644
--- a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
+import { checkPermission } from "@/utils/permissions";
 
 /** importType*/
 import type { QTableProps } from "quasar";
@@ -45,7 +46,6 @@ const props = defineProps({
 
 /** ข้อมูล Table*/
 const columns = ref<QTableProps["columns"]>([
-
   {
     name: "no",
     align: "left",
@@ -175,7 +175,6 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-
 ]);
 const visibleColumns = ref<string[]>([
   "no",
@@ -317,7 +316,7 @@ function onClickViewInfo(type: string, id: string) {
 <template>
   <q-toolbar class="text-primary" style="padding: 0px">
     <q-btn
-      v-if="!store.isClosedRound"
+      v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
       flat
       round
       dense
@@ -350,7 +349,9 @@ function onClickViewInfo(type: string, id: string) {
       :display-value="$q.lang.table.columns"
       emit-value
       map-options
-      :options="columns"
+      :options="!checkPermission($route)?.attrIsGet 
+      ? columns?.filter((col:any) =>  col.name !== 'posSalary' && col.name !== 'discipline' && col.name !== 'leave' ) 
+      : columns"
       option-value="name"
       options-cover
       style="min-width: 150px"
@@ -359,7 +360,9 @@ function onClickViewInfo(type: string, id: string) {
   </q-toolbar>
   <d-table
     ref="table"
-    :columns="columns"
+    :columns="!checkPermission($route)?.attrIsGet 
+    ? columns?.filter((col:any) =>  col.name !== 'posSalary' && col.name !== 'discipline' && col.name !== 'leave' ) 
+    : columns"
     :rows="props.rows"
     row-key="id"
     flat
@@ -376,25 +379,31 @@ function onClickViewInfo(type: string, id: string) {
         <q-th v-for="col in props.cols" :key="col.name" :props="props">
           <span class="text-weight-medium">{{ col.label }}</span>
         </q-th>
-
       </q-tr>
     </template>
     <template v-slot:body="props">
-      <q-tr :props="props" class="cursor-pointer">
+      <q-tr :props="props" >
         <q-td>
           <q-btn
-            v-if="!store.isClosedRound"
+            v-if="
+              !store.isClosedRound &&
+              (checkPermission($route)?.attrIsUpdate ||
+                checkPermission($route)?.attrIsDelete)
+            "
             flat
             dense
-            icon="mdi-dots-vertical"
-            class="q-pa-none q-ml-xs"
-            color="grey-13"
-            size="12px"
+            color="secondary"
+            icon="mdi-dots-horizontal-circle-outline"
+            round
           >
             <q-menu>
               <q-list dense style="min-width: 150px">
                 <q-item
-                  v-for="(item, index) in store.itemMenu.filter((x:any)=>x.type !== 'moveGroup')"
+                  v-for="(item, index) in  checkPermission($route)?.attrIsUpdate &&!checkPermission($route)?.attrIsDelete
+                  ? store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'delete')
+                  : !checkPermission($route)?.attrIsUpdate && checkPermission($route)?.attrIsDelete
+                  ? store.itemMenu.filter((x:any)=> x.type === 'delete') 
+                  : store.itemMenu.filter((x:any)=>x.type !== 'moveGroup')"
                   :key="index"
                   clickable
                   v-close-popup
@@ -487,6 +496,7 @@ function onClickViewInfo(type: string, id: string) {
             "
           >
             <q-btn
+              v-if="checkPermission($route)?.attrIsGet"
               flat
               dense
               icon="info"
@@ -502,7 +512,6 @@ function onClickViewInfo(type: string, id: string) {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:pagination="scope">
diff --git a/src/modules/13_salary/components/SalaryLists/Dashboard.vue b/src/modules/13_salary/components/SalaryLists/Dashboard.vue
index 7a8aadce1..d47b5c4d7 100644
--- a/src/modules/13_salary/components/SalaryLists/Dashboard.vue
+++ b/src/modules/13_salary/components/SalaryLists/Dashboard.vue
@@ -575,7 +575,7 @@ watch([() => props?.snapShot, () => props.roundFilter], () => {
           </q-tr>
         </template>
         <template v-slot:body="props">
-          <q-tr :props="props" class="cursor-pointer">
+          <q-tr :props="props">
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
               <div class="table_ellipsis">
                 {{ col.value }}
diff --git a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
index 72b04d102..8b8f65bbc 100644
--- a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
+++ b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { ref, watch, computed } from "vue";
 import { useQuasar } from "quasar";
+import { checkPermission } from "@/utils/permissions";
 import config from "@/app.config";
 import http from "@/plugins/http";
-import { checkPermission } from "@/utils/permissions";
 
 /** importType*/
 import type { QTableProps } from "quasar";
diff --git a/src/modules/13_salary/views/salaryEmployeeLists.vue b/src/modules/13_salary/views/salaryEmployeeLists.vue
index e3e6c7220..1156c5bd0 100644
--- a/src/modules/13_salary/views/salaryEmployeeLists.vue
+++ b/src/modules/13_salary/views/salaryEmployeeLists.vue
@@ -53,8 +53,8 @@ const nextPage = ref<number>(1);
 
 /**function เรียกข้อมูลรอบการขึ้นค่าจ้าง*/
 function getRound() {
-  isDisable.value = false;
   showLoader();
+  isDisable.value = false;
   http
     .get(
       config.API.salaryPeriodActive(year.value.toString()) +
@@ -100,9 +100,6 @@ function getRound() {
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -238,7 +235,7 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) {
       .finally(() => {
         setTimeout(() => {
           hideLoader();
-        }, 800);
+        }, 1500);
       });
   }
 }
diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index 1b593eb2a..45e9834db 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -50,6 +50,7 @@ const lastPage = ref<number>(0);
 
 /**function เรียกข้อมูลรอบการขึ้นเงินเดือน*/
 function getRound() {
+  showLoader();
   isDisable.value = false;
   http
     .get(