diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index f45015c3a..d949032b9 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -747,7 +747,7 @@ onMounted(() => {
 
         <q-td v-for="col in props.cols" :key="col.id">
           <div
-            v-if="col.name == 'refCommandNo'"
+            v-if="col.name == 'refCommandNo' && props.row.commandId"
             @click="col.value ? onRefCommand(props.row) : null"
             :class="
               col.value
@@ -756,6 +756,10 @@ onMounted(() => {
             "
           >
             {{ col.value ? col.value : "-" }}
+            <q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
+          </div>
+          <div v-else-if="col.name == 'refCommandNo' && !props.row.commandId">
+            -
           </div>
           <div v-else class="table_ellipsis">
             {{ col.value ? col.value : "-" }}
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 39252fcce..30bb56683 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -742,6 +742,7 @@ function openModalOrder(val: boolean) {
   // ยังไม่ได้ดัก ส่ง ไป ทั้ง object #e.draft == "รอส่งตัว" &&
   rowsOrder.value = rows.value.filter(
     (e: any) =>
+      e.draft == "ส่งตัวแล้ว" &&
       e.nodeName !== null &&
       e.reportingDate !== null &&
       e.statusId !== "REPORT" &&
diff --git a/src/modules/05_placement/components/PersonalList/TableView.vue b/src/modules/05_placement/components/PersonalList/TableView.vue
index bc9aca4fd..f1831ce70 100644
--- a/src/modules/05_placement/components/PersonalList/TableView.vue
+++ b/src/modules/05_placement/components/PersonalList/TableView.vue
@@ -194,16 +194,6 @@ function onUpdateNewRows() {
         @update:model-value="onUpdateNewRows"
       >
       </q-select>
-      <q-btn
-        flat
-        round
-        color="add"
-        icon="mdi-account-arrow-right"
-        @click="openModalOrder()"
-      >
-        <q-tooltip>ส่งไปออกคำสั่ง</q-tooltip>
-      </q-btn>
-
       <div>
         <q-btn
           flat
@@ -216,6 +206,17 @@ function onUpdateNewRows() {
           <q-tooltip>ส่งรายชื่อไปยังหน่วยงาน</q-tooltip>
         </q-btn>
       </div>
+
+      <q-btn
+        flat
+        round
+        color="add"
+        icon="mdi-account-arrow-right"
+        @click="openModalOrder()"
+      >
+        <q-tooltip>ส่งไปออกคำสั่ง</q-tooltip>
+      </q-btn>
+
       <q-space />
 
       <div class="items-center" style="display: flex">