hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2024-01-10 15:58:08 +07:00
commit ad745a9160
6 changed files with 33 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/10_order/views/Main.vue
View file

@ -229,7 +229,9 @@ const OrderStatus = ref<string>("ทั้งหมด");
const OrderStatusOption = ref<DataOption1[]>([
{ id: "ทั้งหมด", name: "ทั้งหมด" },
]);
const OrderStatusFilter1 = ref<any>([]);
const OrderStatusFilter1 = ref<DataOption1[]>([
{ id: "ทั้งหมด", name: "ทั้งหมด" },
]);
const addedOrderStatusValues: string[] = [];
const OrderStatusFilter = async () => {
for (let data of OriginalData.value) {
@ -243,15 +245,7 @@ const OrderStatusFilter = async () => {
}
if (!addedOrderStatusValues.includes(OrderStatusValue)) {
OrderStatusOption.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }];
OrderStatusOption.value.push({
// id: OrderStatusValue,
id: OrderStatusOption.value.length.toString(),
name: OrderStatusValue,
});
OrderStatusFilter1.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }];
OrderStatusFilter1.value.push({
// id: OrderStatusValue,
id: OrderStatusFilter1.value.length.toString(),
name: OrderStatusValue,
});