diff --git a/src/modules/18_command/components/Main/TableMain.vue b/src/modules/18_command/components/Main/TableMain.vue
index 59a126a13..a2b1f5b3c 100644
--- a/src/modules/18_command/components/Main/TableMain.vue
+++ b/src/modules/18_command/components/Main/TableMain.vue
@@ -239,6 +239,11 @@ onMounted(() => {
               <q-list dense style="min-width: 200px">
                 <!-- แก้ไขข้อมูล ไม่แสดง Tabs ยกเลิก -->
                 <q-item
+                  v-if="
+                    store.tabsMain !== 'WAITING' &&
+                    store.tabsMain !== 'CANCEL' &&
+                    store.tabsMain !== 'REPORTED'
+                  "
                   clickable
                   v-close-popup
                   @click.pervent="onRedirectToDetail('edit', props.row.id)"
@@ -341,7 +346,7 @@ onMounted(() => {
                   <q-item-section>
                     <div class="row items-center">
                       <q-icon color="red" size="xs" name="mdi-delete" />
-                      <div class="q-pl-md">ลบคำสั่ง</div>
+                      <div class="q-pl-md">ลบคำสั่งถาวร</div>
                     </div>
                   </q-item-section>
                 </q-item>
diff --git a/src/modules/18_command/components/Step/2_ListPersons.vue b/src/modules/18_command/components/Step/2_ListPersons.vue
index e538c38d5..b188aea60 100644
--- a/src/modules/18_command/components/Step/2_ListPersons.vue
+++ b/src/modules/18_command/components/Step/2_ListPersons.vue
@@ -323,9 +323,9 @@ defineExpose({
                         round
                         color="blue"
                         @click="selectModal(props.row)"
-                        icon="mdi-cash-multiple"
+                        icon="edit"
                       >
-                        <q-tooltip>เงินเดือน</q-tooltip>
+                        <q-tooltip>แก้ไขข้อมูลลงทะเบียนประวัติ</q-tooltip>
                       </q-btn>
                     </q-td>