diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index 655b9b247..36877c240 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -108,23 +108,33 @@ export default { // แต่งตั้ง-เลื่อน placemenAppointment, + appointmentMain: () => `${placement}/appointment`, + appointmentByid: (id: string) => `${placement}/appointment/${id}`, + appointmentDelete: (id: string) => `${placement}/appointment/${id}`, + appointmentPosition: (id: string) => `${placement}/appointment/position/${id}`, + apppointmentReport: (id: string) => `${placement}/appointment/report/${id}`, // ช่วยราชการ placemenHelpGov, officerMain: () => `${placement}/officer`, - officerDetail: (id:string) => `${placement}/officer/${id}`, - officerMainDelete: (id:string) => `${placement}/officer/${id}`, + officerDetail: (id: string) => `${placement}/officer/${id}`, + officerMainDelete: (id: string) => `${placement}/officer/${id}`, officerMainReport: () => `${placement}/officer/report`, // ส่งตัวกลับ placemenRepatriation, repatriationMain: () => `${placement}/repatriation`, - repatriationDetail: (id:string) => `${placement}/repatriation/${id}`, - repatriationMainDelete: (id:string) => `${placement}/repatriation/${id}`, + repatriationDetail: (id: string) => `${placement}/repatriation/${id}`, + repatriationMainDelete: (id: string) => `${placement}/repatriation/${id}`, repatriationMainReport: () => `${placement}/repatriation/report`, // ขอย้าย placemenRelocation, // อื่นๆ placemenOther, + otherMain: () => `${placemenOther}`, + otherPosition: (id: string) => `${placemenOther}/position/${id}`, + otherReport: (id: string) => `${placemenOther}/report/${id}`, + otherByid: (id: string) => `${placemenOther}/${id}`, + }; diff --git a/src/modules/05_placement/components/AppointMent/AppointmentModal.vue b/src/modules/05_placement/components/AppointMent/AppointmentModal.vue new file mode 100644 index 000000000..8625c2b2a --- /dev/null +++ b/src/modules/05_placement/components/AppointMent/AppointmentModal.vue @@ -0,0 +1,803 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + {{ prop.node.organizationName }} + + + + + + + + + + + {{ prop.node.governmentCode }} + {{ prop.node.organizationShortName }} + + + + + + + + + + + + + ว่าง + + + + + {{ prop.node.name }} + + + + + + {{ prop.node.name }} + + + + + {{ prop.node.positionName }} + + + {{ prop.node.positionNum }} + + + {{ prop.node.positionLevel }} + + + + + + + + + + + + + + + + + + + {{ year + 543 }} + {{ + parseInt(value + 543) + }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue new file mode 100644 index 000000000..c06310ff1 --- /dev/null +++ b/src/modules/05_placement/components/AppointMent/Detail.vue @@ -0,0 +1,446 @@ + + + + + รายละเอียดการแต่งตั้ง-เลื่อน {{ title.fullname }} + + + + + {{ title.fullname }} + + + + + + + + + + + + + + ตำแหน่งในสายงาน + + {{ title.positionTypeOld }} + + + + + + ระดับ + + {{ title.positionLevelOld }} + + + + + + สังกัด + + {{ title.organizationPositionOld }} + + + + + + + + + + + แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย + + + + + + + + + + + + + + + วุฒิการศึกษา + + + + + + + + + + + ตำแหน่งและหน่วยงานเดิม + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ year + 543 }} + {{ + parseInt(value + 543) + }} + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/05_placement/components/AppointMent/DialogHeader.vue b/src/modules/05_placement/components/AppointMent/DialogHeader.vue new file mode 100644 index 000000000..a20e917b0 --- /dev/null +++ b/src/modules/05_placement/components/AppointMent/DialogHeader.vue @@ -0,0 +1,29 @@ + + + + {{ title }} + + + + + diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue new file mode 100644 index 000000000..2aa65f1e8 --- /dev/null +++ b/src/modules/05_placement/components/AppointMent/Main.vue @@ -0,0 +1,734 @@ + + + + รายการแต่งตั้ง-เลื่อน + + + + + + + + + + ส่งไปออกคำสั่งแต่งตั้ง-เลื่อน + + + + + + + + + + + + + + + + + + + {{ col.label }} + + + + + + + + {{ props.rowIndex + 1 }} + + + {{ props.row.citizenId }} + + + {{ props.row.fullname }} + + + + + + {{ + props.row.orgName !== null ? props.row.orgName : "-" + }} + {{ + props.row.organizationShortName !== null + ? `(${props.row.organizationShortName})` + : "" + }} + + + {{ + props.row.positionPath !== null + ? props.row.positionPath + : "-" + }} + {{ + props.row.positionNumber !== null + ? `(${props.row.positionNumber})` + : "" + }} + + + + + + - + + + + + {{ props.row.birthday }} + + + {{ props.row.status }} + + + + + + + + + + เลือกหน่วยงานที่รับโอน + + + + ลบข้อมูล + + + ลบ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ props.rowIndex + 1 }} + + + {{ props.row.citizenId }} + + + {{ props.row.fullname }} + + + + + + {{ props.row.orgName !== null ? props.row.orgName : "-" }} + {{ + props.row.organizationShortName !== null + ? `(${props.row.organizationShortName})` + : "" + }} + + + {{ + props.row.positionPath !== null + ? props.row.positionPath + : "-" + }} + {{ + props.row.positionNumber !== null + ? `(${props.row.positionNumber})` + : "" + }} + + + + + + - + + + + + {{ props.row.birthday }} + + + + + + + + + + + + + + + + diff --git a/src/modules/05_placement/components/Other/Detail.vue b/src/modules/05_placement/components/Other/Detail.vue new file mode 100644 index 000000000..a03165d3c --- /dev/null +++ b/src/modules/05_placement/components/Other/Detail.vue @@ -0,0 +1,135 @@ + + + + + + รายละเอียดรายการอื่นๆ {{ title.fullname }} + + + + + {{ title.fullname }} + + + + + + + + + + + + + + ตำแหน่งในสายงาน + + {{ title.positionTypeOld }} + + + + + + ระดับ + + {{ title.positionLevelOld }} + + + + + + สังกัด + + {{ title.organizationPositionOld }} + + + + + + + + + diff --git a/src/modules/05_placement/components/Other/DialogHeader.vue b/src/modules/05_placement/components/Other/DialogHeader.vue new file mode 100644 index 000000000..a20e917b0 --- /dev/null +++ b/src/modules/05_placement/components/Other/DialogHeader.vue @@ -0,0 +1,29 @@ + + + + {{ title }} + + + + + diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue new file mode 100644 index 000000000..2e7b50c3c --- /dev/null +++ b/src/modules/05_placement/components/Other/Main.vue @@ -0,0 +1,735 @@ + + + รายการอื่นๆ + + + + + + + + + ส่งไปออกคำสั่งรายการอื่นๆ + + + + + + + + + + + + + + + + + + + {{ col.label }} + + + + + + + + {{ props.rowIndex + 1 }} + + + {{ props.row.citizenId }} + + + {{ props.row.fullname }} + + + + + + {{ + props.row.orgName !== null ? props.row.orgName : "-" + }} + {{ + props.row.organizationShortName !== null + ? `(${props.row.organizationShortName})` + : "" + }} + + + {{ + props.row.positionPath !== null + ? props.row.positionPath + : "-" + }} + {{ + props.row.positionNumber !== null + ? `(${props.row.positionNumber})` + : "" + }} + + + + + + - + + + + + {{ props.row.birthday }} + + + {{ props.row.status }} + + + + + + + + + + เลือกหน่วยงานที่รับโอน + + + + ลบข้อมูล + + + ลบ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ props.rowIndex + 1 }} + + + {{ props.row.citizenId }} + + + {{ props.row.fullname }} + + + + + + {{ props.row.orgName !== null ? props.row.orgName : "-" }} + {{ + props.row.organizationShortName !== null + ? `(${props.row.organizationShortName})` + : "" + }} + + + {{ + props.row.positionPath !== null + ? props.row.positionPath + : "-" + }} + {{ + props.row.positionNumber !== null + ? `(${props.row.positionNumber})` + : "" + }} + + + + + + - + + + + + {{ props.row.birthday }} + + + + + + + + + + + + + + + + diff --git a/src/modules/05_placement/components/Other/OtherModal.vue b/src/modules/05_placement/components/Other/OtherModal.vue new file mode 100644 index 000000000..b39a8d1a8 --- /dev/null +++ b/src/modules/05_placement/components/Other/OtherModal.vue @@ -0,0 +1,799 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + {{ prop.node.organizationName }} + + + + + + + + + + + {{ prop.node.governmentCode }} + {{ prop.node.organizationShortName }} + + + + + + + + + + + + ว่าง + + + + + {{ prop.node.name }} + + + + + + {{ prop.node.name }} + + + + + {{ prop.node.positionName }} + + + {{ prop.node.positionNum }} + + + {{ prop.node.positionLevel }} + + + + + + + + + + + + + + + + + + + {{ year + 543 }} + {{ + parseInt(value + 543) + }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index 639e5a7b7..662b19093 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -57,6 +57,12 @@ const FormSaveResultAdd = () => import( "@/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue" ); +//แต่งตั้ง-เลื่อน +const AppointmentMain = () => import("@/modules/05_placement/components/AppointMent/Main.vue"); +const AppointmentDetail = () => import("@/modules/05_placement/components/AppointMent/Detail.vue"); +//อื่นๆ +const OtherMain = () => import("@/modules/05_placement/components/Other/Main.vue") +const OthertDetail = () => import("@/modules/05_placement/components/Other/Detail.vue"); export default [ { @@ -269,4 +275,44 @@ export default [ Role: "placement", }, }, + { + path: "appoint-promote", + name: "appoint-promote", + component: AppointmentMain, + meta: { + Auth: true, + Key: [6.8], + Role: "placement", + }, + }, + { + path: "appoint-promote/detail/:id", + name: "appoint-promote-detail", + component: AppointmentDetail, + meta: { + Auth: true, + Key: [6.8], + Role: "placement", + }, + }, + { + path: "other", + name: "other", + component: OtherMain, + meta: { + Auth: true, + Key: [6.9], + Role: "placement", + }, + }, + { + path: "other/detail/:id", + name: "other-detail", + component: OthertDetail, + meta: { + Auth: true, + Key: [6.9], + Role: "placement", + }, + }, ];