diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index d027a768e..027f34aa9 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -101,12 +101,8 @@ const isCheckData = computed(() => {
     posNo.value !== "" &&
     salary.value !== 0 &&
     date.value !== null &&
-    (workflowRef.value?.permission.isOperate
-      ? dataDetail.value.commanderReject !== null
-      : true) &&
-    (workflowRef.value?.permission.isSign
-      ? dataDetail.value.oligarchReject !== null
-      : true)
+    dataDetail.value.commanderReject !== null &&
+    dataDetail.value.oligarchReject !== null
   ) {
     return true;
   } else return false;
@@ -181,6 +177,7 @@ function diffDate() {
 
 /** นำข้อมูลมาจาก API*/
 async function fetchData(id: string) {
+  showLoader();
   await http
     .get(config.API.resingByid(id))
     .then(async (res) => {
@@ -216,6 +213,8 @@ async function fetchData(id: string) {
     })
     .catch((e) => {
       messageError($q, e);
+    })
+    .finally(() => {
       hideLoader();
     });
 }
@@ -766,11 +765,7 @@ onMounted(async () => {
               <q-space />
 
               <div
-                v-if="
-                  dataDetail.status == 'WAITTING' &&
-                  !checkRoutePermisson &&
-                  workflowRef?.permission.isUpdate
-                "
+                v-if="!checkRoutePermisson && workflowRef?.permission.isUpdate"
               >
                 <div v-if="!conditions">
                   <q-btn
@@ -812,7 +807,7 @@ onMounted(async () => {
                 v-model="isNoDebt"
                 label="ไม่เป็นหนี้สหกรณ์"
                 color="teal"
-                :disable="!conditions && !workflowRef?.permission.isUpdate"
+                :disable="!conditions"
               />
             </div>
             <div class="col-12">
@@ -820,7 +815,7 @@ onMounted(async () => {
                 v-model="isNoBurden"
                 label="ไม่มีภาระผูกพันค้ำประกันทุนการศึกษา"
                 color="teal"
-                :disable="!conditions && !workflowRef?.permission.isUpdate"
+                :disable="!conditions"
               />
             </div>
             <div class="col-12">
@@ -828,7 +823,7 @@ onMounted(async () => {
                 v-model="isDiscipline"
                 label="ไม่มีพฤติการณ์ทางวินัย"
                 color="teal"
-                :disable="!conditions && !workflowRef?.permission.isUpdate"
+                :disable="!conditions"
               />
             </div>
           </q-card>
@@ -845,9 +840,7 @@ onMounted(async () => {
               <div class="col-12 row">
                 <q-file
                   v-if="
-                    dataDetail.status == 'WAITTING' &&
-                    !checkRoutePermisson &&
-                    workflowRef?.permission.isUpdate
+                    !checkRoutePermisson && workflowRef?.permission.isUpdate
                   "
                   class="col-12"
                   for="#evidenceFiles"
@@ -983,7 +976,7 @@ onMounted(async () => {
           ผลการพิจารณาของผู้บังคับบัญชา
         </div>
         <q-space />
-        <div class="q-gutter-x-sm" v-if="workflowRef?.permission.isOperate">
+        <div class="q-gutter-x-sm" v-if="workflowRef?.permission.isUpdate && dataDetail.commanderReject === null">
           <q-btn
             outline
             color="primary"
@@ -1049,7 +1042,7 @@ onMounted(async () => {
           ผลการพิจารณาของผู้มีอำนาจ
         </div>
         <q-space />
-        <div class="q-gutter-x-sm" v-if="workflowRef?.permission.isSign">
+        <div class="q-gutter-x-sm" v-if="workflowRef?.permission.isUpdate && dataDetail.oligarchReject === null">
           <q-btn
             outline
             color="primary"