From 28d41d67233a074958a1bc14120bed3a5ec12741 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 10 Aug 2023 09:38:05 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/OrderPlacement/step/step02.vue             | 8 +++++---
 .../components/OrderPlacement/step/step04.vue             | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/modules/05_placement/components/OrderPlacement/step/step02.vue b/src/modules/05_placement/components/OrderPlacement/step/step02.vue
index 15087cc43..0e95fd912 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step02.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step02.vue
@@ -371,7 +371,7 @@ const columns = ref<QTableProps["columns"]>([
 ]);
 const rows = ref<ResponseData[]>([]);
 const rows2 = ref<ResponseData[]>([]);
-const selected = ref([]);
+const selected = ref<ResponseData[]>([]);
 const orderId = ref<string>(route.params.orderid.toString());
 
 onMounted(async () => {
@@ -570,7 +570,7 @@ const putSalary = async (salary: any) => {
   modalData.value = {
     salaryAmount: Number(salary.salaryAmount),
     positionSalaryAmount: Number(salary.positionSalaryAmount),
-    mouthSalaryAmount: Number(salary.mouthSalaryAmount),
+    monthSalaryAmount: Number(salary.mouthSalaryAmount),
   };
   $q.dialog({
     title: "ยืนยันการบันทึกข้อมูล",
@@ -621,7 +621,9 @@ const fetchaddlist = async (id: string) => {
         sequence: r.sequence !== null ? r.sequence : 0,
         refRecordId: r.refRecordId,
       }));
-      rows2.value = list.filter((e: any) => e.selectStatus === false);
+      rows2.value = list;
+      selected.value = rows.value;
+      // rows2.value = list.filter((e: any) => e.selectStatus === false);
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/05_placement/components/OrderPlacement/step/step04.vue b/src/modules/05_placement/components/OrderPlacement/step/step04.vue
index 700cc0555..182c2598a 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step04.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step04.vue
@@ -573,8 +573,8 @@ const save = () => {
             await putOrderData();
             await postfileOrder();
             await postfileTailer();
-            // await fetchAttachment(orderId.value);
-            // await fecthstatusOrder(orderId.value);
+            await fetchAttachment(orderId.value);
+            await fecthstatusOrder(orderId.value);
           })
           .onCancel(() => {})
           .onDismiss(() => {});
@@ -606,7 +606,7 @@ const postfileOrder = async () => {
 const postfileTailer = async () => {
   const formData = new FormData();
   formData.append("File", fileTailer.value);
-  await http.post(config.API.attachmentOrderId(orderId.value), formData);
+  await http.post(config.API.attachmentFileId(orderId.value), formData);
 };
 const clickExecute = async (id: string) => {
   $q.dialog({