From 772ee9cd0e9e37e811e6693e5f66b0a84e4b22c1 Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Thu, 29 Jun 2023 14:04:50 +0700 Subject: [PATCH 1/5] add delete button --- .../components/OrderPlacement/step/step03.vue | 123 +++++++++++------- 1 file changed, 74 insertions(+), 49 deletions(-) diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue index 802561d14..dd876b604 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue @@ -69,46 +69,70 @@ :pagination-label="paginationLabel" v-model:pagination="pagination" > - + From 0f867b94db3617390048014935536db3732111de Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Fri, 30 Jun 2023 10:07:14 +0700 Subject: [PATCH 2/5] Revert "add delete button" This reverts commit 772ee9cd0e9e37e811e6693e5f66b0a84e4b22c1. --- .../components/OrderPlacement/step/step03.vue | 123 +++++++----------- 1 file changed, 49 insertions(+), 74 deletions(-) diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue index dd876b604..802561d14 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue @@ -69,70 +69,46 @@ :pagination-label="paginationLabel" v-model:pagination="pagination" > - - From 21a3e6f20668c32943546d4aa4d0a3aa94e5c6f7 Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Fri, 30 Jun 2023 16:03:27 +0700 Subject: [PATCH 3/5] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20data=20=E0=B9=83=E0=B8=99=20store=20=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=20Ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OrderPlacement/MainOrderPlacement.vue | 153 ++++++++++-------- .../components/OrderPlacement/step/step03.vue | 2 +- src/modules/05_placement/store.ts | 61 +++++++ 3 files changed, 144 insertions(+), 72 deletions(-) diff --git a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue index 984579088..db0d953df 100644 --- a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue +++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue @@ -27,20 +27,20 @@ เพิ่มข้อมูล + + ลายเซ็นชื่อ (ออฟไลน์) + ลายเซ็นอิเล็กทรอนิกส์ (ออนไลน์) - - ลายเซ็นชื่อ (ออฟไลน์) - - - + + - + - +
- - + {{ props.row.OrderStatus }} @@ -241,12 +230,12 @@ import type { QTableProps } from "quasar"; import type { FormOrderPlacementMainData } from "@/modules/05_placement/interface/request/Main"; import type { DataOption } from "@/modules/05_placement/interface/index/Main"; import { useCounterMixin } from "@/stores/mixin"; -import { usePlacementDataStore } from "@/modules/05_placement/store"; +import { useOrderPlacementDataStore } from "@/modules/05_placement/store"; import router from "@/router"; import { useQuasar } from "quasar"; const $q = useQuasar(); //ใช้ noti quasar -const DataStore = usePlacementDataStore(); +const DataStore = useOrderPlacementDataStore(); const pagination = ref({ sortBy: "desc", descending: false, @@ -359,7 +348,7 @@ const rows = ref([ OrderDate: "30 พ.ค. 2565", OrderBy: "สำนักงาน กทม.", Signer: "นาม สมคิด ยอดใจ ", - OrderStatus: "ยังไม่ได้ออกคำสั่ง", + OrderStatus: "จัดทำร่างคำสั่ง", OrderType: "คำสั่งย้าย", }, @@ -370,7 +359,7 @@ const rows = ref([ OrderDate: "30 พ.ค. 2565", OrderBy: "สำนักงาน กทม.", Signer: "นาม สมคิด ยอดใจ ", - OrderStatus: "ยังไม่ได้ออกคำสั่ง", + OrderStatus: "จัดทำร่างคำสั่ง", OrderType: "คำสั่งบรรจุและแต่งตั้ง", }, { @@ -380,7 +369,7 @@ const rows = ref([ OrderDate: "30 พ.ค. 2565", OrderBy: "สำนักงาน กทม.", Signer: "นาม สมคิด ยอดใจ ", - OrderStatus: "ยังไม่ได้ออกคำสั่ง", + OrderStatus: "บัญชีแนบท้าย", OrderType: "คำสั่งบรรจุและแต่งตั้ง", }, { @@ -390,7 +379,7 @@ const rows = ref([ OrderDate: "30 พ.ค. 2565", OrderBy: "สำนักงาน กทม.", Signer: "นาม สมคิด ยอดใจ ", - OrderStatus: "ยังไม่ได้ออกคำสั่ง", + OrderStatus: "บัญชีแนบท้าย", OrderType: "คำสั่งบรรจุและแต่งตั้ง", }, { @@ -400,7 +389,27 @@ const rows = ref([ OrderDate: "30 พ.ค. 2565", OrderBy: "สำนักงาน กทม.", Signer: "นาม สมคิด ยอดใจ ", - OrderStatus: "ยังไม่ได้ออกคำสั่ง", + OrderStatus: "ส่งสำเนาคำสั่ง", + OrderType: "คำสั่งบรรจุและแต่งตั้ง", + }, + { + Order: "คำสั่งแต่งตั้งผู้สอบแข่งขันได้", + OrderNum: "1/2565", + fiscalYear: 2565, + OrderDate: "30 พ.ค. 2565", + OrderBy: "สำนักงาน กทม.", + Signer: "นาม สมคิด ยอดใจ ", + OrderStatus: "ส่งสำเนาคำสั่ง", + OrderType: "คำสั่งบรรจุและแต่งตั้ง", + }, + { + Order: "คำสั่งแต่งตั้งผู้สอบแข่งขันได้", + OrderNum: "1/2565", + fiscalYear: 2565, + OrderDate: "30 พ.ค. 2565", + OrderBy: "สำนักงาน กทม.", + Signer: "นาม สมคิด ยอดใจ ", + OrderStatus: "รอลงนาม", OrderType: "คำสั่งบรรจุและแต่งตั้ง", }, { @@ -430,27 +439,7 @@ const rows = ref([ OrderDate: "30 พ.ค. 2565", OrderBy: "สำนักงาน กทม.", Signer: "นาม สมคิด ยอดใจ ", - OrderStatus: "ยังไม่ได้ออกคำสั่ง", - OrderType: "คำสั่งบรรจุและแต่งตั้ง", - }, - { - Order: "คำสั่งแต่งตั้งผู้สอบแข่งขันได้", - OrderNum: "1/2565", - fiscalYear: 2565, - OrderDate: "30 พ.ค. 2565", - OrderBy: "สำนักงาน กทม.", - Signer: "นาม สมคิด ยอดใจ ", - OrderStatus: "ยังไม่ได้ออกคำสั่ง", - OrderType: "คำสั่งบรรจุและแต่งตั้ง", - }, - { - Order: "คำสั่งแต่งตั้งผู้สอบแข่งขันได้", - OrderNum: "1/2565", - fiscalYear: 2565, - OrderDate: "30 พ.ค. 2565", - OrderBy: "สำนักงาน กทม.", - Signer: "นาม สมคิด ยอดใจ ", - OrderStatus: "ยังไม่ได้ออกคำสั่ง", + OrderStatus: "ออกคำสั่งแล้ว", OrderType: "คำสั่งบรรจุและแต่งตั้ง", }, { @@ -482,7 +471,7 @@ const rows = ref([ OrderDate: "30 พ.ค. 2566", OrderBy: "สำนักงาน กทม.", Signer: "นาม สมคิด ยอดใจ ", - OrderStatus: "ยังไม่ได้ออกคำสั่ง", + OrderStatus: "ออกคำสั่งแล้ว", OrderType: "คำสั่งแต่งตั้ง", }, ]); @@ -515,8 +504,8 @@ const OriginalDataFetch = async () => { // }) // .finally(async () => { // }); - await DataStore.DataMain(rows.value); - OriginalData.value = await DataStore.DataMainOrig; + await DataStore.DataMainOrder(rows.value); + OriginalData.value = await DataStore.DataMainOrigOrder; UpdataData.value = OriginalData.value; }; @@ -582,6 +571,7 @@ const fiscalYearFilter = async () => { // }); for (let data of OriginalData.value) { const year = data.fiscalYear; + console.log(year); if (fiscalyear.value === null || year > fiscalyear.value) { fiscalyear.value = year; @@ -594,9 +584,9 @@ const fiscalYearFilter = async () => { } }; -const OrderType = ref(0); +const OrderType = ref(null); const OrderTypeOption = reactive([{ id: 0, name: "ทั้งหมด" }]); -const addedOrderTypeValues: number[] = []; +const addedOrderTypeValues: string[] = []; const OrderTypeFilter = async () => { // API // await http @@ -611,22 +601,34 @@ const OrderTypeFilter = async () => { // .finally(async () => { // }); for (let data of OriginalData.value) { - const OrderType = data.OrderType; + const OrderTypeValue = data.OrderType; + console.log(OrderTypeValue); - if (OrderType.value === null || OrderType > OrderType.value) { - OrderType.value = OrderType; - } - - if (!addedOrderTypeValues.includes(OrderType)) { - OrderTypeOption.push({ id: OrderType, name: OrderType.toString() }); - addedOrderTypeValues.push(OrderType); + // if (OrderTypeValue === null || OrderType > OrderTypeValue) { + // OrderTypeValue = OrderType; + // } + if (!addedOrderTypeValues.includes(OrderTypeValue)) { + OrderTypeOption.push({ + id: OrderTypeValue, + name: OrderTypeValue, + }); + addedOrderTypeValues.push(OrderTypeValue); } + // if (!addedOrderTypeValues.includes(OrderTypeValue)) { + // OrderTypeOption.push({ + // id: OrderTypeValue, + // name: OrderTypeValue.toString(), + // }); + // addedOrderTypeValues.push(OrderTypeValue); + // } } }; - -const OrderStatus = ref(0); +const OrderStatus = ref(null); +const OrderStatusText = ref( + DataStore.DataMainOrigOrder +); const OrderStatusOption = reactive([{ id: 0, name: "ทั้งหมด" }]); -const addedOrderStatusValues: number[] = []; +const addedOrderStatusValues: string[] = []; const OrderStatusFilter = async () => { // API // await http @@ -641,15 +643,22 @@ const OrderStatusFilter = async () => { // .finally(async () => { // }); for (let data of OriginalData.value) { - const OrderStatus = data.OrderStatus; + const OrderStatusValue = data.OrderStatus; + console.log(OrderStatusValue); - if (OrderStatus.value === null || OrderStatus > OrderStatus.value) { - OrderStatus.value = OrderStatus; - } + // if ( + // OrderStatusValue === null || + // parseInt(OrderStatusValue) > parseInt(OrderStatusValue) + // ) { + // OrderStatusText.value = OrderStatusValue; + // } - if (!addedOrderStatusValues.includes(OrderStatus)) { - OrderStatusOption.push({ id: OrderStatus, name: OrderStatus.toString() }); - addedOrderStatusValues.push(OrderStatus); + if (!addedOrderStatusValues.includes(OrderStatusValue)) { + OrderStatusOption.push({ + id: OrderStatusValue, + name: OrderStatusValue, + }); + addedOrderStatusValues.push(OrderStatusValue); } } }; @@ -688,7 +697,9 @@ const visibleColumns = ref([ ]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง const searchFilterTable = async () => { - await DataStore.DataUpdateMain(OrderStatus.value, OrderType.value); + // console.log('Input value changed:', examTime.value, examType.value, expiredAccount.value); + await DataStore.DataUpdateMainOrder(OrderType.value, OrderStatus.value); + UpdataData.value = DataStore.DataMainUpdateOrder; }; // UpdataData.value = DataStore.DataMainUpdate; // console.log("Input value changed:", OrderStatus.value, OrderType.value); diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue index 707ac202f..351061668 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue @@ -470,7 +470,7 @@ const pagination = ref({ const optionSelect = ref([ { id: 1, name: "อีเมล" }, - { id: 2, name: "แจ้งเตือน" }, + { id: 2, name: "กล่องข้อความ" }, ]); const visibleColumns = ref([ diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts index bc7b251b8..ec5548899 100644 --- a/src/modules/05_placement/store.ts +++ b/src/modules/05_placement/store.ts @@ -190,3 +190,64 @@ export const usePlacementDataStore = defineStore("placement", () => { DataUpdateMain, }; }); + +export const useOrderPlacementDataStore = defineStore("placement", () => { + interface placement { + mappingPosition: { columns: String[] }; + } + const placementData = ref({ + mappingPosition: { columns: [] }, + }); + const changePlacementColumns = (system: String, val: String[]) => { + if (system == "mappingPosition") + placementData.value.mappingPosition.columns = val; + localStorage.setItem("placement", JSON.stringify(placementData.value)); + }; + + if (localStorage.getItem("placement") !== null) { + placementData.value = JSON.parse(localStorage.getItem("placement") || "{}"); + } + + const DataMainYearOrder = ref([]); // ข้อมูลจำนวนปี + const DataMainOrigOrder = ref([]); // ข้อมูลหลักดั้งเดิม + const DataMainUpdateOrder = ref([]); // ข้อมูลเปลี่ยนแปลง + const DataMainYearSetOrder = (val: FormOrderPlacementMainData[]) => + (DataMainYearOrder.value = val); + + const DataMainOrder = (val: FormOrderPlacementMainData[]) => + (DataMainOrigOrder.value = val); + + const DataUpdateMainOrder = ( + filter_1: string | null, + filter_2: string | null + ) => { + DataMainUpdateOrder.value = []; + + if (filter_1 === null && filter_2 === "0") { + DataMainUpdateOrder.value = DataMainOrigOrder.value; + } else if (filter_1 !== null && filter_2 === "0") { + DataMainUpdateOrder.value = DataMainOrigOrder.value.filter( + (item) => item.Order === filter_1 + ); + } else if (filter_1 !== null && filter_2 !== "0") { + DataMainUpdateOrder.value = DataMainOrigOrder.value.filter( + (item) => item.Order === filter_1 && item.OrderType === filter_2 + ); + } else if (filter_1 === null && filter_2 !== "0") { + DataMainUpdateOrder.value = DataMainOrigOrder.value.filter( + (item) => item.OrderStatus === filter_2 + ); + } + }; + + return { + placementData, + changePlacementColumns, + DataMainYearOrder, + DataMainOrigOrder, + DataMainUpdateOrder, + DataUpdateMainOrder, + DataMainYearSetOrder, + DataMainOrder, + }; +}); From bd7db2ad8eca57206b3429938d2000a2b1e42d79 Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Fri, 30 Jun 2023 16:29:33 +0700 Subject: [PATCH 4/5] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5?= =?UTF-8?q?=E0=B9=88=E0=B8=A2=E0=B8=99=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?= =?UTF-8?q?=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B9=81=E0=B8=9B=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OrderPlacement/MainOrderPlacement.vue | 14 +++++++------- src/modules/05_placement/store.ts | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue index db0d953df..b5482e3ba 100644 --- a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue +++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue @@ -646,12 +646,12 @@ const OrderStatusFilter = async () => { const OrderStatusValue = data.OrderStatus; console.log(OrderStatusValue); - // if ( - // OrderStatusValue === null || - // parseInt(OrderStatusValue) > parseInt(OrderStatusValue) - // ) { - // OrderStatusText.value = OrderStatusValue; - // } + if ( + OrderStatusValue === null || + parseInt(OrderStatusValue) > parseInt(OrderStatusValue) + ) { + OrderStatus.value = OrderStatusValue; + } if (!addedOrderStatusValues.includes(OrderStatusValue)) { OrderStatusOption.push({ @@ -698,7 +698,7 @@ const visibleColumns = ref([ const searchFilterTable = async () => { // console.log('Input value changed:', examTime.value, examType.value, expiredAccount.value); - await DataStore.DataUpdateMainOrder(OrderType.value, OrderStatus.value); + await DataStore.DataUpdateOrder(OrderType.value, OrderStatus.value); UpdataData.value = DataStore.DataMainUpdateOrder; }; // UpdataData.value = DataStore.DataMainUpdate; diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts index ec5548899..4ff47f8e8 100644 --- a/src/modules/05_placement/store.ts +++ b/src/modules/05_placement/store.ts @@ -217,7 +217,7 @@ export const useOrderPlacementDataStore = defineStore("placement", () => { const DataMainOrder = (val: FormOrderPlacementMainData[]) => (DataMainOrigOrder.value = val); - const DataUpdateMainOrder = ( + const DataUpdateOrder = ( filter_1: string | null, filter_2: string | null ) => { @@ -246,7 +246,7 @@ export const useOrderPlacementDataStore = defineStore("placement", () => { DataMainYearOrder, DataMainOrigOrder, DataMainUpdateOrder, - DataUpdateMainOrder, + DataUpdateOrder, DataMainYearSetOrder, DataMainOrder, }; From a0437a8a66d8f7269d9760d92c041cc24e22fea1 Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Fri, 30 Jun 2023 17:26:51 +0700 Subject: [PATCH 5/5] filter OrderType,OrderStatus --- .../OrderPlacement/MainOrderPlacement.vue | 8 ++-- .../components/OrderPlacement/step/step03.vue | 3 +- src/modules/05_placement/store.ts | 38 ++++++++++--------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue index b5482e3ba..83047e607 100644 --- a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue +++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue @@ -584,8 +584,8 @@ const fiscalYearFilter = async () => { } }; -const OrderType = ref(null); -const OrderTypeOption = reactive([{ id: 0, name: "ทั้งหมด" }]); +const OrderType = ref(""); +const OrderTypeOption = reactive([{ id: "", name: "ทั้งหมด" }]); const addedOrderTypeValues: string[] = []; const OrderTypeFilter = async () => { // API @@ -623,11 +623,11 @@ const OrderTypeFilter = async () => { // } } }; -const OrderStatus = ref(null); +const OrderStatus = ref(""); const OrderStatusText = ref( DataStore.DataMainOrigOrder ); -const OrderStatusOption = reactive([{ id: 0, name: "ทั้งหมด" }]); +const OrderStatusOption = reactive([{ id: "", name: "ทั้งหมด" }]); const addedOrderStatusValues: string[] = []; const OrderStatusFilter = async () => { // API diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue index 351061668..66da2ed48 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue @@ -364,7 +364,7 @@ const search = ref(""); const expanded = ref([]); const selected = ref(""); const nodesTree = ref([]); - +const send = ref([]); const selectedModal = ref([]); const filterModal = ref(""); const visibleColumnsModal = ref(["no", "idcard", "name"]); @@ -467,7 +467,6 @@ const pagination = ref({ page: 1, rowsPerPage: 10, }); - const optionSelect = ref([ { id: 1, name: "อีเมล" }, { id: 2, name: "กล่องข้อความ" }, diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts index 4ff47f8e8..296a38b78 100644 --- a/src/modules/05_placement/store.ts +++ b/src/modules/05_placement/store.ts @@ -191,21 +191,26 @@ export const usePlacementDataStore = defineStore("placement", () => { }; }); -export const useOrderPlacementDataStore = defineStore("placement", () => { - interface placement { +export const useOrderPlacementDataStore = defineStore("placementOrder", () => { + interface placementOrder { mappingPosition: { columns: String[] }; } - const placementData = ref({ + const placementOrderData = ref({ mappingPosition: { columns: [] }, }); const changePlacementColumns = (system: String, val: String[]) => { if (system == "mappingPosition") - placementData.value.mappingPosition.columns = val; - localStorage.setItem("placement", JSON.stringify(placementData.value)); + placementOrderData.value.mappingPosition.columns = val; + localStorage.setItem( + "placementOrder", + JSON.stringify(placementOrderData.value) + ); }; - if (localStorage.getItem("placement") !== null) { - placementData.value = JSON.parse(localStorage.getItem("placement") || "{}"); + if (localStorage.getItem("placementOrder") !== null) { + placementOrderData.value = JSON.parse( + localStorage.getItem("placementOrder") || "{}" + ); } const DataMainYearOrder = ref([]); // ข้อมูลจำนวนปี @@ -217,23 +222,20 @@ export const useOrderPlacementDataStore = defineStore("placement", () => { const DataMainOrder = (val: FormOrderPlacementMainData[]) => (DataMainOrigOrder.value = val); - const DataUpdateOrder = ( - filter_1: string | null, - filter_2: string | null - ) => { + const DataUpdateOrder = (filter_1: string, filter_2: string) => { DataMainUpdateOrder.value = []; - if (filter_1 === null && filter_2 === "0") { + if (filter_1 === "" && filter_2 === "") { DataMainUpdateOrder.value = DataMainOrigOrder.value; - } else if (filter_1 !== null && filter_2 === "0") { + } else if (filter_1 !== "" && filter_2 === "") { DataMainUpdateOrder.value = DataMainOrigOrder.value.filter( - (item) => item.Order === filter_1 + (item) => item.OrderType === filter_1 ); - } else if (filter_1 !== null && filter_2 !== "0") { + } else if (filter_1 !== "" && filter_2 !== "") { DataMainUpdateOrder.value = DataMainOrigOrder.value.filter( - (item) => item.Order === filter_1 && item.OrderType === filter_2 + (item) => item.OrderType === filter_1 && item.OrderStatus === filter_2 ); - } else if (filter_1 === null && filter_2 !== "0") { + } else if (filter_1 === "" && filter_2 !== "") { DataMainUpdateOrder.value = DataMainOrigOrder.value.filter( (item) => item.OrderStatus === filter_2 ); @@ -241,7 +243,7 @@ export const useOrderPlacementDataStore = defineStore("placement", () => { }; return { - placementData, + placementOrderData, changePlacementColumns, DataMainYearOrder, DataMainOrigOrder,