From 5bfa2b7ff0cc9a9315a5d1d819dc9b1ef6f95ab8 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Wed, 25 Sep 2024 15:04:01 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AA=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/2_Leave/DetailLeave.vue        | 30 ++++++++++++++-----
 .../components/2_Leave/DetailLeaveReject.vue  | 14 ++++++---
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
index 18efeda8a..2e28bb79b 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
@@ -8,14 +8,14 @@ import config from "@/app.config";
 import genReport from "@/plugins/genreport";
 import { useCounterMixin } from "@/stores/mixin";
 import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
-
-import DialogReason from "@/components/Dialogs/PopupReason.vue";
+import { checkPermission } from "@/utils/permissions";
 
 /** importType */
 import type { FremData } from "@/modules/09_leave/interface/request/leave";
 import type { LeaveType } from "@/modules/09_leave/interface/response/leave";
 
 /** importForm*/
+import DialogReason from "@/components/Dialogs/PopupReason.vue";
 import FormMain from "@/modules/09_leave/components/2_Leave/formDetail/formMain.vue"; // from ซ้าย
 import FormLeave from "@/modules/09_leave/components/2_Leave/formDetail/formLeave.vue"; // ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว
 import FormChildbirth from "@/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue"; // ลาไปช่วยเหลือภริยาที่คลอดบุตร
@@ -743,10 +743,14 @@ onMounted(async () => {
         </div>
       </div>
     </div>
-    <q-separator />
+    <q-separator v-if="checkPermission($route)?.attrIsUpdate" />
     <div class="row q-pa-md q-gutter-md justify-end">
       <q-btn
-        v-if="formData.approveStep === 'st1' && formData.status !== 'ยกเลิก'"
+        v-if="
+          formData.approveStep === 'st1' &&
+          formData.status !== 'ยกเลิก' &&
+          checkPermission($route)?.attrIsUpdate
+        "
         unelevated
         color="orange-5"
         label="ส่งไปยังผู้บังคับบัญชา"
@@ -755,7 +759,11 @@ onMounted(async () => {
       </q-btn>
 
       <q-btn
-        v-if="formData.approveStep === 'st2' && formData.status !== 'ยกเลิก'"
+        v-if="
+          formData.approveStep === 'st2' &&
+          formData.status !== 'ยกเลิก' &&
+          checkPermission($route)?.attrIsUpdate
+        "
         unelevated
         color="orange-5"
         label="ส่งไปยังผู้มีอำนาจ"
@@ -764,7 +772,11 @@ onMounted(async () => {
       </q-btn>
 
       <q-btn
-        v-if="formData.approveStep === 'st3' && formData.status !== 'ยกเลิก'"
+        v-if="
+          formData.approveStep === 'st3' &&
+          formData.status !== 'ยกเลิก' &&
+          checkPermission($route)?.attrIsUpdate
+        "
         unelevated
         color="orange-5"
         label="ไม่อนุมัติ"
@@ -772,7 +784,11 @@ onMounted(async () => {
         ><q-tooltip>ไม่อนุมัติ</q-tooltip>
       </q-btn>
       <q-btn
-        v-if="formData.approveStep === 'st3' && formData.status !== 'ยกเลิก'"
+        v-if="
+          formData.approveStep === 'st3' &&
+          formData.status !== 'ยกเลิก' &&
+          checkPermission($route)?.attrIsUpdate
+        "
         unelevated
         color="primary"
         label="อนุมัติ"
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
index 43742cdb4..1a67991bd 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
@@ -8,6 +8,7 @@ import config from "@/app.config";
 import genReport from "@/plugins/genreport";
 import { useCounterMixin } from "@/stores/mixin";
 import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
+import { checkPermission } from "@/utils/permissions";
 
 /** importType */
 import type {
@@ -470,7 +471,6 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
         </q-btn>
       </div>
       <q-space />
-    
     </div>
   </div>
   <q-card flat bordered class="col-12 q-mt-sm">
@@ -698,10 +698,13 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
         </div>
       </div>
     </div>
-    <q-separator />
+    <q-separator v-if="checkPermission($route)?.attrIsUpdate" />
     <div class="row q-pa-md q-gutter-md justify-end">
       <q-btn
-        v-if="formDataReject.status === 'NEW'"
+        v-if="
+          formDataReject.status === 'NEW' &&
+          checkPermission($route)?.attrIsUpdate
+        "
         unelevated
         color="orange-5"
         label="ไม่อนุมัติการยกเลิก"
@@ -709,7 +712,10 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
         ><q-tooltip>ไม่อนุมัติการยกเลิก</q-tooltip>
       </q-btn>
       <q-btn
-        v-if="formDataReject.status === 'NEW'"
+        v-if="
+          formDataReject.status === 'NEW' &&
+          checkPermission($route)?.attrIsUpdate
+        "
         unelevated
         color="primary"
         label="อนุมัติการยกเลิก"