From 6fd49f4084a1116571598de09c251ce7b2a1b238 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Sat, 29 Jun 2024 21:14:56 +0700
Subject: [PATCH] fixing

---
 src/api/02_organizational/api.organization.ts          |  1 +
 .../components/ListRetirement/AddList.vue              |  2 +-
 .../components/ListRetirement/TableList.vue            |  7 +++----
 .../06_retirement/components/resign/ResignByid.vue     | 10 ++++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts
index b5371a1f9..b0c2c7f3f 100644
--- a/src/api/02_organizational/api.organization.ts
+++ b/src/api/02_organizational/api.organization.ts
@@ -64,6 +64,7 @@ export default {
   orgPosPlacemenTemp: `${orgPos}/placementemp/search`,
   orgPosFind: `${organization}/find/node`,
   orgProfileProbation: `${organization}/profile/probation`,
+  orgProfileRetire: `${organization}/profile/retire`,
 
   activeOrganizationRoot: `${organization}/active/root`,
   activeOrganizationRootById: (id: string) =>
diff --git a/src/modules/06_retirement/components/ListRetirement/AddList.vue b/src/modules/06_retirement/components/ListRetirement/AddList.vue
index 3eba31b4a..282a5d2ca 100644
--- a/src/modules/06_retirement/components/ListRetirement/AddList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue
@@ -136,7 +136,7 @@ const fecthProfile = async () => {
     formPagePersonList.keyword =
       formPagePersonList.keyword === null ? "" : formPagePersonList.keyword;
     await http
-      .post(config.API.orgProfileProbation, formPagePersonList)
+      .post(config.API.orgProfileRetire, formPagePersonList)
       .then((res) => {
         maxPage.value = Math.ceil(
           res.data.result.total / formPagePersonList.pageSize
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index 22da727f7..4c7649b69 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -10,7 +10,6 @@ import config from "@/app.config";
 import DialogHeader from "@/components/DialogHeader.vue";
 import DialogPopupReason from "@/components/Dialogs/PopupReason.vue";
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
-import { format } from "path";
 
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
@@ -644,7 +643,7 @@ function updatemodalPersonal(modal: boolean) {
                 >{{ props.row.organizationOrganization }}</q-td
               > -->
               <q-td key="position" :props="props">{{
-                props.row.position ? props.row.position:'-'
+                props.row.position ? props.row.position : "-"
               }}</q-td>
               <q-td key="positionType" :props="props"
                 >{{ props.row.positionType ? props.row.positionType : "-" }}
@@ -656,7 +655,7 @@ function updatemodalPersonal(modal: boolean) {
               </q-td>
 
               <q-td key="positionNumber" :props="props">{{
-                props.row.positionNumber ? props.row.positionNumber:'-'
+                props.row.positionNumber ? props.row.positionNumber : "-"
               }}</q-td>
               <!-- <q-td key="organizationAgency" :props="props">{{
                 props.row.organizationAgency
@@ -665,7 +664,7 @@ function updatemodalPersonal(modal: boolean) {
                 props.row.organizationGovernmentAgency
               }}</q-td> -->
               <q-td class="table_ellipsis" key="organization" :props="props">{{
-                props.row.organization ? props.row.organization:'-'
+                props.row.organization ? props.row.organization : "-"
               }}</q-td>
               <!-- <q-td class="table_ellipsis" key="bureau" :props="props">{{
                 props.row.bureau
diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index ed0763ea1..26ea99d39 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -746,7 +746,9 @@ function removeFile(fileName: string) {
             <div class="q-pl-sm text-weight-bold text-dark">เงื่อนไขต่าง ๆ</div>
             <q-space />
 
-            <div v-if="dataDetail.status == 'WAITTING' && roleUser === 'admin'">
+            <div
+              v-if="dataDetail.status == 'WAITTING' && roleUser === 'officer'"
+            >
               <div v-if="!conditions">
                 <q-btn
                   outline
@@ -825,7 +827,7 @@ function removeFile(fileName: string) {
           <div class="row col-12 q-col-gutter-y-sm q-pa-sm">
             <div class="col-12 row">
               <q-file
-                v-if="dataDetail.status == 'WAITTING' && roleUser === 'admin'"
+                v-if="dataDetail.status == 'WAITTING' && roleUser === 'officer'"
                 class="col-12"
                 for="#evidenceFiles"
                 outlined
@@ -881,7 +883,7 @@ function removeFile(fileName: string) {
                         <q-btn
                           v-if="
                             dataDetail.status == 'WAITTING' &&
-                            roleUser === 'admin'
+                            roleUser === 'officer'
                           "
                           dense
                           flat
@@ -1051,7 +1053,7 @@ function removeFile(fileName: string) {
         </div>
         <q-space />
 
-        <div v-if="roleUser === 'admin'">
+        <div v-if="roleUser === 'officer'">
           <div class="q-gutter-sm" v-if="!edit">
             <q-btn
               outline