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/15_development/views/EmployeeHistory.vue
View file

@ -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) => {

3
src/modules/15_development/views/History.vue
View file

@ -9,6 +9,7 @@ import genReportXLSX from "@/plugins/genreportxlsx";
import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
import { useCounterMixin } from "@/stores/mixin";
import { checkPermission } from "@/utils/permissions";
import { calculateFiscalYear } from "@/utils/function";
/**
* importType
@ -32,7 +33,7 @@ const formFilter = reactive({
page: 1,
pageSize: 10,
keyword: "",
year: new Date().getFullYear(),
year: calculateFiscalYear(new Date()), //ปีงบประมาณ
});
const agencyOp = ref<DataOption[]>([]); // หน่วยงาน

3
src/modules/15_development/views/MainPage.vue
View file

@ -11,6 +11,7 @@ import genReportXLSX from "@/plugins/genreportxlsx";
import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
import { useCounterMixin } from "@/stores/mixin";
import { updateCurrentPage } from "@/utils/function";
import { calculateFiscalYear } from "@/utils/function";
/**importType*/
import type {
@ -107,7 +108,7 @@ const formProject = reactive<FormProject>({
/** formQuery */
const formQuery = reactive<FormQueryListProject>({
year: new Date().getFullYear(),
year: calculateFiscalYear(new Date()), //ปีงบประมาณ
page: 1,
pageSize: 10,
org: "1",

3
src/modules/15_development/views/Scholarship.vue
View file

@ -8,6 +8,7 @@ import config from "@/app.config";
import { checkPermission } from "@/utils/permissions";
import { useCounterMixin } from "@/stores/mixin";
import genReportXLSX from "@/plugins/genreportxlsx";
import { calculateFiscalYear } from "@/utils/function";
import type {
DataOption,
@ -143,7 +144,7 @@ const scholarshipTypeOp = ref<DataOption[]>([
const formQuery = reactive({
page: 1,
pageSize: 10,
year: new Date().getFullYear(),
year: calculateFiscalYear(new Date()), //ปีงบประมาณ
type: "DOMESTICE",
keyword: "",
});