filter OrderType,OrderStatus
This commit is contained in:
parent
bd7db2ad8e
commit
a0437a8a66
3 changed files with 25 additions and 24 deletions
|
|
@ -584,8 +584,8 @@ const fiscalYearFilter = async () => {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const OrderType = ref<string | null>(null);
|
const OrderType = ref<string>("");
|
||||||
const OrderTypeOption = reactive<DataOption[]>([{ id: 0, name: "ทั้งหมด" }]);
|
const OrderTypeOption = reactive<DataOption[]>([{ id: "", name: "ทั้งหมด" }]);
|
||||||
const addedOrderTypeValues: string[] = [];
|
const addedOrderTypeValues: string[] = [];
|
||||||
const OrderTypeFilter = async () => {
|
const OrderTypeFilter = async () => {
|
||||||
// API
|
// API
|
||||||
|
|
@ -623,11 +623,11 @@ const OrderTypeFilter = async () => {
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const OrderStatus = ref<string | null>(null);
|
const OrderStatus = ref<string>("");
|
||||||
const OrderStatusText = ref<FormOrderPlacementMainData[]>(
|
const OrderStatusText = ref<FormOrderPlacementMainData[]>(
|
||||||
DataStore.DataMainOrigOrder
|
DataStore.DataMainOrigOrder
|
||||||
);
|
);
|
||||||
const OrderStatusOption = reactive<DataOption[]>([{ id: 0, name: "ทั้งหมด" }]);
|
const OrderStatusOption = reactive<DataOption[]>([{ id: "", name: "ทั้งหมด" }]);
|
||||||
const addedOrderStatusValues: string[] = [];
|
const addedOrderStatusValues: string[] = [];
|
||||||
const OrderStatusFilter = async () => {
|
const OrderStatusFilter = async () => {
|
||||||
// API
|
// API
|
||||||
|
|
|
||||||
|
|
@ -364,7 +364,7 @@ const search = ref<string>("");
|
||||||
const expanded = ref<string[]>([]);
|
const expanded = ref<string[]>([]);
|
||||||
const selected = ref<string>("");
|
const selected = ref<string>("");
|
||||||
const nodesTree = ref<treeTab[]>([]);
|
const nodesTree = ref<treeTab[]>([]);
|
||||||
|
const send = ref<String[]>([]);
|
||||||
const selectedModal = ref([]);
|
const selectedModal = ref([]);
|
||||||
const filterModal = ref<string>("");
|
const filterModal = ref<string>("");
|
||||||
const visibleColumnsModal = ref<String[]>(["no", "idcard", "name"]);
|
const visibleColumnsModal = ref<String[]>(["no", "idcard", "name"]);
|
||||||
|
|
@ -467,7 +467,6 @@ const pagination = ref({
|
||||||
page: 1,
|
page: 1,
|
||||||
rowsPerPage: 10,
|
rowsPerPage: 10,
|
||||||
});
|
});
|
||||||
|
|
||||||
const optionSelect = ref<any>([
|
const optionSelect = ref<any>([
|
||||||
{ id: 1, name: "อีเมล" },
|
{ id: 1, name: "อีเมล" },
|
||||||
{ id: 2, name: "กล่องข้อความ" },
|
{ id: 2, name: "กล่องข้อความ" },
|
||||||
|
|
|
||||||
|
|
@ -191,21 +191,26 @@ export const usePlacementDataStore = defineStore("placement", () => {
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
export const useOrderPlacementDataStore = defineStore("placement", () => {
|
export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
|
||||||
interface placement {
|
interface placementOrder {
|
||||||
mappingPosition: { columns: String[] };
|
mappingPosition: { columns: String[] };
|
||||||
}
|
}
|
||||||
const placementData = ref<placement>({
|
const placementOrderData = ref<placementOrder>({
|
||||||
mappingPosition: { columns: [] },
|
mappingPosition: { columns: [] },
|
||||||
});
|
});
|
||||||
const changePlacementColumns = (system: String, val: String[]) => {
|
const changePlacementColumns = (system: String, val: String[]) => {
|
||||||
if (system == "mappingPosition")
|
if (system == "mappingPosition")
|
||||||
placementData.value.mappingPosition.columns = val;
|
placementOrderData.value.mappingPosition.columns = val;
|
||||||
localStorage.setItem("placement", JSON.stringify(placementData.value));
|
localStorage.setItem(
|
||||||
|
"placementOrder",
|
||||||
|
JSON.stringify(placementOrderData.value)
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
if (localStorage.getItem("placement") !== null) {
|
if (localStorage.getItem("placementOrder") !== null) {
|
||||||
placementData.value = JSON.parse(localStorage.getItem("placement") || "{}");
|
placementOrderData.value = JSON.parse(
|
||||||
|
localStorage.getItem("placementOrder") || "{}"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const DataMainYearOrder = ref<object[]>([]); // ข้อมูลจำนวนปี
|
const DataMainYearOrder = ref<object[]>([]); // ข้อมูลจำนวนปี
|
||||||
|
|
@ -217,23 +222,20 @@ export const useOrderPlacementDataStore = defineStore("placement", () => {
|
||||||
const DataMainOrder = (val: FormOrderPlacementMainData[]) =>
|
const DataMainOrder = (val: FormOrderPlacementMainData[]) =>
|
||||||
(DataMainOrigOrder.value = val);
|
(DataMainOrigOrder.value = val);
|
||||||
|
|
||||||
const DataUpdateOrder = (
|
const DataUpdateOrder = (filter_1: string, filter_2: string) => {
|
||||||
filter_1: string | null,
|
|
||||||
filter_2: string | null
|
|
||||||
) => {
|
|
||||||
DataMainUpdateOrder.value = [];
|
DataMainUpdateOrder.value = [];
|
||||||
|
|
||||||
if (filter_1 === null && filter_2 === "0") {
|
if (filter_1 === "" && filter_2 === "") {
|
||||||
DataMainUpdateOrder.value = DataMainOrigOrder.value;
|
DataMainUpdateOrder.value = DataMainOrigOrder.value;
|
||||||
} else if (filter_1 !== null && filter_2 === "0") {
|
} else if (filter_1 !== "" && filter_2 === "") {
|
||||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
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(
|
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(
|
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||||
(item) => item.OrderStatus === filter_2
|
(item) => item.OrderStatus === filter_2
|
||||||
);
|
);
|
||||||
|
|
@ -241,7 +243,7 @@ export const useOrderPlacementDataStore = defineStore("placement", () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
placementData,
|
placementOrderData,
|
||||||
changePlacementColumns,
|
changePlacementColumns,
|
||||||
DataMainYearOrder,
|
DataMainYearOrder,
|
||||||
DataMainOrigOrder,
|
DataMainOrigOrder,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue