diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index 61bc272cc..835b9bc28 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -761,7 +761,7 @@ onMounted(async () => {
                 v-if="
                   !checkRoutePermisson &&
                   workflowRef?.permission.isUpdate &&
-                  dataDetail.statusMain !== 'CANCEL'
+                  dataDetail.statusMain === 'WAITTING'
                 "
               >
                 <div v-if="!conditions">
@@ -839,7 +839,7 @@ onMounted(async () => {
                   v-if="
                     !checkRoutePermisson &&
                     workflowRef?.permission.isUpdate &&
-                    dataDetail.statusMain !== 'CANCEL'
+                    dataDetail.statusMain === 'WAITTING'
                   "
                   class="col-12"
                   for="#evidenceFiles"
@@ -895,9 +895,8 @@ onMounted(async () => {
                         <div>
                           <q-btn
                             v-if="
-                              dataDetail.status == 'WAITTING' &&
                               !checkRoutePermisson &&
-                              dataDetail.statusMain !== 'CANCEL'
+                              dataDetail.statusMain === 'WAITTING'
                             "
                             dense
                             flat
@@ -981,7 +980,7 @@ onMounted(async () => {
           v-if="
             workflowRef?.permission.isUpdate &&
             dataDetail.commanderReject === null &&
-            dataDetail.statusMain !== 'CANCEL'
+            dataDetail.statusMain === 'WAITTING'
           "
         >
           <q-btn
@@ -1054,7 +1053,7 @@ onMounted(async () => {
           v-if="
             workflowRef?.permission.isUpdate &&
             dataDetail.oligarchReject === null &&
-            dataDetail.statusMain !== 'CANCEL'
+            dataDetail.statusMain === 'WAITTING'
           "
         >
           <q-btn
@@ -1133,7 +1132,7 @@ onMounted(async () => {
             v-if="
               !checkRoutePermisson &&
               workflowRef?.permission.isUpdate &&
-              dataDetail.statusMain !== 'CANCEL'
+              dataDetail.statusMain === 'WAITTING'
             "
           >
             <div class="q-gutter-sm" v-if="!edit">
diff --git a/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue b/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
index a8d5658ec..b459eaec1 100644
--- a/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
@@ -282,7 +282,7 @@ watchEffect(() => {
 
   <DialogCreateCommand
     v-model:modal="modalCommand"
-    :command-type-code="props.mainTabs === '1' ? 'C-PM-17' : 'C-PM-41'"
+    :command-type-code="props.mainTabs === '1' ? 'C-PM-23' : 'C-PM-42'"
     :persons="dataMapToSend"
   />
 </template>
diff --git a/src/modules/06_retirement/components/resignEMP/ResignByid.vue b/src/modules/06_retirement/components/resignEMP/ResignByid.vue
index 2694f06a1..30bb41fa2 100644
--- a/src/modules/06_retirement/components/resignEMP/ResignByid.vue
+++ b/src/modules/06_retirement/components/resignEMP/ResignByid.vue
@@ -780,7 +780,7 @@ onMounted(async () => {
                 v-if="
                   !checkRoutePermisson &&
                   isStaff &&
-                  dataDetail.statusMain !== 'CANCEL'
+                  dataDetail.statusMain === 'WAITTING'
                 "
               >
                 <div v-if="!conditions">
@@ -858,7 +858,7 @@ onMounted(async () => {
                   v-if="
                     !checkRoutePermisson &&
                     isStaff &&
-                    dataDetail.statusMain !== 'CANCEL'
+                    dataDetail.statusMain === 'WAITTING'
                   "
                   class="col-12"
                   for="#evidenceFiles"
@@ -914,10 +914,9 @@ onMounted(async () => {
                         <div>
                           <q-btn
                             v-if="
-                              dataDetail.status == 'WAITTING' &&
                               !checkRoutePermisson &&
                               isStaff &&
-                              dataDetail.statusMain !== 'CANCEL'
+                              dataDetail.statusMain === 'WAITTING'
                             "
                             dense
                             flat
@@ -998,7 +997,11 @@ onMounted(async () => {
         <q-space />
         <div
           class="q-gutter-x-sm"
-          v-if="isDirector && dataDetail.commanderReject === null  && dataDetail.statusMain !== 'CANCEL'"
+          v-if="
+            isDirector &&
+            dataDetail.commanderReject === null &&
+            dataDetail.statusMain === 'WAITTING'
+          "
         >
           <q-btn
             outline
@@ -1067,7 +1070,11 @@ onMounted(async () => {
         <q-space />
         <div
           class="q-gutter-x-sm"
-          v-if="isDirector && dataDetail.oligarchReject === null  && dataDetail.statusMain !== 'CANCEL'"
+          v-if="
+            isDirector &&
+            dataDetail.oligarchReject === null &&
+            dataDetail.statusMain === 'WAITTING'
+          "
         >
           <q-btn
             outline
@@ -1140,7 +1147,13 @@ onMounted(async () => {
             แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
           </div>
           <q-space />
-          <div v-if="!checkRoutePermisson && isStaff  && dataDetail.statusMain !== 'CANCEL'">
+          <div
+            v-if="
+              !checkRoutePermisson &&
+              isStaff &&
+              dataDetail.statusMain === 'WAITTING'
+            "
+          >
             <div class="q-gutter-sm" v-if="!edit">
               <q-btn
                 outline