diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index 6fc6b9918..3419896d5 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -88,6 +88,20 @@ defineExpose({
   <q-card-section>
     <div class="row q-col-gutter-sm">
       <!-- คำสั่งเลขที่ -->
+      <!-- คำสั่งเรื่อง -->
+      <div class="col-12">
+        <q-input
+          :class="store.classInput(!store.readonly)"
+          :readonly="store.readonly"
+          outlined
+          dense
+          v-model="formData.issue"
+          hide-bottom-space
+          :label="`${'คำสั่งเรื่อง'}`"
+          @update:model-value="onCheckChangeData()"
+        />
+      </div>
+
       <div class="col-4 row">
         <div class="col-6">
           <q-input
@@ -148,20 +162,7 @@ defineExpose({
         </div>
       </div>
 
-      <!-- คำสั่งเรื่อง -->
-      <div class="col-8">
-        <q-input
-          :class="store.classInput(!store.readonly)"
-          :readonly="store.readonly"
-          outlined
-          dense
-          v-model="formData.issue"
-          hide-bottom-space
-          :label="`${'คำสั่งเรื่อง'}`"
-          @update:model-value="onCheckChangeData()"
-        />
-      </div>
-      <div class="col-3">
+      <div class="col-4">
         <datepicker
           menu-class-name="modalfix"
           v-model="formData.commandAffectDate"
@@ -204,7 +205,7 @@ defineExpose({
           </template>
         </datepicker>
       </div>
-      <div class="col-3">
+      <div class="col-4">
         <datepicker
           menu-class-name="modalfix"
           v-model="formData.commandExcecuteDate"
diff --git a/src/modules/18_command/components/Step/4_Attached.vue b/src/modules/18_command/components/Step/4_Attached.vue
index fc1c468f5..e8df6a0b3 100644
--- a/src/modules/18_command/components/Step/4_Attached.vue
+++ b/src/modules/18_command/components/Step/4_Attached.vue
@@ -199,21 +199,21 @@ onMounted(async () => {
   <div class="q-pa-sm">
     <div class="q-pa-sm row q-gutter-sm">
       <q-btn
-        dense
+        outline
         color="red"
-        icon-right="mdi-file-pdf"
-        label="ดาวน์โหลด ไฟล์ .PDF"
+        icon="mdi-file-pdf"
+        label="ดาวน์โหลดไฟล์ PDF"
         @click="downloadCover('pdf')"
-        class="q-pa-sm"
+        class="q-px-sm"
       >
       </q-btn>
 
       <q-btn
-        class="q-pa-sm"
-        dense
+        outline
+        class="q-px-sm"
         color="blue"
-        icon-right="mdi-file-word"
-        label="ดาวน์โหลด ไฟล์ .docx"
+        icon="mdi-file-word"
+        label="ดาวน์โหลดไฟล์ docx"
         @click="downloadCover('docx')"
       >
       </q-btn>