filterYear
This commit is contained in:
parent
dc5ea784a3
commit
6ba4c4a2dc
2 changed files with 35 additions and 7 deletions
|
|
@ -20,7 +20,7 @@
|
|||
:borderless="false"
|
||||
:outlined="true"
|
||||
:hide-dropdown-icon="false"
|
||||
@update:model-value="searchfiscalyear"
|
||||
@update:model-value="searchFilterTable"
|
||||
/>
|
||||
<div>
|
||||
<q-btn size="12px" flat round color="add" icon="mdi-plus">
|
||||
|
|
@ -698,7 +698,11 @@ const visibleColumns = ref<string[]>([
|
|||
|
||||
const searchFilterTable = async () => {
|
||||
// console.log('Input value changed:', examTime.value, examType.value, expiredAccount.value);
|
||||
await DataStore.DataUpdateOrder(OrderType.value, OrderStatus.value);
|
||||
await DataStore.DataUpdateOrder(
|
||||
OrderType.value,
|
||||
OrderStatus.value,
|
||||
fiscalyear.value
|
||||
);
|
||||
UpdataData.value = DataStore.DataMainUpdateOrder;
|
||||
};
|
||||
// UpdataData.value = DataStore.DataMainUpdate;
|
||||
|
|
|
|||
|
|
@ -222,23 +222,47 @@ 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 === null) {
|
||||
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 !== null) {
|
||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||
(item) => item.OrderType === filter_1 && item.fiscalYear === filterYear
|
||||
);
|
||||
} else if (filter_1 === "" && filter_2 !== "" && filterYear === null) {
|
||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||
(item) => item.OrderStatus === filter_2
|
||||
);
|
||||
} else if (filter_1 === "" && filter_2 === "" && filterYear !== null) {
|
||||
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 !== 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