From 0c665a7aed8a56d7da4c5a7aa1b413efa53090d5 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Fri, 5 Jan 2024 17:55:15 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B8=87?= =?UTF-8?q?=E0=B8=A5=E0=B8=87=E0=B9=82=E0=B8=97=E0=B8=A9=E0=B8=A7=E0=B8=B4?= =?UTF-8?q?=E0=B8=99=E0=B8=B1=E0=B8=A2=E0=B8=97=E0=B8=B1=E0=B9=89=E0=B8=87?= =?UTF-8?q?=E0=B8=AB=E0=B8=A1=E0=B8=94=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=B5=E0=B9=81=E0=B8=99=E0=B8=9A=E0=B8=97=E0=B9=89=E0=B8=B2?= =?UTF-8?q?=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../10_order/components/step/step04.vue | 96 ++++++------------- 1 file changed, 30 insertions(+), 66 deletions(-) diff --git a/src/modules/10_order/components/step/step04.vue b/src/modules/10_order/components/step/step04.vue index 30c20538a..7c99646f2 100644 --- a/src/modules/10_order/components/step/step04.vue +++ b/src/modules/10_order/components/step/step04.vue @@ -55,6 +55,30 @@ onMounted(async () => { hideLoader(); } }); + +// เช็คว่าต้องมีแนบท้ายไหม code ที่เพิ่มคืออันที่ไม่มีแนบท้าย +const attachmentStatus = computed(() => { + return 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" && + code.value != "c-pm-23" && + code.value != "c-pm-25" && + code.value != "c-pm-26" && + code.value != "c-pm-27" && + code.value != "c-pm-28" && + code.value != "c-pm-29" && + code.value != "c-pm-30" && + code.value != "c-pm-31" && + code.value != "c-pm-32" + ? true + : false; +}); + // เรียกข้อมูลคำสั่ง const getCommandDetail = async () => { await http @@ -68,17 +92,7 @@ const getCommandDetail = async () => { fetchReportCover("pdf", orderId.value); - 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" && - code.value != "c-pm-23" - ) { + if (attachmentStatus.value) { fetchReportAttachment("pdf", orderId.value); } }) @@ -265,17 +279,7 @@ const saveUpload = () => { dialogConfirm($q, async () => { showLoader(); await postfileOrder(); - 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" && - code.value != "c-pm-23" - ) { + if (attachmentStatus.value) { await postfileTailer(); } await fetchAttachment(orderId.value); @@ -300,17 +304,7 @@ const saveDetail = () => { await fetchReportCover("pdf", orderId.value); // ดึงรายงานคำสั่งใหม่ // เช็คประเภทคำสั่งถ้าไม่ใช่ type เหล่านี้จะมีแนบท้าย - 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" && - code.value != "c-pm-23" - ) { + if (attachmentStatus.value) { // ดึงรายงานในส่วนของแนบท้ายมาใหม่ await fetchReportAttachment("pdf", orderId.value); @@ -399,15 +393,7 @@ const clickExecute = async (id: string) => { }; const validateFormUpload = () => { 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" && - code.value != "c-pm-23" && + attachmentStatus.value && fileOrder.value !== null && fileTailer.value !== null ) { @@ -499,17 +485,7 @@ const viewFileUpload = async (url: string) => {
@@ -678,19 +654,7 @@ const viewFileUpload = async (url: string) => {
-
+