fix:add function calculateFiscalYear
This commit is contained in:
parent
70be19b5c4
commit
7877f26ac6
47 changed files with 131 additions and 68 deletions
|
|
@ -9,6 +9,7 @@ import { useRoute, useRouter } from "vue-router";
|
|||
import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { checkPermission } from "@/utils/permissions";
|
||||
import { calculateFiscalYear } from "@/utils/function";
|
||||
|
||||
import type {
|
||||
NewPagination,
|
||||
|
|
@ -29,7 +30,7 @@ const formFilter = reactive({
|
|||
page: 1,
|
||||
pageSize: 10,
|
||||
keyword: "",
|
||||
year: new Date().getFullYear(),
|
||||
year: calculateFiscalYear(new Date()), //ปีงบประมาณ
|
||||
});
|
||||
|
||||
const pagination = ref({
|
||||
|
|
@ -195,7 +196,7 @@ function onEdit(id: string) {
|
|||
/** ดึงข้อมูล */
|
||||
async function getData() {
|
||||
showLoader();
|
||||
formFilter.keyword = formFilter.keyword.trim()
|
||||
formFilter.keyword = formFilter.keyword.trim();
|
||||
await http
|
||||
.post(config.API.developmentHistoryList("employee"), formFilter)
|
||||
.then((res) => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue