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

3
src/modules/04_registryPerson/components/TableView.vue
View file

@ -5,6 +5,7 @@ import { checkPermission } from "@/utils/permissions";
import { useRoute, useRouter } from "vue-router";
import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
import { useCounterMixin } from "@/stores/mixin";
import { calculateFiscalYear } from "@/utils/function";
/** importType*/
import { useQuasar, type QTableProps } from "quasar";
@ -44,7 +45,7 @@ const rangeAge = ref<RangeAge>({
const objMarkerLabel = computed(() => {
return { 39: `ช่วงอายุ ${rangeAge.value.min}-${rangeAge.value.max} ปี` };
});
const year = ref<number>(new Date().getFullYear());
const year = ref<number>(calculateFiscalYear(new Date()));
//ตัวแปร
const modalHistory = ref<boolean>(false); //ประวัติถือครองตำแหน่ง

5
src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
View file

@ -7,6 +7,7 @@ import { checkPermission } from "@/utils/permissions";
import { useCounterMixin } from "@/stores/mixin";
import { useResultsPerformDataStore } from "@/modules/04_registryPerson/stores/ResultsPerformance";
import { usePagination } from "@/composables/usePagination";
import { calculateFiscalYear } from "@/utils/function";
import http from "@/plugins/http";
import config from "@/app.config";
@ -45,7 +46,7 @@ const profileId = ref<string>(
route.params.id ? route.params.id.toString() : ""
);
const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
const year = ref<number | null>(new Date().getFullYear()); //ปีงบประมาณ
const year = ref<number | null>(calculateFiscalYear(new Date())); //ปีงบประมาณ
const id = ref<string>(""); //id ที่ต้องการแก้ไข
const typeIDP = ref<string>("");
const isEdit = ref<boolean>(false); //สถานะการแก้ไขข้อมูล
@ -494,7 +495,7 @@ function clearData() {
resPerformForm.pointSumTotal = 0;
resPerformForm.pointSum = 0;
resPerformForm.date = null;
year.value = new Date().getFullYear();
year.value = calculateFiscalYear(new Date());
}
/**