diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index d2e1f8e5c..ed0763ea1 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -731,11 +731,7 @@ function removeFile(fileName: string) {
     </div>
   </q-card>
 
-  <q-card
-    v-if="dataDetail.status == 'WAITTING'"
-    bordered
-    class="row col-12 text-dark q-mt-sm"
-  >
+  <q-card bordered class="row col-12 text-dark q-mt-sm">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
       <div class="q-pl-sm text-weight-bold text-dark">
         รายการตรวจสอบเงื่อนไขต่าง ๆ
@@ -749,37 +745,40 @@ function removeFile(fileName: string) {
           <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
             <div class="q-pl-sm text-weight-bold text-dark">เงื่อนไขต่าง ๆ</div>
             <q-space />
-            <div v-if="!conditions">
-              <q-btn
-                outline
-                color="primary"
-                dense
-                icon-right="mdi-file-edit-outline"
-                class="q-px-sm"
-                label="แก้ไข"
-                style="width: 80px"
-                @click="conditions = !conditions"
-              />
-            </div>
-            <div v-else class="q-gutter-x-sm">
-              <q-btn
-                outline
-                color="public"
-                dense
-                class="q-px-sm"
-                label="บันทึก"
-                style="width: 80px"
-                @click="onSubmitConditions"
-              />
-              <q-btn
-                outline
-                color="red"
-                dense
-                class="q-px-sm"
-                label="ยกเลิก"
-                style="width: 80px"
-                @click="clickCancelConditions"
-              />
+
+            <div v-if="dataDetail.status == 'WAITTING' && roleUser === 'admin'">
+              <div v-if="!conditions">
+                <q-btn
+                  outline
+                  color="primary"
+                  dense
+                  icon-right="mdi-file-edit-outline"
+                  class="q-px-sm"
+                  label="แก้ไข"
+                  style="width: 80px"
+                  @click="conditions = !conditions"
+                />
+              </div>
+              <div v-else class="q-gutter-x-sm">
+                <q-btn
+                  outline
+                  color="public"
+                  dense
+                  class="q-px-sm"
+                  label="บันทึก"
+                  style="width: 80px"
+                  @click="onSubmitConditions"
+                />
+                <q-btn
+                  outline
+                  color="red"
+                  dense
+                  class="q-px-sm"
+                  label="ยกเลิก"
+                  style="width: 80px"
+                  @click="clickCancelConditions"
+                />
+              </div>
             </div>
           </div>
           <div class="col-12"><q-separator /></div>
@@ -826,6 +825,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'"
                 class="col-12"
                 for="#evidenceFiles"
                 outlined
@@ -879,6 +879,10 @@ function removeFile(fileName: string) {
                       </div>
                       <div>
                         <q-btn
+                          v-if="
+                            dataDetail.status == 'WAITTING' &&
+                            roleUser === 'admin'
+                          "
                           dense
                           flat
                           round
@@ -1047,38 +1051,40 @@ function removeFile(fileName: string) {
         </div>
         <q-space />
 
-        <div class="q-gutter-sm" v-if="!edit">
-          <q-btn
-            outline
-            color="primary"
-            dense
-            icon-right="mdi-file-edit-outline"
-            class="q-px-sm"
-            label="แก้ไข"
-            style="width: 80px"
-            @click="edit = !edit"
-            v-if="!(status == 'REPORT' || status == 'DONE')"
-          />
-        </div>
-        <div class="q-gutter-sm" v-else>
-          <q-btn
-            outline
-            color="public"
-            dense
-            class="q-px-sm"
-            label="บันทึก"
-            style="width: 80px"
-            type="submit"
-          />
-          <q-btn
-            outline
-            color="red"
-            dense
-            class="q-px-sm"
-            label="ยกเลิก"
-            style="width: 80px"
-            @click="clickCancel"
-          />
+        <div v-if="roleUser === 'admin'">
+          <div class="q-gutter-sm" v-if="!edit">
+            <q-btn
+              outline
+              color="primary"
+              dense
+              icon-right="mdi-file-edit-outline"
+              class="q-px-sm"
+              label="แก้ไข"
+              style="width: 80px"
+              @click="edit = !edit"
+              v-if="!(status == 'REPORT' || status == 'DONE')"
+            />
+          </div>
+          <div class="q-gutter-sm" v-else>
+            <q-btn
+              outline
+              color="public"
+              dense
+              class="q-px-sm"
+              label="บันทึก"
+              style="width: 80px"
+              type="submit"
+            />
+            <q-btn
+              outline
+              color="red"
+              dense
+              class="q-px-sm"
+              label="ยกเลิก"
+              style="width: 80px"
+              @click="clickCancel"
+            />
+          </div>
         </div>
       </div>
       <div class="col-12"><q-separator /></div>