diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index f69824fe8..f844d90b4 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -8,7 +8,7 @@ const placemenHelpGov = `${placement}/officer`; const placemenRepatriation = `${placement}/repatriation`; const placemenRelocation = `${placement}/relocation`; const placemenOther = `${env.API_URI}/retirement/other`; -const placemenAppointment = `${env.API_URI}/retirement/appointment`; +const placemenAppointment = `${placement}/appointment`; export default { MainDetail: (year: number) => `${placement}/exam/${year}`, @@ -93,6 +93,7 @@ export default { //receive ระบบรับโอน receiveData: () => `${receive}`, + receiveReport: `${receive}/report`, receiveDataId: (id: string) => `${receive}/${id}`, receivePosition: (id: string) => `${receive}/position/${id}`, @@ -104,18 +105,43 @@ export default { transferUserId: (id: string) => `${transfer}/user/${id}`, transferConfirmId: (id: string) => `${transfer}/confirm/${id}`, + // แต่งตั้ง-เลื่อน 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}`, + officerMainReport: () => `${placement}/officer/report`, + officerMainEdit: (id:string) => `${placemenHelpGov}/${id}`, // ส่งตัวกลับ placemenRepatriation, - + repatriationMain: () => `${placement}/repatriation`, + repatriationDetail: (id: string) => `${placement}/repatriation/${id}`, + repatriationMainDelete: (id: string) => `${placement}/repatriation/${id}`, + repatriationMainReport: () => `${placement}/repatriation/report`, + repatriationMainEdit: (id:string) => `${placemenRepatriation}/${id}`, // ขอย้าย placemenRelocation, - + relocationMain: () => `${placement}/relocation`, + relocationDetail: (id:string) => `${placement}/relocation/${id}`, + relocationMainDelete: (id:string) => `${placement}/relocation/${id}`, + relocationMainReport: () => `${placement}/relocation/report`, + relocationMainPut: (id:string) => `${placement}/relocation/position/${id}`, + relocationMainEdit: (id:string) => `${placemenRelocation}/${id}`, // อื่นๆ placemenOther, + otherMain: () => `${placemenOther}`, + otherPosition: (id: string) => `${placemenOther}/position/${id}`, + otherReport: (id: string) => `${placemenOther}/report/${id}`, + otherByid: (id: string) => `${placemenOther}/${id}`, + }; diff --git a/src/api/05_placement/api.probation.ts b/src/api/05_placement/api.probation.ts index 99f49901c..6cf5144e4 100644 --- a/src/api/05_placement/api.probation.ts +++ b/src/api/05_placement/api.probation.ts @@ -3,6 +3,8 @@ const dataOptions = `${env.API_PROBATION_URI}/data-options`; const personal = `${env.API_PROBATION_URI}/personal`; const calculate = `${env.API_PROBATION_URI}/calculate`; const finish = `${env.API_PROBATION_URI}/assign`; +const evaluate = `${env.API_PROBATION_URI}`; + export default { competencyOptions: (personalId: string) => @@ -25,6 +27,36 @@ export default { personalAdd: () => `${personal}/add`, probationGetAssignList: (personalId:string) => `${finish}/probation-assign-list?personal_id=${personalId}`, - probationsGetAssign: (assignId:string) =>`${finish}/probation-assign?assign_id=${assignId}` + probationsGetAssign: (assignId:string) =>`${finish}/probation-assign?assign_id=${assignId}`, + // probationGetAssignList: (personalId: string) => + // `${finish}/probation-assign-list?personal_id=${personalId}`, // clearPosition: (personalId:string) => `${placement}/position/clear/${personalId}` + + // บันทึกผล + formevaluate: (id: string) => `${evaluate}/evaluate-record?assign_id=${id}`, + formevaluateround: (id: string, no: string) => `${evaluate}/evaluate-record?assign_id=${id}&evaluate_no=${no}`, + formevaluateRecord: (id: string) => `${evaluate}/evaluate-record/create?assign_id=${id}`, + createformevaluate: (id: string) => `${evaluate}/evaluate-record?id=${id}`, + + //แบบประเมินผล (ผู้บังคับบัญชา) + evaluateCreate: (id: string) => `${evaluate}/evaluate/create?assign_id=${id}`, + evaluatecommader: (id: string, no: string) => `${evaluate}/evaluate?assign_id=${id}&evaluate_no=${no}`, + createformCommader: (id: string) => `${evaluate}/evaluate?id=${id}`, + + //แบบประเมินผล (คณะกรรมการ) + evaluateChairman: (id: string) => `${evaluate}/evaluate-chairman/create?assign_id=${id}`, + evaluateRoundChairman: (id: string, no: string) => `${evaluate}/evaluate-chairman?assign_id=${id}&evaluate_no=${no}`, + createformChairman: (id: string) => `${evaluate}/evaluate-chairman?id=${id}`, + + //แบบรายงาน + evaluateReportcreate: (id: string) => `${evaluate}/evaluate-result/create?assign_id=${id}`, + evaluateReport: (id: string) => `${evaluate}/evaluate-result?assign_id=${id}`, + createformReport: (id: string) => `${evaluate}/evaluate-result?id=${id}`, + + + + + + + }; diff --git a/src/api/index.ts b/src/api/index.ts index 4b6fabe6d..bbe765fc9 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -26,7 +26,9 @@ const config = ref({ "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230712_172702.json", MEET_URI: "meet.frappet.com", API_RETIREMENT_URI: "https://bma-ehr.frappet.synology.me/api/v1", - API_PROBATION_URI: "https://ehr.joolsoft.com/v1", + // API_PROBATION_URI: "https://ehr.joolsoft.com/v1", + API_PROBATION_URI: "https://bmaehr.joolsoft.com/nodeapi/v1", + // API_PROBATION_URI: "http://192.168.1.151:7776/v1", }, test: { API_URI: "http://localhost:5010/api/v1", diff --git a/src/modules/04_registry/components/Information/Certicate.vue b/src/modules/04_registry/components/Information/Certicate.vue index 009b7a290..43bc56bed 100644 --- a/src/modules/04_registry/components/Information/Certicate.vue +++ b/src/modules/04_registry/components/Information/Certicate.vue @@ -292,7 +292,7 @@ const store = useProfileDataStore(); const { profileData, changeProfileColumns } = store; const mixin = useCounterMixin(); -const { date2Thai, success, dateToISO, messageError } = mixin; +const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } = mixin; const route = useRoute(); const id = ref(""); const certificateNo = ref(); diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index b2cda7dd5..2cde4cabd 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -6,17 +6,10 @@ v-model:statusEdit="statusEdit" :profileType="profileType" /> --> - +
- +
@@ -40,20 +33,11 @@
- +
- - + +
@@ -78,70 +62,29 @@
- -
- + +
+ - - -
+ + +
อัปเดตรูปภาพ - +
-
+
อัปเดตรูปภาพ - +
@@ -157,25 +100,25 @@ - + ช่วยราชการ - + ส่งตัวกลับ - + แต่งตั้ง-เลื่อน - + ย้าย @@ -187,25 +130,25 @@ ถึงแก่กรรม - + ให้ออกจากราชการ - + ปลดออกจากราชการ - + ไล่ออกจากราชการ - + อื่นๆ @@ -215,15 +158,8 @@ - + {{ reasonStatus ? "การกลับเข้ารับราชการ" : "การออกจากราชการ" }} @@ -237,9 +173,7 @@ ก.พ.7/ก.ก.1 - ประวัติแบบย่อ + ประวัติแบบย่อ @@ -251,20 +185,8 @@ - - + + -
+
{{ date2Thai(n.createdDate) }} - +
@@ -398,14 +277,7 @@ > ลบรูปภาพ --> - + เลือกรูปภาพ @@ -419,38 +291,18 @@
- + - + - + @@ -458,63 +310,32 @@ {{ parseInt(value + 543) }} - + - +
- + บันทึก
@@ -532,71 +353,34 @@ - ประเภทการพ้นราชการ + ประเภทการพ้นราชการ - + -
+
- +
- + diff --git a/src/modules/05_placement/components/probation/MainDetail.vue b/src/modules/05_placement/components/probation/MainDetail.vue index 0eade7fc3..8ad5c3a0f 100644 --- a/src/modules/05_placement/components/probation/MainDetail.vue +++ b/src/modules/05_placement/components/probation/MainDetail.vue @@ -112,7 +112,7 @@ const activeTab = ref("tab1"); - + diff --git a/src/modules/05_placement/interface/response/Receive.ts b/src/modules/05_placement/interface/response/Receive.ts new file mode 100644 index 000000000..1c013c07d --- /dev/null +++ b/src/modules/05_placement/interface/response/Receive.ts @@ -0,0 +1,10 @@ +import { type } from "os"; + +interface ResponseTitle { + fullname: string; + organizationPositionOld: string; + positionLevelOld: string; + positionTypeOld: string; +} + +export type { ResponseTitle }; diff --git a/src/modules/05_placement/interface/response/Relocation.ts b/src/modules/05_placement/interface/response/Relocation.ts new file mode 100644 index 000000000..4972a366f --- /dev/null +++ b/src/modules/05_placement/interface/response/Relocation.ts @@ -0,0 +1,38 @@ +interface relocationType { + no:number, + id: string, + citizenId: "0000000000005", + prefix: string, + firstname: string, + lastname: string, + dateOfBirth: Date, + gender: string, + status: string, + recruitDate: Date, + positionNumber: number, + positionPath: string, + positionPathSide: string, + positionType: string, + positionLine: string, + positionLevel: string, + posNoId: string, + positionId: string, + positionPathSideId: string, + positionTypeId: string, + positionLineId: string, + positionLevelId: string, + organizationPositionId: string, + organizationName: string, + organizationShortName: string, + isActive: boolean, + reason: string, + educationOld: string, + salary: number, + positionTypeOld: string, + positionLevelOld: string, + positionNumberOld: string, + organizationPositionOld: string, + createdAt: Date +} + +export type { relocationType}; \ No newline at end of file diff --git a/src/modules/05_placement/interface/response/officer.ts b/src/modules/05_placement/interface/response/officer.ts new file mode 100644 index 000000000..4cf58b1bb --- /dev/null +++ b/src/modules/05_placement/interface/response/officer.ts @@ -0,0 +1,23 @@ +interface officerType { + no:number, + id: string, + prefix: string, + firstname: string, + lastname: string, + position: string, + posNo: string, + positionLevel: string, + createdAt: Date, + organization: string, + reason: string, + status: string, + date: Date, + salary: number, + positionTypeOld: string, + positionLevelOld: string, + positionNumberOld: string, + organizationPositionOld: string, + isActive: true +} + +export type { officerType}; \ No newline at end of file diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index 12cbb254e..7596d1944 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -33,15 +33,32 @@ const RepatriationOrder = () => import("@/modules/05_placement/components/RepatriationOrder/List.vue"); const RepatriationOrderAdd = () => import("@/modules/05_placement/components/RepatriationOrder/AddOrder.vue"); - +const helpgovernment = () => import("@/modules/05_placement/components/helpgovernment/mainHelp.vue") +const helpgovernmentbyId = () => import("@/modules/05_placement/components/helpgovernment/governmentDetail.vue") +const repatriate = () => import("@/modules/05_placement/components/Repatriate/RepatriateMain.vue") +const repatriatebyId = () => import("@/modules/05_placement/components/Repatriate/RepatriatebyId.vue") +const relocation = () => import("@/modules/05_placement/components/Relocation/RelocationMain.vue") +const relocationbyId = () => import("@/modules/05_placement/components/Relocation/RelocationbyId.vue") //รับโอน const receiveMain = () => import("@/modules/05_placement/components/Receive/receiveMain.vue"); - const receiveDetail = () => +const receiveDetail = () => import("@/modules/05_placement/components/Receive/receiveDetail.vue"); - const ReceiveAdd = () => +const receiveDetail2 = () => + import("@/modules/05_placement/components/Receive/receiveDetail2.vue"); +const ReceiveAdd = () => import("@/modules/05_placement/components/Receive/FormAdd.vue"); +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 [ { @@ -104,6 +121,16 @@ export default [ Role: "placement", }, }, + { + path: "/probation/detail/add/:id/:form", + name: "probationFormAdd", + component: FormSaveResultAdd, + meta: { + Auth: true, + Key: [6.3], + Role: "placement", + }, + }, { path: "/probation/work/add", name: "probationWorkAdd", @@ -197,11 +224,109 @@ export default [ { path: "/receive/:id", name: "receiveDetail", - component: receiveDetail, + component: receiveDetail2, meta: { Auth: true, Key: [6.3], Role: "placement", }, }, + { + path: "/help-government", + name: "help-government", + component: helpgovernment, + meta: { + Auth: true, + Key: [6.6], + Role: "placement", + }, + }, + { + path: "/help-government/detail/:id", + name: "help-governmentbyId", + component: helpgovernmentbyId, + meta: { + Auth: true, + Key: [6.6], + Role: "placement", + }, + }, + { + path: "/repatriate", + name: "repatriate", + component: repatriate, + meta: { + Auth: true, + Key: [6.7], + Role: "placement", + }, + }, + { + path: "/repatriate/detail/:id", + name: "repatriatebyId", + component: repatriatebyId, + meta: { + Auth: true, + Key: [6.7], + 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: "/relocation", + name: "relocation", + component: relocation, + 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", + }, + }, { + path: "/relocation/detail/:id", + name: "relocationId", + component: relocationbyId, + meta: { + Auth: true, + Key: [6.9], + Role: "placement", + }, + }, ]; diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts index 73c42cd6e..5f16b8424 100644 --- a/src/modules/05_placement/store.ts +++ b/src/modules/05_placement/store.ts @@ -316,17 +316,17 @@ export const useTransferDataStore = defineStore("transferDataStore", () => { const statusText = (val: string) => { switch (val) { case "WAITTING": - return "รออนุมัติ"; + return "รอดำเนินการ"; case "PENDING": - return "รออนุมัติ"; + return "เลือกตำแหน่งแล้ว"; case "APPROVE": - return "ผ่านการอนุมัติ"; + return "อนุมัติ"; case "REJECT": - return "ไม่ผ่านการอนุมัติ"; + return "ไม่อนุมัติ"; case "REPORT": - return "ส่งไปออกคำสั่ง"; + return "ส่งรายชื่อไปออกคำสั่ง"; case "DONE": - return "ออกคำสั่งสำเร็จ"; + return "ออกคำสั่งเสร็จแล้ว"; default: return "-"; diff --git a/src/modules/06_retirement/components/resign/Resign.vue b/src/modules/06_retirement/components/resign/Resign.vue index 0e76fbd8e..9f0b9664d 100644 --- a/src/modules/06_retirement/components/resign/Resign.vue +++ b/src/modules/06_retirement/components/resign/Resign.vue @@ -1,19 +1,37 @@ - + diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue index 87822d692..a4a441b9a 100644 --- a/src/modules/06_retirement/components/resign/ResignByid.vue +++ b/src/modules/06_retirement/components/resign/ResignByid.vue @@ -38,20 +38,24 @@
ตำแหน่งในสายงาน
-
{{ dataDetail.positionLine }}
+
+ {{ dataDetail.positionTypeOld }} +
ระดับ
-
{{ dataDetail.positionLevel }}
+
+ {{ dataDetail.positionLevelOld }} +
สังกัด
- {{ dataDetail.organizationOrganization }} + {{ dataDetail.organizationPositionOld }}
@@ -59,20 +63,7 @@
สถานะ
- - - - {{ statusName(dataDetail.status) }} + {{ statusText(dataDetail.status) }}
@@ -140,6 +131,268 @@
+ +
+
+ แก้ไขข้อมูลรายละเอียดการลาออก +
+ +
+ +
+
+ + +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+ + + + + +
+
+
+
+ + + + + +
+
+
+ +
+
+
+ + + @@ -29,73 +15,36 @@
- +
- +
- +
- +
- + @@ -103,24 +52,12 @@ {{ parseInt(value + 543) }}