diff --git a/src/modules/10_order/components/step/step02.vue b/src/modules/10_order/components/step/step02.vue
index ee27348cf..b276f74cc 100644
--- a/src/modules/10_order/components/step/step02.vue
+++ b/src/modules/10_order/components/step/step02.vue
@@ -273,9 +273,24 @@ const fetchSalary = async (personalId: string) => {
       console.log(res);
       const data = res.data.result;
       modalData.value = {
-        salaryAmount: data.salaryAmount === 0 && data.positionSalaryAmount === 0 && data.monthSalaryAmount===0 ? null : data.salaryAmount,
-        positionSalaryAmount: data.salaryAmount === 0 && data.positionSalaryAmount === 0 && data.monthSalaryAmount===0 ? null : data.positionSalaryAmount,
-        monthSalaryAmount: data.salaryAmount === 0 && data.positionSalaryAmount === 0 && data.monthSalaryAmount===0 ? null : data.monthSalaryAmount,
+        salaryAmount:
+          data.salaryAmount === 0 &&
+          data.positionSalaryAmount === 0 &&
+          data.monthSalaryAmount === 0
+            ? null
+            : data.salaryAmount,
+        positionSalaryAmount:
+          data.salaryAmount === 0 &&
+          data.positionSalaryAmount === 0 &&
+          data.monthSalaryAmount === 0
+            ? null
+            : data.positionSalaryAmount,
+        monthSalaryAmount:
+          data.salaryAmount === 0 &&
+          data.positionSalaryAmount === 0 &&
+          data.monthSalaryAmount === 0
+            ? null
+            : data.monthSalaryAmount,
       };
       //   console.log("data", modalData.value);
     })
@@ -439,6 +454,12 @@ const getClass = (val: boolean) => {
     "full-width cursor-pointer": !val,
   };
 };
+const pagination = ref({
+  // sortBy: "OrderDate,OrderType",
+  descending: true,
+  page: 1,
+  rowsPerPage: 10,
+});
 </script>
 
 <template>
diff --git a/src/modules/10_order/components/step/step04.vue b/src/modules/10_order/components/step/step04.vue
index e043629aa..7bad552c2 100644
--- a/src/modules/10_order/components/step/step04.vue
+++ b/src/modules/10_order/components/step/step04.vue
@@ -130,7 +130,9 @@ const fetchReportCover = async (type: string, orderId: string) => {
       const blob = new Blob([res.data]);
       const objectUrl = URL.createObjectURL(blob);
       orderCoverPdf.value = objectUrl;
-      viewPDF(orderCoverPdf.value);
+      if (tab.value == "main") {
+        viewPDF(orderCoverPdf.value);
+      }
     })
     .catch((e) => {
       messageError($q, e);
@@ -287,14 +289,33 @@ const saveUpload = () => {
 };
 
 const saveDetail = () => {
+  console.log(tab.value);
+
   if (myForm.value !== null) {
     myForm.value!.validate().then((success: Boolean) => {
       if (success) {
         dialogConfirm($q, async () => {
           showLoader();
           await putOrderData();
-          await fetchReportCover("pdf", orderId.value);
+          if (tab.value == "main") {
+            await fetchReportCover("pdf", orderId.value);
+          } else {
+            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  fetchReportAttachment("pdf", orderId.value);
+             await viewPDF(orderAttachmentPdf.value);
+            }
+          }
           await fecthstatusOrder();
+
           hideLoader();
         });
       }