From 4a566142b8abfd6ffb701f82f7fdb37f1c3d1ad6 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Wed, 14 Aug 2024 16:38:28 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9E=E0=B9=89=E0=B8=99=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ListRetirement/TableList.vue        | 14 +++++++-------
 src/modules/06_retirement/views/Main.vue           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index a171a9e5e..cad8e9cb8 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -635,7 +635,7 @@ function updatemodalPersonal(modal: boolean) {
                 >
                 <q-btn
                   v-if="
-                    !checkRoutePermisson &&
+                    (!checkRoutePermisson || props.row.remove === 'EDIT') &&
                     (typeReport === 'EDIT' ||
                       typeReport === null ||
                       typeReport === '') &&
@@ -644,7 +644,7 @@ function updatemodalPersonal(modal: boolean) {
                   "
                   flat
                   round
-                  color="primary"
+                  color="edit"
                   :icon="props.row.remove === 'EDIT' ? 'info' : 'mdi-pencil'"
                   dense
                   @click.stop="
@@ -658,7 +658,7 @@ function updatemodalPersonal(modal: boolean) {
                 </q-btn>
                 <q-btn
                   v-if="
-                    !checkRoutePermisson &&
+                    (!checkRoutePermisson || props.row.remove === 'REMOVE') &&
                     (typeReport === 'REMOVE' ||
                       typeReport === null ||
                       typeReport === '') &&
@@ -726,7 +726,7 @@ function updatemodalPersonal(modal: boolean) {
   <!-- note -->
   <q-dialog v-model="modalNote" persistent>
     <q-card style="width: 50vw">
-      <DialogHeader tittle="กรอกเหตุผล" :close="closeDialog" />
+      <DialogHeader :tittle="checkRoutePermisson ? 'เหตุผล':'กรอกเหตุผล'" :close="closeDialog" />
       <q-separator />
       <q-card-section>
         <div class="row q-col-gutter-sm">
@@ -740,15 +740,15 @@ function updatemodalPersonal(modal: boolean) {
               :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
               :label="`${'กรอกเหตุผล'}`"
               type="textarea"
-              :readonly="statusUpload"
+              :readonly="statusUpload || checkRoutePermisson"
             />
           </div>
         </div>
       </q-card-section>
 
-      <q-separator />
+      <q-separator v-if="!checkRoutePermisson"/>
 
-      <q-card-actions align="right" v-if="!statusUpload">
+      <q-card-actions align="right" v-if="!statusUpload&&!checkRoutePermisson">
         <q-btn
           v-if="action === 'delete'"
           unelevated
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index 10f18e0ab..3f68addf0 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -377,7 +377,7 @@ const typeReportChangeName = (val: string) => {
                       <q-btn
                         v-if="
                           checkPermission($route)?.attrIsGet &&
-                          checkPermission($route)?.attrIsUpdate
+                          checkPermission($route)?.attrIsUpdate && !props.row.document
                         "
                         flat
                         round