พ้นราชการ

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

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