fix:add function calculateFiscalYear
This commit is contained in:
parent
70be19b5c4
commit
7877f26ac6
47 changed files with 131 additions and 68 deletions
|
|
@ -8,6 +8,7 @@ import http from "@/plugins/http";
|
|||
import { useRouter } from "vue-router";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useRoute } from "vue-router";
|
||||
import { calculateFiscalYear } from "@/utils/function";
|
||||
|
||||
import type {
|
||||
DataOption,
|
||||
|
|
@ -47,7 +48,7 @@ const typeOps = ref<typeOp[]>([
|
|||
]);
|
||||
|
||||
const modalDialog = defineModel<boolean>("modal", { required: true });
|
||||
const yearDialog = ref<number | any>(new Date().getFullYear());
|
||||
const yearDialog = ref<number | any>(calculateFiscalYear(new Date())); //ปีงบประมาณ
|
||||
const roundDialgOp = ref<DataOption[]>([]);
|
||||
const isRoundClose = ref<boolean>(false);
|
||||
|
||||
|
|
@ -144,7 +145,7 @@ const columnsRespondent = ref<QTableProps["columns"]>([
|
|||
function onCloseDialog() {
|
||||
modalDialog.value = false;
|
||||
formRound.kpiPeriodId = { id: "", name: "", isClosed: false };
|
||||
yearDialog.value = new Date().getFullYear();
|
||||
yearDialog.value = calculateFiscalYear(new Date());
|
||||
rows.value = [];
|
||||
formRound.evaluatorId = "";
|
||||
formRound.commanderId = "";
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import config from "@/app.config";
|
|||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useKpiDataStore } from "@/modules/14_KPI/store";
|
||||
import { checkPermission } from "@/utils/permissions";
|
||||
import { calculateFiscalYear } from "@/utils/function";
|
||||
|
||||
/** importType*/
|
||||
import type { QTableProps } from "quasar";
|
||||
|
|
@ -133,7 +134,7 @@ const pagination = ref({
|
|||
});
|
||||
|
||||
/** ตัวแปร*/
|
||||
const year = ref<number | null>(new Date().getFullYear()); //ปีงบประมาณ
|
||||
const year = ref<number | null>(calculateFiscalYear(new Date())); //ปีงบประมาณ
|
||||
const roundOp = ref<DataOption[]>([]); // รายการรอบการประเมิน
|
||||
|
||||
/** function fetch รายการแผนพัฒนาการปฏิบัติราชการรายบุคคลย้อนหลัง*/
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import config from "@/app.config";
|
|||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useKpiDataStore } from "@/modules/14_KPI/store";
|
||||
import { checkPermission } from "@/utils/permissions";
|
||||
import { calculateFiscalYear } from "@/utils/function";
|
||||
|
||||
/** importType*/
|
||||
import type { QTableProps } from "quasar";
|
||||
|
|
@ -167,7 +168,7 @@ const pagination = ref({
|
|||
});
|
||||
|
||||
/** ตัวแปร*/
|
||||
const year = ref<number | null>(new Date().getFullYear()); //ปีงบประมาณ
|
||||
const year = ref<number | null>(calculateFiscalYear(new Date())); //ปีงบประมาณ
|
||||
const roundOp = ref<DataOption[]>([]); // รายการรอบการประเมิน
|
||||
const resultOp = ref<DataOption[]>(store.resultsOptions);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue