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 new file mode 100644 index 000000000..d9bd78997 --- /dev/null +++ b/src/modules/04_registryPerson/components/DialogResingn.vue @@ -0,0 +1,235 @@ + + + + + diff --git a/src/modules/04_registryPerson/components/DialogTransfer.vue b/src/modules/04_registryPerson/components/DialogTransfer.vue new file mode 100644 index 000000000..5d54e07c4 --- /dev/null +++ b/src/modules/04_registryPerson/components/DialogTransfer.vue @@ -0,0 +1,122 @@ +div + + + + + diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue index 51132ac2e..90f40f839 100644 --- a/src/modules/04_registryPerson/views/detailView.vue +++ b/src/modules/04_registryPerson/views/detailView.vue @@ -33,10 +33,15 @@ const DialogHeader = defineAsyncComponent( const TabMain = defineAsyncComponent( () => import("@/modules/04_registryPerson/components/detail/TabMain.vue") ); - const DialogRetired = defineAsyncComponent( () => import("@/modules/04_registryPerson/components/DialogRetired.vue") ); +const DialogResign = defineAsyncComponent( + () => import("@/modules/04_registryPerson/components/DialogResingn.vue") +); +const DialogTransfer = defineAsyncComponent( + () => import("@/modules/04_registryPerson/components/DialogTransfer.vue") +); /** use*/ const $q = useQuasar(); @@ -72,7 +77,10 @@ const reasonDeath = ref(""); //เหตุผลการเสียชีว const dialogImage = ref(false); //แสดงเลือกรูปภาพ const formDetail = ref(); //ข้อมูลส่วนตัว -const modalDialogRetired = ref(false); +const modalDialogResign = ref(false); //ป๊อบอัพขอลาออก +const modalDialogTransfer = ref(false); //ป๊อบอัพขอโอน +const modalDialogRetired = ref(false); //ป๊อบอัพข้อมูลการพ้นจากราชการ + //รายการเมนูออกคำสั่งข้าราชการ const baseItemsMenu = ref([ { @@ -95,6 +103,8 @@ const baseItemsMenu = ref([ name: "ให้ออกจากราชการ", system: "SYS_DISMISS", }, + { id: "7", name: "ขอโอน", system: "SYS_TRANSFER_REQ" }, + { id: "8", name: "ขอลาออก", system: "SYS_RESIGN" }, { id: "6", name: "อื่นๆ", @@ -135,6 +145,7 @@ const itemsMenuEmployee = ref([ name: "ให้ออกจากราชการ", system: "SYS_DISMISS_EMP", }, + { id: "4", name: "ขอลาออก", system: "SYS_RESIGN_EMP" }, ]); const uploadUrl = ref(""); //URL อัปโหลดรูป @@ -765,6 +776,14 @@ const titleName = computed(() => { : "ทะเบียนประวัติ"; }); +function openDialogSendTransferResign( + system: "SYS_TRANSFER_REQ" | "SYS_RESIGN" | "SYS_RESIGN_EMP" +) { + system === "SYS_TRANSFER_REQ" + ? (modalDialogTransfer.value = true) + : (modalDialogResign.value = true); +} + onMounted(async () => { await fetchDataPersonal(); }); @@ -830,6 +849,9 @@ onMounted(async () => { ? outPost() : item.name == 'อื่นๆ' ? otherPost() + : item.system === 'SYS_TRANSFER_REQ' || + item.system === 'SYS_RESIGN' + ? openDialogSendTransferResign(item.system) : null " v-close-popup @@ -869,6 +891,8 @@ onMounted(async () => { ? clickPassaway() : item.name == 'ให้ออกจากราชการ' ? outPost() + : item.system === 'SYS_RESIGN_EMP' + ? openDialogSendTransferResign(item.system) : null " v-close-popup @@ -1211,6 +1235,10 @@ onMounted(async () => { + + + +