diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index ce1a69dc8..655b9b247 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -4,6 +4,11 @@ const orgTree = `${env.API_URI_ORG_TREE}`; const order = `${env.API_PLACEMENT_URI}`; const receive = `${env.API_PLACEMENT_URI}/placement/Receive`; const transfer = `${placement}/transfer`; +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`; export default { MainDetail: (year: number) => `${placement}/exam/${year}`, @@ -99,4 +104,27 @@ export default { transferUser: `${transfer}/user`, transferUserId: (id: string) => `${transfer}/user/${id}`, transferConfirmId: (id: string) => `${transfer}/confirm/${id}`, + + + // แต่งตั้ง-เลื่อน + placemenAppointment, + + // ช่วยราชการ + placemenHelpGov, + officerMain: () => `${placement}/officer`, + 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}`, + repatriationMainReport: () => `${placement}/repatriation/report`, + // ขอย้าย + placemenRelocation, + + // อื่นๆ + placemenOther, }; 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/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts index 2b6c73a0e..3b0993b5b 100644 --- a/src/api/06_retirement/api.retirement.ts +++ b/src/api/06_retirement/api.retirement.ts @@ -1,5 +1,8 @@ import env from "../index"; const retirement = `${env.API_URI}/retirement`; +const retirementDischarge = `${retirement}/discharge`; +const retirementExpulsion = `${retirement}/expulsion`; +const retirementOut = `${retirement}/out`; export default { profile: (type: string, year: string) => @@ -23,4 +26,12 @@ export default { resingByid: (id: string) => `${retirement}/resign/${id}`, resignConfirm: (id: string) => `${retirement}/resign/confirm/${id}`, resignReject: (id: string) => `${retirement}/resign/reject/${id}`, + // ปลดออก + retirementDischarge, + + // ไล่ออก + retirementExpulsion, + + // ให้ออก + retirementOut, }; diff --git a/src/api/index.ts b/src/api/index.ts index 4b6fabe6d..51f162272 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -26,7 +26,8 @@ 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://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/interface/request/main/main.ts b/src/interface/request/main/main.ts index ab401c6ff..ad8f16e68 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -125,7 +125,7 @@ const menuList = readonly([ activeIcon: "order", label: "ออกคำสั่ง", path: "order", - role: "placement", + role: "order", }, { key: 5, @@ -253,7 +253,7 @@ const menuList = readonly([ { key: 6.9, label: "รายการย้าย" /* */, - path: "move-list", + path: "relocation", role: "placement", }, { @@ -311,13 +311,13 @@ const menuList = readonly([ { key: 7.6, label: "รายการปลดออก", - path: "dismiss-order", + path: "discharged", role: "retirement", }, { key: 7.7, label: "รายการไล่ออก", - path: "dismiss-order", + path: "expulsion", role: "retirement", }, ], 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/officer.ts b/src/modules/05_placement/interface/response/officer.ts new file mode 100644 index 000000000..64d298641 --- /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 6e845c966..639e5a7b7 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -33,7 +33,16 @@ 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 receiveMain = () => import("@/modules/05_placement/components/Receive/receiveMain.vue"); @@ -44,6 +53,10 @@ 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" + ); export default [ { @@ -106,6 +119,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", @@ -206,4 +229,44 @@ export default [ 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", + }, + }, ]; diff --git a/src/modules/10_order/components/Main.vue b/src/modules/10_order/components/Main.vue index f5ed2ae12..75f1ad406 100644 --- a/src/modules/10_order/components/Main.vue +++ b/src/modules/10_order/components/Main.vue @@ -125,7 +125,7 @@ import config from "@/app.config"; const $q = useQuasar(); //ใช้ noti quasar const mixin = useCounterMixin(); -const { showLoader, hideLoader, messageError, date2Thai, dateText, success } = +const { showLoader, hideLoader, messageError, date2Thai, dateText, success, dialogRemove } = mixin; const DataStore = useOrderPlacementDataStore(); @@ -314,20 +314,11 @@ const redirectToPage = (id?: string, status?: string) => { }; const clickDelete = (id: string) => { - $q.dialog({ - title: "ยืนยันการลบข้อมูล", - message: "ต้องการลบข้อมูลนี้ใช่หรือไม่?", - cancel: { - flat: true, - color: "negative", - }, - persistent: true, - }) - .onOk(async () => { - await deleteData(id); - }) - .onCancel(() => { }) - .onDismiss(() => { }); + dialogRemove( + $q, + () => deleteData(id), + ); + }; const deleteData = async (id: string) => { diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue index 4f63bc851..0307b4fd6 100644 --- a/src/modules/10_order/components/step/step01.vue +++ b/src/modules/10_order/components/step/step01.vue @@ -3,24 +3,10 @@
- + @@ -29,73 +15,36 @@
- +
- +
- +
- +
- + @@ -103,24 +52,12 @@ {{ parseInt(value + 543) }}