Merge branch 'develop' into develop-tee
This commit is contained in:
commit
e344e5845e
10 changed files with 262 additions and 92 deletions
|
|
@ -222,23 +222,51 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
|
|||
const DataMainOrder = (val: FormOrderPlacementMainData[]) =>
|
||||
(DataMainOrigOrder.value = val);
|
||||
|
||||
const DataUpdateOrder = (filter_1: string, filter_2: string) => {
|
||||
const DataUpdateOrder = (
|
||||
filter_1: string,
|
||||
filter_2: string,
|
||||
filterYear: number | null
|
||||
) => {
|
||||
DataMainUpdateOrder.value = [];
|
||||
|
||||
if (filter_1 === "" && filter_2 === "") {
|
||||
if (filter_1 === "" && filter_2 === "" && filterYear === 0) {
|
||||
DataMainUpdateOrder.value = DataMainOrigOrder.value;
|
||||
} else if (filter_1 !== "" && filter_2 === "") {
|
||||
} else if (filter_1 !== "" && filter_2 === "" && filterYear === 0) {
|
||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||
(item) => item.OrderType === filter_1
|
||||
);
|
||||
} else if (filter_1 !== "" && filter_2 !== "") {
|
||||
} else if (filter_1 !== "" && filter_2 !== "" && filterYear === null) {
|
||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||
(item) => item.OrderType === filter_1 && item.OrderStatus === filter_2
|
||||
);
|
||||
} else if (filter_1 === "" && filter_2 !== "") {
|
||||
} else if (filter_1 !== "" && filter_2 === "" && filterYear !== 0) {
|
||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||
(item) => item.OrderType === filter_1 && item.fiscalYear === filterYear
|
||||
);
|
||||
} else if (filter_1 === "" && filter_2 !== "" && filterYear === 0) {
|
||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||
(item) => item.OrderStatus === filter_2
|
||||
);
|
||||
} else if (filter_1 === "" && filter_2 === "" && filterYear !== 0) {
|
||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||
(item) => item.fiscalYear === filterYear
|
||||
);
|
||||
} else if (filter_1 === "" && filter_2 !== "" && filterYear !== null) {
|
||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||
(item) =>
|
||||
item.OrderStatus === filter_2 && item.fiscalYear === filterYear
|
||||
);
|
||||
} else if (filter_1 !== "" && filter_2 !== "" && filterYear === 0) {
|
||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||
(item) => item.OrderStatus === filter_2 && item.OrderType === filter_1
|
||||
);
|
||||
} else if (filter_1 !== "" && filter_2 !== "" && filterYear !== null) {
|
||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||
(item) =>
|
||||
item.OrderType === filter_1 &&
|
||||
item.OrderStatus === filter_2 &&
|
||||
item.fiscalYear === filterYear
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue