From d83af4cf056220ad47089a6d7a2816115d1f3bea Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 4 Sep 2023 18:19:08 +0700 Subject: [PATCH] no message --- src/modules/10_order/components/Main.vue | 178 ++++++-- .../10_order/components/PopupHistory.vue | 397 ++++++++++++++++++ 2 files changed, 541 insertions(+), 34 deletions(-) create mode 100644 src/modules/10_order/components/PopupHistory.vue diff --git a/src/modules/10_order/components/Main.vue b/src/modules/10_order/components/Main.vue index f6c60f5c8..dfe38f765 100644 --- a/src/modules/10_order/components/Main.vue +++ b/src/modules/10_order/components/Main.vue @@ -12,11 +12,18 @@ import router from "@/router"; import { useQuasar } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; - +import PopupHistory from "./PopupHistory.vue"; const $q = useQuasar(); //ใช้ noti quasar const mixin = useCounterMixin(); -const { showLoader, hideLoader, messageError, date2Thai, dateText, success, dialogRemove } = - mixin; +const { + showLoader, + hideLoader, + messageError, + date2Thai, + dateText, + success, + dialogRemove, +} = mixin; const DataStore = useOrderPlacementDataStore(); const pagination = ref({ @@ -151,7 +158,8 @@ const OriginalDataFetch = async () => { rows.value = res.data.result.map((e: any) => ({ orderId: e.orderId, Order: e.orderName, - OrderNum: e.orderNo == '' ? '-' : `${e.orderNo}/${Number(e.fiscalYear) + 543}`, + OrderNum: + e.orderNo == "" ? "-" : `${e.orderNo}/${Number(e.fiscalYear) + 543}`, fiscalYear: Number(e.fiscalYear), OrderDate: date2Thai(e.orderDate), OrderBy: e.orderBy, @@ -176,13 +184,13 @@ const OriginalDataFetch = async () => { const redirectToPage = (id?: string, status?: string) => { let step = 1; switch (status) { - case 'จัดทำร่างคำสั่ง': + case "จัดทำร่างคำสั่ง": step = 1; break; - case 'บัญชีแนบท้าย': + case "บัญชีแนบท้าย": step = 2; break; - case 'เลือกผู้ได้รับสำเนาคำสั่ง': + case "เลือกผู้ได้รับสำเนาคำสั่ง": step = 3; break; default: @@ -336,47 +344,136 @@ const paginationLabel = (start: string, end: string, total: string) => {
- +
- + เพิ่มข้อมูล
- + - +
- - + + + +
- +
@@ -475,4 +585,4 @@ const paginationLabel = (start: string, end: string, total: string) => { top: 0; } } - \ No newline at end of file + diff --git a/src/modules/10_order/components/PopupHistory.vue b/src/modules/10_order/components/PopupHistory.vue new file mode 100644 index 000000000..9d6e050ed --- /dev/null +++ b/src/modules/10_order/components/PopupHistory.vue @@ -0,0 +1,397 @@ + + + + +