fix:add function calculateFiscalYear
This commit is contained in:
parent
70be19b5c4
commit
7877f26ac6
47 changed files with 131 additions and 68 deletions
|
|
@ -6,6 +6,7 @@ import { checkPermission } from "@/utils/permissions";
|
|||
import { updateCurrentPage } from "@/utils/function";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useSalaryDataStore } from "@/modules/13_salary/store/SalaryStore";
|
||||
import { calculateFiscalYear } from "@/utils/function";
|
||||
import config from "@/app.config";
|
||||
import http from "@/plugins/http";
|
||||
|
||||
|
|
@ -249,7 +250,7 @@ watch(
|
|||
|
||||
/** Hooklifecycle */
|
||||
onMounted(async () => {
|
||||
year.value = new Date().getFullYear();
|
||||
year.value = calculateFiscalYear(new Date());
|
||||
dataStore.visibleColumns = visibleColumns.value;
|
||||
dataStore.columns = columns.value;
|
||||
getData();
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import {
|
|||
} from "@/utils/permissions";
|
||||
import config from "@/app.config";
|
||||
import http from "@/plugins/http";
|
||||
import { calculateFiscalYear } from "@/utils/function";
|
||||
|
||||
/** importType*/
|
||||
import type {
|
||||
|
|
@ -36,7 +37,7 @@ const { messageError, showLoader, hideLoader, success, dialogConfirm } =
|
|||
useCounterMixin();
|
||||
|
||||
/** ตัวแปร*/
|
||||
const year = ref<number>(new Date().getFullYear()); //ปีงบประมาณ
|
||||
const year = ref<number>(calculateFiscalYear(new Date())); //ปีงบประมาณ
|
||||
const roundFilter = ref<any>(); //รอบการขึ้นเงินเดือน
|
||||
const agencyFilter = ref<string>(""); //หน่วยงาน
|
||||
const snapFilter = ref<string>(""); //รอบ
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import {
|
|||
} from "@/utils/permissions";
|
||||
import config from "@/app.config";
|
||||
import http from "@/plugins/http";
|
||||
import { calculateFiscalYear } from "@/utils/function";
|
||||
|
||||
/** importType*/
|
||||
import type {
|
||||
|
|
@ -35,7 +36,7 @@ const $q = useQuasar();
|
|||
const { messageError, showLoader, hideLoader } = useCounterMixin();
|
||||
|
||||
/** ตัวแปร*/
|
||||
const year = ref<number>(new Date().getFullYear()); //ปีงบประมาณ
|
||||
const year = ref<number>(calculateFiscalYear(new Date())); //ปีงบประมาณ
|
||||
const roundFilter = ref<any>(); //รอบการขึ้นเงินเดือน
|
||||
const agencyFilter = ref<string>(""); //หน่วยงาน
|
||||
const snapFilter = ref<string>(""); //รอบ
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue