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([ ]); const rows = ref([]); const rows2 = ref([]); -const selected = ref([]); +const selected = ref([]); const orderId = ref(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({