diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index 2a83e2200..503c64a92 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -165,7 +165,6 @@ export default { otherByid: (id: string) => `${placemenOther}/${id}`, otherPositionUse: () => `${placemenOther}/use`, - userPlacement: (id: string) => `${placement}/user/${id}`, // orderForm @@ -184,4 +183,6 @@ export default { //รายงาน placementReport: `${report}`, + + transferAdmin: `${transfer}/admin`, }; diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts index d0991a12f..3dbe84071 100644 --- a/src/api/06_retirement/api.retirement.ts +++ b/src/api/06_retirement/api.retirement.ts @@ -110,4 +110,6 @@ export default { `${retirement}/${path}/admin-update/resign-info/${id}`, exRetirement: `${env.API_URI}/org/ex/retirement`, + + resignAdmin: (typeEmp: string) => `${retirement}/resign${typeEmp}/admin`, }; diff --git a/src/modules/04_registryPerson/components/DialogResingn.vue b/src/modules/04_registryPerson/components/DialogResingn.vue index 88505c136..d9bd78997 100644 --- a/src/modules/04_registryPerson/components/DialogResingn.vue +++ b/src/modules/04_registryPerson/components/DialogResingn.vue @@ -1,5 +1,5 @@ diff --git a/src/modules/04_registryPerson/components/DialogTransfer.vue b/src/modules/04_registryPerson/components/DialogTransfer.vue index 836e5fedd..5d54e07c4 100644 --- a/src/modules/04_registryPerson/components/DialogTransfer.vue +++ b/src/modules/04_registryPerson/components/DialogTransfer.vue @@ -20,6 +20,8 @@ const { showLoader, hideLoader, messageError, success } = useCounterMixin(); //props const modal = defineModel("modal", { required: true }); +const profileId = ref(route.params.id?.toString() ?? ""); //ProfileId + const form = reactive({ tranferOrg: "", noteReason: "", @@ -30,14 +32,16 @@ async function onSubmit() { try { showLoader(); const formData = new FormData(); + formData.append("ProfileId", profileId.value); formData.append("Organization", form.tranferOrg); formData.append("Reason", form.noteReason); if (form.files) { formData.append("file", form.files); } - // await http.post(config.API.listtransfer(), formData); - // success($q, "บันทึกข้อมูลสำเร็จ"); + await http.post(config.API.transferAdmin, formData); + router.push({ name: "transfer" }); + success($q, "บันทึกข้อมูลสำเร็จ"); } catch (error) { messageError($q, error); } finally { diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue index 527c4b5ae..90f40f839 100644 --- a/src/modules/04_registryPerson/views/detailView.vue +++ b/src/modules/04_registryPerson/views/detailView.vue @@ -145,6 +145,7 @@ const itemsMenuEmployee = ref([ name: "ให้ออกจากราชการ", system: "SYS_DISMISS_EMP", }, + { id: "4", name: "ขอลาออก", system: "SYS_RESIGN_EMP" }, ]); const uploadUrl = ref(""); //URL อัปโหลดรูป @@ -776,7 +777,7 @@ const titleName = computed(() => { }); function openDialogSendTransferResign( - system: "SYS_TRANSFER_REQ" | "SYS_RESIGN" + system: "SYS_TRANSFER_REQ" | "SYS_RESIGN" | "SYS_RESIGN_EMP" ) { system === "SYS_TRANSFER_REQ" ? (modalDialogTransfer.value = true) @@ -890,6 +891,8 @@ onMounted(async () => { ? clickPassaway() : item.name == 'ให้ออกจากราชการ' ? outPost() + : item.system === 'SYS_RESIGN_EMP' + ? openDialogSendTransferResign(item.system) : null " v-close-popup