fix:add function calculateFiscalYear
This commit is contained in:
parent
70be19b5c4
commit
7877f26ac6
47 changed files with 131 additions and 68 deletions
|
|
@ -7,6 +7,7 @@ import http from "@/plugins/http";
|
|||
import config from "@/app.config";
|
||||
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 {
|
||||
|
|
@ -78,7 +79,7 @@ const profileId = ref<string>("");
|
|||
const rowId = ref<string>("");
|
||||
const formData = reactive({
|
||||
leaveTypeId: "", //ประเภทการลา
|
||||
leaveYear: findYear(new Date()), //ปี
|
||||
leaveYear: calculateFiscalYear(new Date()), //ปี
|
||||
leaveDays: "", //วันลาที่ยกมา
|
||||
leaveDaysUsed: "", //วันลาที่ใช้ไป
|
||||
});
|
||||
|
|
@ -191,7 +192,7 @@ function onClose() {
|
|||
formFilter.page = 1;
|
||||
formFilter.pageSize = 10;
|
||||
formData.leaveTypeId = "";
|
||||
formData.leaveYear = new Date().getFullYear();
|
||||
formData.leaveYear = calculateFiscalYear(new Date());
|
||||
formData.leaveDays = "";
|
||||
formData.leaveDaysUsed = "";
|
||||
rows.value = [];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue