diff --git a/src/modules/10_order/components/step/step04.vue b/src/modules/10_order/components/step/step04.vue
index 440986627..8c093072d 100644
--- a/src/modules/10_order/components/step/step04.vue
+++ b/src/modules/10_order/components/step/step04.vue
@@ -263,7 +263,16 @@ const saveUpload = () => {
         dialogConfirm($q, async () => {
           showLoader()
           await postfileOrder();
-          await postfileTailer();
+          if (code.value != 'c-pm-10' &&
+            code.value != 'c-pm-11' &&
+            code.value != 'c-pm-12' &&
+            code.value != 'c-pm-16' &&
+            code.value != 'c-pm-18' &&
+            code.value != 'c-pm-19' &&
+            code.value != 'c-pm-20' &&
+            code.value != 'c-pm-21') {
+            await postfileTailer();
+          }
           await fetchAttachment(orderId.value);
           await fecthstatusOrder();
           hideLoader()
@@ -310,6 +319,9 @@ const postfileOrder = async () => {
   formData.append("File", fileOrder.value);
   await http
     .post(config.API.attachmentOrderId(orderId.value), formData)
+    .then((res) => {
+      success($q, "บันทึกข้อมูลสำเร็จ");
+    })
     .catch((e) => {
       messageError($q, e)
     })
@@ -352,10 +364,20 @@ const clickExecute = async (id: string) => {
 };
 
 const validateFormUpload = () => {
-  return (
-    fileOrder.value !== null &&
-    fileTailer.value !== null
-  );
+  if (code.value != 'c-pm-10' &&
+    code.value != 'c-pm-11' &&
+    code.value != 'c-pm-12' &&
+    code.value != 'c-pm-16' &&
+    code.value != 'c-pm-18' &&
+    code.value != 'c-pm-19' &&
+    code.value != 'c-pm-20' &&
+    code.value != 'c-pm-21' && fileOrder.value !== null && fileTailer.value !== null) {
+    return true;
+  } else if (fileOrder.value !== null) {
+    return true;
+  } else {
+    return false;
+  }
 };
 
 const validateForm = () => {
@@ -545,17 +567,17 @@ const viewFileUpload = async (url: string) => {
                         <q-icon name="attach_file" />
                       </template>
                     </q-file>
-
-                    <!-- บันทึกอัพโหลดเอกสาร  -->
-                    <div v-if="orderStatusName != 'ออกคำสั่งแล้ว'" class="row col-12 q-mt-md">
-                      <q-space></q-space>
-                      <q-btn unelevated label="บันทึก"
-                        :color="validateFormUpload() && orderStatusName != 'ออกคำสั่งแล้ว' ? 'public' : 'grey'"
-                        :disable="!validateFormUpload() || orderStatusName == 'ออกคำสั่งแล้ว'" @click="saveUpload">
-                      </q-btn>
-                    </div>
-
                   </div>
+
+                  <!-- บันทึกอัพโหลดเอกสาร  -->
+                  <div v-if="orderStatusName != 'ออกคำสั่งแล้ว'" class="row col-12 q-mt-md">
+                    <q-space></q-space>
+                    <q-btn unelevated label="บันทึก"
+                      :color="validateFormUpload() && orderStatusName != 'ออกคำสั่งแล้ว' ? 'public' : 'grey'"
+                      :disable="!validateFormUpload() || orderStatusName == 'ออกคำสั่งแล้ว'" @click="saveUpload">
+                    </q-btn>
+                  </div>
+
                 </div>
               </fieldset>
             </q-form>
@@ -640,8 +662,8 @@ const viewFileUpload = async (url: string) => {
       </q-btn>
 
       <!-- ออกคำสั่ง -->
-      <q-btn :disable="statusOrder == 'N' || orderStatusName === 'ออกคำสั่งแล้ว'" unelevated label="ออกคำสั่ง"
-        :color="statusOrder == 'Y' && orderStatusName !== 'ออกคำสั่งแล้ว' ? 'public' : 'grey'">
+      <q-btn v-if="orderStatusName !== 'ออกคำสั่งแล้ว'" :disable="statusOrder == 'N'" unelevated label="ออกคำสั่ง"
+        :color="statusOrder == 'Y' ? 'public' : 'grey'">
         <q-menu>
           <q-list style="min-width: 150px">
             <q-item clickable v-close-popup @click="clickExecute(orderId)">
@@ -654,6 +676,8 @@ const viewFileUpload = async (url: string) => {
         </q-menu>
       </q-btn>
 
+      <q-btn v-else disable unelevated label="ออกคำสั่งเสร็จสิ้น" color="green"></q-btn>
+
     </div>
 
     <q-dialog v-model="dialog" persistent :maximized="true" transition-show="slide-up" transition-hide="slide-down">