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

fix:add function calculateFiscalYear

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-10-01 15:20:45 +07:00
parent 70be19b5c4
commit 7877f26ac6
47 changed files with 131 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/09_leave/views/06_ReportMain.vue
View file

@ -8,6 +8,7 @@ import { useRoute } from "vue-router";
import { checkPermission } from "@/utils/permissions";
import { useCounterMixin } from "@/stores/mixin";
import { useStructureTree } from "@/stores/structureTree";
import { calculateFiscalYear } from "@/utils/function";
import genReportXLSX from "@/plugins/genreportxlsx";
import http from "@/plugins/http";
@ -39,7 +40,7 @@ const {
hideLoader,
} = useCounterMixin();
const year = ref<number>(new Date().getFullYear());
const year = ref<number>(calculateFiscalYear(new Date()));
const dateStart = ref<Date>(new Date(year.value - 1, 9, 1));
const dateEnd = ref<Date>(new Date(year.value + 1, 8, 30));
@ -354,7 +355,7 @@ function clearData() {
pdfSrc.value = undefined;
detailReport.value = undefined;
year.value = new Date().getFullYear();
year.value = calculateFiscalYear(new Date());
dateMonth.value = {
month: new Date().getMonth(),
year: new Date().getFullYear(),

3
src/modules/09_leave/views/07_LeaveHistoryMain.vue
View file

@ -9,6 +9,7 @@ import { checkPermission } from "@/utils/permissions";
import { updateCurrentPage } from "@/utils/function";
import { useCounterMixin } from "@/stores/mixin";
import { useLeaveHistoryDataStore } from "@/modules/09_leave/stores/LeaveHistoryStore";
import { calculateFiscalYear } from "@/utils/function";
import type { QTableColumn } from "quasar";
import type { DataPagination } from "@/modules/09_leave/interface/index/Main";
@ -26,7 +27,7 @@ const { showLoader, hideLoader, messageError, dialogRemove, success } =
useCounterMixin();
const formFilter = reactive({
year: findYear(new Date()),
year: calculateFiscalYear(new Date()),
type: "00000000-0000-0000-0000-000000000000",
page: 1,
pageSize: 10,