filter ออกคำสั่ง
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
parent
86d81c7066
commit
77a930ed78
5 changed files with 24 additions and 546 deletions
|
|
@ -1,517 +0,0 @@
|
||||||
<script setup lang="ts">
|
|
||||||
import { onMounted, reactive, ref } from "vue";
|
|
||||||
import type { QTableProps } from "quasar";
|
|
||||||
import type { FormOrderPlacementMainData } from "@/modules/10_order/interface/request/Main";
|
|
||||||
import type {
|
|
||||||
DataOption,
|
|
||||||
DataOption1,
|
|
||||||
OrderResult,
|
|
||||||
} from "@/modules/10_order/interface/index/Main";
|
|
||||||
import { useCounterMixin } from "@/stores/mixin";
|
|
||||||
import { useOrderPlacementDataStore } from "@/modules/10_order/store";
|
|
||||||
import router from "@/router";
|
|
||||||
import { useQuasar } from "quasar";
|
|
||||||
import http from "@/plugins/http";
|
|
||||||
import config from "@/app.config";
|
|
||||||
import PopupHistory from "./PopupHistory.vue";
|
|
||||||
const $q = useQuasar(); //ใช้ noti quasar
|
|
||||||
const mixin = useCounterMixin();
|
|
||||||
const { showLoader, hideLoader, messageError, date2Thai } = mixin;
|
|
||||||
const DataStore = useOrderPlacementDataStore();
|
|
||||||
|
|
||||||
const pagination = ref({
|
|
||||||
// sortBy: "OrderDate,OrderType",
|
|
||||||
descending: true,
|
|
||||||
page: 1,
|
|
||||||
rowsPerPage: 10,
|
|
||||||
});
|
|
||||||
|
|
||||||
const visibleColumns = ref<string[]>([
|
|
||||||
"Order",
|
|
||||||
"OrderType",
|
|
||||||
"OrderNum",
|
|
||||||
"OrderDate",
|
|
||||||
"OrderBy",
|
|
||||||
"Signer",
|
|
||||||
"OrderStatus",
|
|
||||||
]);
|
|
||||||
|
|
||||||
// หัวตาราง
|
|
||||||
const columns = ref<QTableProps["columns"]>([
|
|
||||||
{
|
|
||||||
name: "Order",
|
|
||||||
align: "left",
|
|
||||||
label: "คำสั่ง",
|
|
||||||
sortable: true,
|
|
||||||
field: "Order",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
sort: (a: string, b: string) =>
|
|
||||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "OrderNum",
|
|
||||||
align: "left",
|
|
||||||
label: "เลขที่คำสั่ง",
|
|
||||||
sortable: true,
|
|
||||||
field: "OrderNum",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "OrderType",
|
|
||||||
align: "left",
|
|
||||||
label: "ประเภท",
|
|
||||||
sortable: false,
|
|
||||||
field: "OrderType",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
sort: (a: string, b: string) =>
|
|
||||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "OrderDate",
|
|
||||||
align: "left",
|
|
||||||
label: "สั่ง ณ วันที่/วันที่คำสั่งมีผล",
|
|
||||||
sortable: true,
|
|
||||||
field: "OrderDate",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
sort: (a, b) => parseInt(a) - parseInt(b),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "OrderBy",
|
|
||||||
align: "left",
|
|
||||||
label: "คำสั่งโดย",
|
|
||||||
sortable: true,
|
|
||||||
field: "OrderBy",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
sort: (a: string, b: string) =>
|
|
||||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Signer",
|
|
||||||
align: "left",
|
|
||||||
label: "ผู้ลงนาม",
|
|
||||||
sortable: false,
|
|
||||||
field: "Signer",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
sort: (a: string, b: string) =>
|
|
||||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "OrderStatus",
|
|
||||||
align: "center",
|
|
||||||
label: "สถานะคำสั่ง",
|
|
||||||
sortable: false,
|
|
||||||
field: "OrderStatus",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
sort: (a: string, b: string) =>
|
|
||||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "fiscalYear",
|
|
||||||
align: "left",
|
|
||||||
label: "ปีงบประมาณ",
|
|
||||||
sortable: true,
|
|
||||||
field: "fiscalYear",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
// ข้อมูลตาราง (จำลอง)
|
|
||||||
const rows = ref<FormOrderPlacementMainData[]>([]);
|
|
||||||
|
|
||||||
let OriginalData = ref<FormOrderPlacementMainData[]>([]);
|
|
||||||
let UpdataData = ref<FormOrderPlacementMainData[]>([]);
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
await OriginalDataFetch();
|
|
||||||
fiscalYearFilter();
|
|
||||||
searchFilterTable();
|
|
||||||
OrderStatusFilter();
|
|
||||||
OrderTypeFilter();
|
|
||||||
});
|
|
||||||
// เรียกรายการออกคำสั่ง
|
|
||||||
const OriginalDataFetch = async () => {
|
|
||||||
showLoader();
|
|
||||||
await http
|
|
||||||
.get(config.API.listOrder())
|
|
||||||
.then((res) => {
|
|
||||||
rows.value = res.data.result.map((e: OrderResult) => ({
|
|
||||||
orderId: e.orderId,
|
|
||||||
Order: e.orderName,
|
|
||||||
OrderNum:
|
|
||||||
e.orderNo == "" ? "-" : `${e.orderNo}/${Number(e.fiscalYear) + 543}`,
|
|
||||||
fiscalYear: Number(e.fiscalYear),
|
|
||||||
OrderDate: date2Thai(e.orderDate),
|
|
||||||
OrderBy: e.orderBy,
|
|
||||||
Signer: e.signatoryBy,
|
|
||||||
OrderStatus: e.orderStatusName,
|
|
||||||
orderStatusValue: e.orderStatusValue,
|
|
||||||
OrderType: e.orderTypeName,
|
|
||||||
orderTypeValue: e.orderTypeValue,
|
|
||||||
}));
|
|
||||||
})
|
|
||||||
.catch((e) => {
|
|
||||||
messageError($q, e);
|
|
||||||
})
|
|
||||||
.finally(async () => {
|
|
||||||
hideLoader();
|
|
||||||
});
|
|
||||||
await DataStore.DataMainOrder(rows.value);
|
|
||||||
OriginalData.value = await DataStore.DataMainOrigOrder;
|
|
||||||
UpdataData.value = OriginalData.value;
|
|
||||||
};
|
|
||||||
|
|
||||||
// ดูรายการหน้าต่อไป
|
|
||||||
const redirectToPage = (id?: string, status?: string) => {
|
|
||||||
let step = 1;
|
|
||||||
switch (status) {
|
|
||||||
case "จัดทำร่างคำสั่ง":
|
|
||||||
step = 1;
|
|
||||||
break;
|
|
||||||
case "บัญชีแนบท้าย":
|
|
||||||
step = 2;
|
|
||||||
break;
|
|
||||||
case "เลือกผู้ได้รับสำเนาคำสั่ง":
|
|
||||||
step = 3;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
step = 4;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
router.push(`/order/detail/${id}?step=${step}`);
|
|
||||||
};
|
|
||||||
// เพิ่มออกคำสั่ง
|
|
||||||
const clickAdd = () => {
|
|
||||||
router.push({ name: "OrderAdd" });
|
|
||||||
};
|
|
||||||
|
|
||||||
// เลือกปีงบประมาณ
|
|
||||||
const fiscalyear = ref<number | null>(0);
|
|
||||||
const fiscalyearOP = reactive<DataOption[]>([{ id: 0, name: "ทั้งหมด" }]);
|
|
||||||
const fiscalYearFilter = async () => {
|
|
||||||
await http.get(config.API.yearOptionsOrder()).then((res) => {
|
|
||||||
const response = res.data.result;
|
|
||||||
fiscalyearOP.push(...response);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
// เรียกประเภทคำสั่ง
|
|
||||||
const OrderType = ref<string>("");
|
|
||||||
const OrderTypeOption = reactive<DataOption1[]>([{ id: "", name: "ทั้งหมด" }]);
|
|
||||||
const OrderTypeFilter = async () => {
|
|
||||||
await http
|
|
||||||
.get(config.API.typeOrder())
|
|
||||||
.then((res) => {
|
|
||||||
const response = res.data.result;
|
|
||||||
OrderTypeOption.push(...response);
|
|
||||||
})
|
|
||||||
.catch((e) => {
|
|
||||||
messageError($q, e);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
const OrderStatus = ref<string>("");
|
|
||||||
const OrderStatusOption = reactive<DataOption1[]>([
|
|
||||||
{ id: "", name: "ทั้งหมด" },
|
|
||||||
]);
|
|
||||||
const addedOrderStatusValues: string[] = [];
|
|
||||||
const OrderStatusFilter = async () => {
|
|
||||||
for (let data of OriginalData.value) {
|
|
||||||
const OrderStatusValue = data.OrderStatus;
|
|
||||||
if (
|
|
||||||
OrderStatusValue === null ||
|
|
||||||
parseInt(OrderStatusValue) > parseInt(OrderStatusValue)
|
|
||||||
) {
|
|
||||||
OrderStatus.value = OrderStatusValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!addedOrderStatusValues.includes(OrderStatusValue)) {
|
|
||||||
OrderStatusOption.push({
|
|
||||||
// id: OrderStatusValue,
|
|
||||||
id: OrderStatusOption.length.toString(),
|
|
||||||
name: OrderStatusValue,
|
|
||||||
});
|
|
||||||
addedOrderStatusValues.push(OrderStatusValue);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
// ค้นหาในตาราง
|
|
||||||
const filterKeyword = ref<string>("");
|
|
||||||
const filterRef = ref<HTMLInputElement | null>(null);
|
|
||||||
const resetFilter = () => {
|
|
||||||
filterKeyword.value = "";
|
|
||||||
// filterRef.value.focus();
|
|
||||||
};
|
|
||||||
|
|
||||||
const attrs = ref<string | null>();
|
|
||||||
// ค้นหาประเภท และ สถานะ
|
|
||||||
const searchFilterTable = async () => {
|
|
||||||
if (OrderType.value == "ทั้งหมด") {
|
|
||||||
OrderType.value = "";
|
|
||||||
}
|
|
||||||
if (OrderStatus.value == "ทั้งหมด") {
|
|
||||||
OrderStatus.value = "";
|
|
||||||
}
|
|
||||||
await DataStore.DataUpdateOrder(
|
|
||||||
OrderType.value,
|
|
||||||
OrderStatus.value,
|
|
||||||
fiscalyear.value
|
|
||||||
);
|
|
||||||
UpdataData.value = DataStore.DataMainUpdateOrder;
|
|
||||||
};
|
|
||||||
|
|
||||||
const paging = ref<boolean>(true);
|
|
||||||
const paginationLabel = (start: string, end: string, total: string) => {
|
|
||||||
if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
|
|
||||||
else return start + "-" + end + " ใน " + total;
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="toptitle text-dark col-12 row items-center">ออกคำสั่ง</div>
|
|
||||||
<div>
|
|
||||||
<q-card flat bordered class="col-12 q-mt-sm q-pa-md">
|
|
||||||
<div class="row q-col-gutter-sm">
|
|
||||||
<div class="row col-12 q-col-gutter-sm">
|
|
||||||
<q-select
|
|
||||||
class="col-xs-12 col-sm-3 col-md-"
|
|
||||||
v-model="fiscalyear"
|
|
||||||
label="ปีงบประมาณ"
|
|
||||||
dense
|
|
||||||
emit-value
|
|
||||||
map-options
|
|
||||||
:options="fiscalyearOP"
|
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
lazy-rules
|
|
||||||
hide-bottom-space
|
|
||||||
:readonly="false"
|
|
||||||
:borderless="false"
|
|
||||||
:outlined="true"
|
|
||||||
:hide-dropdown-icon="false"
|
|
||||||
@update:model-value="searchFilterTable"
|
|
||||||
/>
|
|
||||||
<div>
|
|
||||||
<q-btn
|
|
||||||
size="12px"
|
|
||||||
flat
|
|
||||||
round
|
|
||||||
color="add"
|
|
||||||
icon="mdi-plus"
|
|
||||||
@click="clickAdd"
|
|
||||||
>
|
|
||||||
<q-tooltip>เพิ่มข้อมูล</q-tooltip>
|
|
||||||
</q-btn>
|
|
||||||
</div>
|
|
||||||
<q-space />
|
|
||||||
|
|
||||||
<q-input
|
|
||||||
class="col-xs-12 col-sm-3 col-md-2"
|
|
||||||
standout
|
|
||||||
dense
|
|
||||||
v-model="filterKeyword"
|
|
||||||
ref="filterRef"
|
|
||||||
outlined
|
|
||||||
debounce="300"
|
|
||||||
placeholder="ค้นหา"
|
|
||||||
>
|
|
||||||
<template v-slot:append>
|
|
||||||
<q-icon v-if="filterKeyword == ''" name="search" />
|
|
||||||
<q-icon
|
|
||||||
v-if="filterKeyword !== ''"
|
|
||||||
name="clear"
|
|
||||||
class="cursor-pointer"
|
|
||||||
@click="resetFilter"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
</q-input>
|
|
||||||
|
|
||||||
<q-select
|
|
||||||
v-model="visibleColumns"
|
|
||||||
multiple
|
|
||||||
outlined
|
|
||||||
dense
|
|
||||||
options-dense
|
|
||||||
:display-value="$q.lang.table.columns"
|
|
||||||
emit-value
|
|
||||||
map-options
|
|
||||||
:options="columns"
|
|
||||||
option-value="name"
|
|
||||||
options-cover
|
|
||||||
style="min-width: 150px"
|
|
||||||
class="col-xs-12 col-sm-3 col-md-2"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="col-12">
|
|
||||||
<q-card bordered class="col-12 filter-card q-pa-sm">
|
|
||||||
<div class="row col-12 q-col-gutter-sm">
|
|
||||||
<div class="col-xs-12 col-sm-3 col-md-4">
|
|
||||||
<q-select
|
|
||||||
v-model="OrderType"
|
|
||||||
label="ประเภท"
|
|
||||||
dense
|
|
||||||
emit-value
|
|
||||||
map-options
|
|
||||||
option-label="name"
|
|
||||||
:options="OrderTypeOption"
|
|
||||||
option-value="name"
|
|
||||||
lazy-rules
|
|
||||||
hide-bottom-space
|
|
||||||
:readonly="false"
|
|
||||||
:borderless="false"
|
|
||||||
:outlined="true"
|
|
||||||
:hide-dropdown-icon="false"
|
|
||||||
@update:model-value="searchFilterTable"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-12 col-sm-3 col-md-2">
|
|
||||||
<q-select
|
|
||||||
v-model="OrderStatus"
|
|
||||||
label="สถานะ"
|
|
||||||
dense
|
|
||||||
emit-value
|
|
||||||
map-options
|
|
||||||
option-label="name"
|
|
||||||
:options="OrderStatusOption"
|
|
||||||
option-value="name"
|
|
||||||
lazy-rules
|
|
||||||
hide-bottom-space
|
|
||||||
:readonly="false"
|
|
||||||
:borderless="false"
|
|
||||||
:outlined="true"
|
|
||||||
:hide-dropdown-icon="false"
|
|
||||||
@update:model-value="searchFilterTable"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<q-space />
|
|
||||||
<div><PopupHistory :OrderTypeOption="OrderTypeOption" /></div>
|
|
||||||
</div>
|
|
||||||
</q-card>
|
|
||||||
</div>
|
|
||||||
<div class="col-12">
|
|
||||||
<q-table
|
|
||||||
ref="table"
|
|
||||||
:columns="columns"
|
|
||||||
:rows="UpdataData"
|
|
||||||
:filter="filterKeyword"
|
|
||||||
row-key="Order"
|
|
||||||
flat
|
|
||||||
bordered
|
|
||||||
:paging="true"
|
|
||||||
dense
|
|
||||||
class="custom-header-table"
|
|
||||||
v-bind="attrs"
|
|
||||||
:visible-columns="visibleColumns"
|
|
||||||
:pagination-label="paginationLabel"
|
|
||||||
v-model:pagination="pagination"
|
|
||||||
>
|
|
||||||
<template v-slot:header="props">
|
|
||||||
<q-tr :props="props">
|
|
||||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
|
||||||
<span class="text-weight-medium">{{ col.label }}</span>
|
|
||||||
</q-th>
|
|
||||||
<!-- <q-th auto-width /> -->
|
|
||||||
</q-tr>
|
|
||||||
</template>
|
|
||||||
<template v-slot:body="props">
|
|
||||||
<q-tr
|
|
||||||
:props="props"
|
|
||||||
class="cursor-pointer"
|
|
||||||
@click="
|
|
||||||
redirectToPage(props.row.orderId, props.row.OrderStatus)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<q-td key="Order" :props="props">
|
|
||||||
{{ props.row.Order }}
|
|
||||||
</q-td>
|
|
||||||
<q-td key="OrderNum" :props="props">
|
|
||||||
{{ props.row.OrderNum }}
|
|
||||||
</q-td>
|
|
||||||
<q-td key="OrderType" :props="props">
|
|
||||||
{{ props.row.OrderType }}
|
|
||||||
</q-td>
|
|
||||||
<q-td key="OrderDate" :props="props">
|
|
||||||
{{ props.row.OrderDate }}
|
|
||||||
</q-td>
|
|
||||||
<q-td key="OrderBy" :props="props">
|
|
||||||
{{ props.row.OrderBy }}
|
|
||||||
</q-td>
|
|
||||||
<q-td key="Signer" :props="props">
|
|
||||||
{{ props.row.Signer }}
|
|
||||||
</q-td>
|
|
||||||
<q-td key="OrderStatus" :props="props">
|
|
||||||
{{ props.row.OrderStatus }}
|
|
||||||
</q-td>
|
|
||||||
</q-tr>
|
|
||||||
</template>
|
|
||||||
<template v-slot:pagination="scope">
|
|
||||||
<q-pagination
|
|
||||||
v-model="pagination.page"
|
|
||||||
active-color="primary"
|
|
||||||
color="dark"
|
|
||||||
:max="scope.pagesNumber"
|
|
||||||
:max-pages="5"
|
|
||||||
size="sm"
|
|
||||||
boundary-links
|
|
||||||
direction-links
|
|
||||||
></q-pagination>
|
|
||||||
</template>
|
|
||||||
</q-table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</q-card>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style lang="scss" scope>
|
|
||||||
.filter-card {
|
|
||||||
background-color: #f1f1f1b0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.toggle-expired-account {
|
|
||||||
font-size: 12px;
|
|
||||||
font-weight: 400;
|
|
||||||
font-size: 15px;
|
|
||||||
line-height: 150%;
|
|
||||||
color: #35373c;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon-color {
|
|
||||||
color: #4154b3;
|
|
||||||
}
|
|
||||||
|
|
||||||
.custom-header-table {
|
|
||||||
max-height: 64vh;
|
|
||||||
|
|
||||||
.q-table tr:nth-child(odd) td {
|
|
||||||
background: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.q-table tr:nth-child(even) td {
|
|
||||||
background: #f8f8f8;
|
|
||||||
}
|
|
||||||
|
|
||||||
.q-table thead tr {
|
|
||||||
background: #ecebeb;
|
|
||||||
}
|
|
||||||
|
|
||||||
.q-table thead tr th {
|
|
||||||
position: sticky;
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* this will be the loading indicator */
|
|
||||||
.q-table thead tr:last-child th {
|
|
||||||
/* height of all previous header rows */
|
|
||||||
top: 48px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.q-table thead tr:first-child th {
|
|
||||||
top: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -7,6 +7,7 @@ interface FormOrderPlacementMainData {
|
||||||
Signer: string;
|
Signer: string;
|
||||||
OrderStatus: string;
|
OrderStatus: string;
|
||||||
OrderType: string;
|
OrderType: string;
|
||||||
|
orderTypeValue: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type { FormOrderPlacementMainData };
|
export type { FormOrderPlacementMainData };
|
||||||
|
|
@ -39,47 +39,46 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
|
||||||
filterYear: number | null
|
filterYear: number | null
|
||||||
) => {
|
) => {
|
||||||
DataMainUpdateOrder.value = [];
|
DataMainUpdateOrder.value = [];
|
||||||
|
if (filter_1 === "" && filter_2 === "ทั้งหมด" && filterYear === 0) {
|
||||||
if (filter_1 === "" && filter_2 === "" && filterYear === 0) {
|
|
||||||
DataMainUpdateOrder.value = DataMainOrigOrder.value;
|
DataMainUpdateOrder.value = DataMainOrigOrder.value;
|
||||||
} else if (filter_1 !== "" && filter_2 === "" && filterYear === 0) {
|
} else if (filter_1 !== "" && filter_2 === "ทั้งหมด" && filterYear === 0) {
|
||||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||||
(item) => item.OrderType === filter_1
|
(item) => item.orderTypeValue === filter_1
|
||||||
);
|
);
|
||||||
} else if (filter_1 !== "" && filter_2 !== "" && filterYear === null) {
|
} else if (filter_1 !== "" && filter_2 !== "ทั้งหมด" && filterYear === null) {
|
||||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||||
(item) => item.OrderType === filter_1 && item.OrderStatus === filter_2
|
(item) => item.orderTypeValue === filter_1 && item.OrderStatus === filter_2
|
||||||
);
|
);
|
||||||
} else if (filter_1 !== "" && filter_2 === "" && filterYear !== 0) {
|
} else if (filter_1 !== "" && filter_2 === "ทั้งหมด" && filterYear !== 0) {
|
||||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||||
(item) => item.OrderType === filter_1 && item.fiscalYear === filterYear
|
(item) => item.orderTypeValue === filter_1 && item.fiscalYear === filterYear
|
||||||
);
|
);
|
||||||
} else if (filter_1 === "" && filter_2 !== "" && filterYear === 0) {
|
} else if (filter_1 === "" && filter_2 !== "ทั้งหมด" && filterYear === 0) {
|
||||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||||
(item) => item.OrderStatus === filter_2
|
(item) => item.OrderStatus === filter_2
|
||||||
);
|
);
|
||||||
} else if (filter_1 === "" && filter_2 === "" && filterYear !== 0) {
|
} else if (filter_1 === "" && filter_2 === "ทั้งหมด" && filterYear !== 0) {
|
||||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||||
(item) => item.fiscalYear === filterYear
|
(item) => item.fiscalYear === filterYear
|
||||||
);
|
);
|
||||||
} else if (filter_1 === "" && filter_2 !== "" && filterYear !== null) {
|
} else if (filter_1 === "" && filter_2 !== "ทั้งหมด" && filterYear !== null) {
|
||||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||||
(item) =>
|
(item) =>
|
||||||
item.OrderStatus === filter_2 && item.fiscalYear === filterYear
|
item.OrderStatus === filter_2 && item.fiscalYear === filterYear
|
||||||
);
|
);
|
||||||
} else if (filter_1 !== "" && filter_2 !== "" && filterYear === 0) {
|
} else if (filter_1 !== "" && filter_2 !== "ทั้งหมด" && filterYear === 0) {
|
||||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||||
(item) => item.OrderStatus === filter_2 && item.OrderType === filter_1
|
(item) => item.OrderStatus === filter_2 && item.orderTypeValue === filter_1
|
||||||
);
|
);
|
||||||
} else if (filter_1 !== "" && filter_2 !== "" && filterYear !== null) {
|
} else if (filter_1 !== "" && filter_2 !== "ทั้งหมด" && filterYear !== null) {
|
||||||
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
DataMainUpdateOrder.value = DataMainOrigOrder.value.filter(
|
||||||
(item) =>
|
(item) =>
|
||||||
item.OrderType === filter_1 &&
|
item.orderTypeValue === filter_1 &&
|
||||||
item.OrderStatus === filter_2 &&
|
item.OrderStatus === filter_2 &&
|
||||||
item.fiscalYear === filterYear
|
item.fiscalYear === filterYear
|
||||||
);
|
);
|
||||||
} else if (
|
} else if (
|
||||||
filter_1 == "ทั้งหมด" &&
|
filter_1 == "" &&
|
||||||
filter_2 == "ทั้งหมด" &&
|
filter_2 == "ทั้งหมด" &&
|
||||||
filterYear !== null
|
filterYear !== null
|
||||||
) {
|
) {
|
||||||
|
|
|
||||||
|
|
@ -207,9 +207,9 @@ const OrderTypeFilter = async () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
// รายการข้อมูลสถานะคำสั่ง
|
// รายการข้อมูลสถานะคำสั่ง
|
||||||
const OrderStatus = ref<string>("");
|
const OrderStatus = ref<string>("ทั้งหมด");
|
||||||
const OrderStatusOption = reactive<DataOption1[]>([
|
const OrderStatusOption = reactive<DataOption1[]>([
|
||||||
{ id: "", name: "ทั้งหมด" },
|
{ id: "ทั้งหมด", name: "ทั้งหมด" },
|
||||||
]);
|
]);
|
||||||
const addedOrderStatusValues: string[] = [];
|
const addedOrderStatusValues: string[] = [];
|
||||||
const OrderStatusFilter = async () => {
|
const OrderStatusFilter = async () => {
|
||||||
|
|
@ -245,13 +245,6 @@ const resetFilter = () => {
|
||||||
const attrs = ref<any>(useAttrs());
|
const attrs = ref<any>(useAttrs());
|
||||||
|
|
||||||
const searchFilterTable = async () => {
|
const searchFilterTable = async () => {
|
||||||
if (OrderType.value == "ทั้งหมด") {
|
|
||||||
OrderType.value = "";
|
|
||||||
}
|
|
||||||
if (OrderStatus.value == "ทั้งหมด") {
|
|
||||||
OrderStatus.value = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
// ส่งไป filter รายการข้อมูลตามเงื่อนไข
|
// ส่งไป filter รายการข้อมูลตามเงื่อนไข
|
||||||
await DataStore.DataUpdateOrder(
|
await DataStore.DataUpdateOrder(
|
||||||
OrderType.value,
|
OrderType.value,
|
||||||
|
|
@ -355,7 +348,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
|
||||||
map-options
|
map-options
|
||||||
option-label="name"
|
option-label="name"
|
||||||
:options="OrderTypeOption"
|
:options="OrderTypeOption"
|
||||||
option-value="name"
|
option-value="id"
|
||||||
lazy-rules
|
lazy-rules
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
:readonly="false"
|
:readonly="false"
|
||||||
|
|
@ -365,7 +358,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
|
||||||
@update:model-value="searchFilterTable"
|
@update:model-value="searchFilterTable"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12 col-sm-3 col-md-2">
|
<div class="col-xs-12 col-sm-3 col-md-3">
|
||||||
<q-select
|
<q-select
|
||||||
v-model="OrderStatus"
|
v-model="OrderStatus"
|
||||||
label="สถานะ"
|
label="สถานะ"
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@ const getData = async () => {
|
||||||
.get(config.API.msgInbox)
|
.get(config.API.msgInbox)
|
||||||
.then((res: any) => {
|
.then((res: any) => {
|
||||||
const data = res.data.result;
|
const data = res.data.result;
|
||||||
|
|
||||||
let list: DataInbox[] = [];
|
let list: DataInbox[] = [];
|
||||||
data.map((e: ResponseInbox) => {
|
data.map((e: ResponseInbox) => {
|
||||||
list.push({
|
list.push({
|
||||||
|
|
@ -53,7 +54,8 @@ const getData = async () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
inboxList.value = list;
|
inboxList.value = list;
|
||||||
if (inboxList.value) {
|
|
||||||
|
if (inboxList.value.length > 0) {
|
||||||
selectInbox(inboxList.value[0].no);
|
selectInbox(inboxList.value[0].no);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue