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 { useStructureTree } from "@/stores/structureTree";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { calculateFiscalYear } from "@/utils/function";
|
||||
|
||||
/** importType*/
|
||||
import type { FormBasicinfo } from "@/modules/15_development/interface/request/Main";
|
||||
|
|
@ -34,7 +35,7 @@ const checkRoutePermission = ref<boolean>(
|
|||
); // check ชื่อ route
|
||||
|
||||
const formData = reactive<FormBasicinfo>({
|
||||
year: new Date().getFullYear(), //ปี
|
||||
year: calculateFiscalYear(new Date()), //ปี
|
||||
projectName: "", //ชืื่อ
|
||||
reason: "", //หลักการเเละเหตุผล
|
||||
objective: "", //วัตถุประสงค์
|
||||
|
|
@ -47,7 +48,7 @@ const orgName = ref<string>(""); //ชื่อ หน่วยงาน/ส่
|
|||
const node = ref<any[]>([]); //โครงสร้าง หน่วยงาน/ส่วนราชการ
|
||||
const filter = ref<string>(""); //input ค้นหา
|
||||
const expanded = ref<string[]>([]);
|
||||
const nodeDnaId = ref<string>('');
|
||||
const nodeDnaId = ref<string>("");
|
||||
|
||||
/**
|
||||
* function fetch ข้อมูลเบื้องต้น
|
||||
|
|
@ -67,7 +68,7 @@ async function fetchData(id: string) {
|
|||
formData.nodeId = data.nodeId;
|
||||
formData.node = data.node;
|
||||
formData.orgRevisionId = data.revisionId;
|
||||
nodeDnaId.value = data.nodeDnaId
|
||||
nodeDnaId.value = data.nodeDnaId;
|
||||
|
||||
const arrayExpanded = [
|
||||
data.root,
|
||||
|
|
@ -126,7 +127,7 @@ function updateSelected(data: DataTree) {
|
|||
formData.node = data.orgLevel;
|
||||
formData.nodeId = data.orgTreeId;
|
||||
formData.orgRevisionId = data.orgRevisionId;
|
||||
nodeDnaId.value = data.orgTreeDnaId
|
||||
nodeDnaId.value = data.orgTreeDnaId;
|
||||
props.onCheckChangeData();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue