From b598f761c42ff2c099ca41f9c00ce7bc10c50f29 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 21 Aug 2024 11:36:52 +0700
Subject: [PATCH] updated retire

---
 .../components/ListRetirement/TableList.vue   | 46 +++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index 0a6065621..caddb0cd7 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -327,7 +327,7 @@ const uploadFile = async (event: any, signDate: any) => {
                 config.API.fileRetirement(retireld.value.toString()),
                 formdata
               )
-              .then(async(res) => {
+              .then(async (res) => {
                 fileUpload.value = null;
                 signDate.value = null;
                 modalUpload.value = false;
@@ -339,9 +339,7 @@ const uploadFile = async (event: any, signDate: any) => {
               .catch((err) => {
                 messageError($q, err);
               })
-              .finally(() => {
-
-              });
+              .finally(() => {});
           },
           "ยืนยันการอัปโหลดเอกสาร",
           "ต้องการยืนยันการอัปโหลดเอกสารนี้หรือไม่ ?"
@@ -458,9 +456,9 @@ function updatemodalPersonal(modal: boolean) {
             :UpdateListId="UpdateListId"
             v-if="
               !checkRoutePermisson &&
-              statusReport === false &&
+              !statusReport &&
               (typeReport == 'ADD' || typeReport == '' || typeReport == null) &&
-              statusUpload !== true
+              !statusUpload
             "
           />
           <q-btn color="primary" flat round icon="mdi-dots-vertical">
@@ -474,7 +472,7 @@ function updatemodalPersonal(modal: boolean) {
                     (modalUpload = true), (signDate = null), (fileUpload = null)
                   "
                   target="_blank"
-                  v-if="statusUpload !== true && !checkRoutePermisson"
+                  v-if="!statusUpload && !checkRoutePermisson"
                 >
                   <q-item-section avatar
                     ><q-icon color="blue" name="attach_file"
@@ -609,21 +607,27 @@ function updatemodalPersonal(modal: boolean) {
             <q-tr
               :props="props"
               :style="props.row.profileId === profileId && 'color: #26a69a;'"
-              
             >
               <q-td auto-width>
-                <q-btn flat round dense icon="mdi-eye" color="info" @click.stop="onclickViewinfo(props.row.profileId)">
+                <q-btn
+                  flat
+                  round
+                  dense
+                  icon="mdi-eye"
+                  color="info"
+                  @click.stop="onclickViewinfo(props.row.profileId)"
+                >
                   <q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
                 </q-btn>
                 <q-btn
-                  v-if="!checkRoutePermisson&&
+                  v-if="
                     (props.row.remove === 'EDIT' ||
                       props.row.remove === 'REMOVE') &&
                     statusUpload
                   "
                   flat
                   round
-                  :color="props.row.remove === 'EDIT' ? 'primary' : 'red-14'"
+                  :color="props.row.remove === 'EDIT' ? 'edit' : 'red-14'"
                   icon="info"
                   dense
                   @click.stop="
@@ -632,7 +636,7 @@ function updatemodalPersonal(modal: boolean) {
                       (note = props.row.reason),
                       (retireProfileId = props.row.id)
                   "
-                  ><q-tooltip>ข้อมูล</q-tooltip></q-btn
+                  ><q-tooltip>ดูเหตุผล</q-tooltip></q-btn
                 >
                 <q-btn
                   v-if="
@@ -640,8 +644,8 @@ function updatemodalPersonal(modal: boolean) {
                     (typeReport === 'EDIT' ||
                       typeReport === null ||
                       typeReport === '') &&
-                    statusReport === false &&
-                    statusUpload !== true
+                    !statusReport &&
+                    !statusUpload
                   "
                   flat
                   round
@@ -663,7 +667,7 @@ function updatemodalPersonal(modal: boolean) {
                     (typeReport === 'REMOVE' ||
                       typeReport === null ||
                       typeReport === '') &&
-                    statusReport === false &&
+                    !statusReport &&
                     statusUpload !== true
                   "
                   flat
@@ -727,7 +731,10 @@ function updatemodalPersonal(modal: boolean) {
   <!-- note -->
   <q-dialog v-model="modalNote" persistent>
     <q-card style="width: 50vw">
-      <DialogHeader :tittle="checkRoutePermisson ? 'เหตุผล':'กรอกเหตุผล'" :close="closeDialog" />
+      <DialogHeader
+        :tittle="checkRoutePermisson ? 'เหตุผล' : 'กรอกเหตุผล'"
+        :close="closeDialog"
+      />
       <q-separator />
       <q-card-section>
         <div class="row q-col-gutter-sm">
@@ -747,9 +754,12 @@ function updatemodalPersonal(modal: boolean) {
         </div>
       </q-card-section>
 
-      <q-separator v-if="!checkRoutePermisson"/>
+      <q-separator v-if="!checkRoutePermisson" />
 
-      <q-card-actions align="right" v-if="!statusUpload&&!checkRoutePermisson">
+      <q-card-actions
+        align="right"
+        v-if="!statusUpload && !checkRoutePermisson"
+      >
         <q-btn
           v-if="action === 'delete'"
           unelevated