diff --git a/src/modules/05_placement/components/exams_other/Detail.vue b/src/modules/05_placement/components/exams_other/Detail.vue new file mode 100644 index 000000000..f77c1728b --- /dev/null +++ b/src/modules/05_placement/components/exams_other/Detail.vue @@ -0,0 +1,73 @@ + + + + \ No newline at end of file diff --git a/src/modules/05_placement/components/exams_other/DialogFooter.vue b/src/modules/05_placement/components/exams_other/DialogFooter.vue new file mode 100644 index 000000000..9bfa25774 --- /dev/null +++ b/src/modules/05_placement/components/exams_other/DialogFooter.vue @@ -0,0 +1,93 @@ + + diff --git a/src/modules/05_placement/components/exams_other/DialogHeader.vue b/src/modules/05_placement/components/exams_other/DialogHeader.vue new file mode 100644 index 000000000..bf1bff6de --- /dev/null +++ b/src/modules/05_placement/components/exams_other/DialogHeader.vue @@ -0,0 +1,27 @@ + + diff --git a/src/modules/05_placement/components/exams_other/Education.vue b/src/modules/05_placement/components/exams_other/Education.vue new file mode 100644 index 000000000..726596805 --- /dev/null +++ b/src/modules/05_placement/components/exams_other/Education.vue @@ -0,0 +1,1381 @@ + + + + diff --git a/src/modules/05_placement/components/exams_other/ExamResult.vue b/src/modules/05_placement/components/exams_other/ExamResult.vue new file mode 100644 index 000000000..ae4564dc4 --- /dev/null +++ b/src/modules/05_placement/components/exams_other/ExamResult.vue @@ -0,0 +1,101 @@ + + + \ No newline at end of file diff --git a/src/modules/05_placement/components/exams_other/Information/Address.vue b/src/modules/05_placement/components/exams_other/Information/Address.vue new file mode 100644 index 000000000..9f49214a1 --- /dev/null +++ b/src/modules/05_placement/components/exams_other/Information/Address.vue @@ -0,0 +1,834 @@ + + + \ No newline at end of file diff --git a/src/modules/05_placement/components/exams_other/Information/Certicate.vue b/src/modules/05_placement/components/exams_other/Information/Certicate.vue new file mode 100644 index 000000000..41663f571 --- /dev/null +++ b/src/modules/05_placement/components/exams_other/Information/Certicate.vue @@ -0,0 +1,828 @@ + + + + diff --git a/src/modules/05_placement/components/exams_other/Information/Information.vue b/src/modules/05_placement/components/exams_other/Information/Information.vue new file mode 100644 index 000000000..2f280eb6c --- /dev/null +++ b/src/modules/05_placement/components/exams_other/Information/Information.vue @@ -0,0 +1,992 @@ + + + \ No newline at end of file diff --git a/src/modules/05_placement/components/exams_other/Information/layout.vue b/src/modules/05_placement/components/exams_other/Information/layout.vue new file mode 100644 index 000000000..6e277187c --- /dev/null +++ b/src/modules/05_placement/components/exams_other/Information/layout.vue @@ -0,0 +1,51 @@ + + + diff --git a/src/modules/05_placement/components/exams_other/Information/top.vue b/src/modules/05_placement/components/exams_other/Information/top.vue new file mode 100644 index 000000000..807a8d143 --- /dev/null +++ b/src/modules/05_placement/components/exams_other/Information/top.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/modules/05_placement/components/exams_other/Insignia.vue b/src/modules/05_placement/components/exams_other/Insignia.vue new file mode 100644 index 000000000..e7b8f2624 --- /dev/null +++ b/src/modules/05_placement/components/exams_other/Insignia.vue @@ -0,0 +1,1199 @@ + + + diff --git a/src/modules/05_placement/components/exams_korkor/Main.vue b/src/modules/05_placement/components/exams_other/Main.vue similarity index 99% rename from src/modules/05_placement/components/exams_korkor/Main.vue rename to src/modules/05_placement/components/exams_other/Main.vue index 92f8ea3b1..d1627d0e8 100644 --- a/src/modules/05_placement/components/exams_korkor/Main.vue +++ b/src/modules/05_placement/components/exams_other/Main.vue @@ -170,13 +170,8 @@ onMounted(async () => { }) // ดูรายการสอบแข่งขัน หน้าต่อไป -const redirectToPage = (id: number) => { - router.push({ - name: 'placementDetail', - params: { - id: id - } - }); +const redirectToPage = (id?: number) => { + router.push(`/placement2/detail`); }; // เลือกปีงบประมาณ diff --git a/src/modules/05_placement/components/exams_other/Qualification.vue b/src/modules/05_placement/components/exams_other/Qualification.vue new file mode 100644 index 000000000..83337eaa3 --- /dev/null +++ b/src/modules/05_placement/components/exams_other/Qualification.vue @@ -0,0 +1,84 @@ + + + \ No newline at end of file diff --git a/src/modules/05_placement/components/exams_other/Table.vue b/src/modules/05_placement/components/exams_other/Table.vue new file mode 100644 index 000000000..85c5d5443 --- /dev/null +++ b/src/modules/05_placement/components/exams_other/Table.vue @@ -0,0 +1,201 @@ + + + diff --git a/src/modules/05_placement/components/exams_other/profileType.ts b/src/modules/05_placement/components/exams_other/profileType.ts new file mode 100644 index 000000000..9ba368651 --- /dev/null +++ b/src/modules/05_placement/components/exams_other/profileType.ts @@ -0,0 +1,171 @@ +//interface class array object {name string ,id number} + +import type { childrenFamily } from "@/modules/04_registry/interface/response/Family"; +interface ChangeActive { + name: string; + id: number; +} + +//ข้อมูลส่วนตัว +interface Information { + cardid: string | null; + prefix: string | null; + age: string | null; + prefixId: string | null; + firstname: string | null; + lastname: string | null; + birthDate: Date; + genderId: string | null; + bloodId: string | null; + nationality: string | null; + ethnicity: string | null; + statusId: string | null; + religionId: string | null; + tel: string | null; + employeeType: string | null; + employeeClass: string | null; + profileType: string | null; +} + +interface Family { + prefixC: string | null; // couple + prefixIdC: string | null; + firstnameC: string | null; + lastnameC: string | null; + lastnameCOld: string | null; + occupationC: string | null; + prefixM: string | null; // male + prefixIdM: string | null; + firstnameM: string | null; + lastnameM: string | null; + occupationM: string | null; + prefixF: string | null; // female + prefixIdF: string | null; + firstnameF: string | null; + lastnameF: string | null; + occupationF: string | null; + same: string | null; + childrens: childrenFamily[]; +} + +interface Address { + address: string | null; + provinceId: string | null; + districtId: string | null; + subdistrictId: string | null; + addressC: string | null; + provinceIdC: string | null; + districtIdC: string | null; + subdistrictIdC: string | null; + same: string | null; +} + +interface Goverment { + ocId: string | null; + positionId: string | null; + workId: string | null; + typeId: string | null; + levelId: string | null; + numberId: string | null; + businessId: string | null; + containDate: Date; + workDate: Date; + retireDate: string | null; + absent: number | null; + age: number | null; + ageAll: string | null; + reasonSameDate: string | null; +} + +interface DataOption { + id: string | number; + name: string; + zipCode?: string; +} + +interface zipCodeOption { + id: string; + name: string; + zipCode: string; +} + +const defaultGoverment: Goverment = { + ocId: null, + positionId: null, + workId: null, + typeId: null, + levelId: null, + numberId: null, + businessId: null, + containDate: new Date(), + workDate: new Date(), + retireDate: null, + absent: 0, + age: 0, + ageAll: null, + reasonSameDate: null, +}; + +const defaultAddress: Address = { + address: null, + provinceId: null, + districtId: null, + subdistrictId: null, + addressC: null, + provinceIdC: null, + districtIdC: null, + subdistrictIdC: null, + same: "0", +}; + +const defaultInformation: Information = { + cardid: null, + age: null, + prefix: null, + prefixId: null, + firstname: null, + lastname: null, + birthDate: new Date(), + genderId: null, + bloodId: null, + nationality: null, + ethnicity: null, + statusId: null, + religionId: null, + tel: null, + employeeType: null, + employeeClass: null, + profileType: null, +}; + +const defaultFamily: Family = { + prefixC: null, + prefixIdC: null, + firstnameC: null, + lastnameC: null, + lastnameCOld: null, + occupationC: null, + prefixM: null, + prefixIdM: null, + firstnameM: null, + lastnameM: null, + occupationM: null, + prefixF: null, + prefixIdF: null, + firstnameF: null, + lastnameF: null, + occupationF: null, + same: "0", + childrens: [], +}; + +export { defaultInformation, defaultFamily, defaultAddress, defaultGoverment }; +export type { + ChangeActive, + Information, + Family, + Address, + Goverment, + DataOption, + zipCodeOption, +}; diff --git a/src/modules/05_placement/components/exams_sorkorcho/Main.vue b/src/modules/05_placement/components/exams_sorkorcho/Main.vue index 92f8ea3b1..c4a78ea29 100644 --- a/src/modules/05_placement/components/exams_sorkorcho/Main.vue +++ b/src/modules/05_placement/components/exams_sorkorcho/Main.vue @@ -170,13 +170,9 @@ onMounted(async () => { }) // ดูรายการสอบแข่งขัน หน้าต่อไป -const redirectToPage = (id: number) => { - router.push({ - name: 'placementDetail', - params: { - id: id - } - }); +const redirectToPage = (id?: number) => { + // router.push({ name: 'placementDetail'}); + router.push(`/placement/detail`); }; // เลือกปีงบประมาณ diff --git a/src/modules/05_placement/components/pass/Table.vue b/src/modules/05_placement/components/pass/Table.vue index ca8b3c606..3ad89235c 100644 --- a/src/modules/05_placement/components/pass/Table.vue +++ b/src/modules/05_placement/components/pass/Table.vue @@ -234,10 +234,10 @@ const templateDetail = async () => { }; const appointModal = ref(false); -const nodeTree = async (isDraft: boolean) => { +const nodeTree = async () => { showLoader(); await http - .get(config.API.getDraftTreeRoot) + .get(config.API.getTreeRoot) .then((res) => { const data = res.data.result; nodesTree.value = data; @@ -287,7 +287,7 @@ const clickEditRow = () => { }; const getClass = (val: boolean) => { return { - "full-width inputgreen cursor-pointer": val, + "full-width inputgreen cursor-pointer ": val, "full-width cursor-pointer": !val, }; }; @@ -371,7 +371,7 @@ placementData.mappingPosition.columns.length == 0 const columns = ref([ { name: "position", - align: "left", + align: "center", label: "ลำดับ", sortable: true, field: "position", @@ -391,7 +391,7 @@ const columns = ref([ }, { name: "ExamOrder", - align: "left", + align: "center", label: "ลำดับที่สอบได้", sortable: true, field: "ExamOrder", @@ -422,7 +422,7 @@ const columns = ref([ }, { name: "BMAOfficer", - align: "left", + align: "center", label: "ข้าราชการฯ กทม.", sortable: true, field: "BMAOfficer", @@ -1067,7 +1067,6 @@ onMounted(async () => { // await fetchData(); }); const fetchChildrenByParentId = async (node: any) => { - // console.log(isDraft); console.log("Call API4"); showLoader(); let request = ""; @@ -1094,6 +1093,17 @@ const onLazyLoad = (node: any) => { node.done(node.node.children); //return ค่าให้ q-tree generate children }, 10); }; +const listKeyId = (data: any) => { + const { node } = data; + console.log("test", node); + posNoId.value = node.positionNum; + positionId.value = node.positionName; + positionPathSideId.value = node.executivePositionSide; + positionTypeId.value = node.positionType; + positionLineId.value = node.organizationName; + positionLevelId.value = node.positionLevel; + return node.keyId; +};