diff --git a/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue b/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue index e8c48bf1e..ca7a51a0e 100644 --- a/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue +++ b/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue @@ -20,7 +20,7 @@ import DialogUpdateCouple from "@/modules/04_registryPerson/components/Dialog/06 const $q = useQuasar(); const router = useRouter(); const route = useRoute(); -const routerName = ref(route.name as string); +const typeEmp = ref(""); const store = useRequestEditStore(); const { dialogConfirm, @@ -72,12 +72,12 @@ const isCheckData = computed(() => { /** function fetch ข้อมูลคำร้องแก้ไข*/ async function fetchDataRequest() { showLoader(); + typeEmp.value = + route.name === "registryNewRequestEditEmpDetail" ? "employee" : ""; await http .get( config.API.requestEditByType( - routerName.value == "registryNewRequestEditEMP/personal" - ? "-employee" - : "" + typeEmp.value == "employee" ? "-employee" : "" ) + `${requestId.value}` ) .then((res) => { @@ -109,9 +109,7 @@ function onSubmit() { await http .patch( config.API.requestEditByType( - routerName.value == "registryNewRequestEditEMP/personal" - ? "-employee" - : "" + typeEmp.value === "employee" ? "-employee" : "" ) + `${requestId.value}`, { status: formData.status, diff --git a/src/modules/04_registryPerson/router.ts b/src/modules/04_registryPerson/router.ts index 17eb28354..1e4dddb10 100644 --- a/src/modules/04_registryPerson/router.ts +++ b/src/modules/04_registryPerson/router.ts @@ -9,7 +9,9 @@ const detailPage = () => const requestEdit = () => import("@/modules/04_registryPerson/views/requestEditView.vue"); const requestEditPage = () => - import("@/modules/04_registryPerson/components/requestEdit/Page02_DetailIDP.vue"); + import( + "@/modules/04_registryPerson/components/requestEdit/Page02_DetailIDP.vue" + ); const Page01_Detail = () => import( "@/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue" @@ -110,7 +112,7 @@ export default [ }, { path: "/registry-employee/request-edit/personal/:id", - name: "registryNewRequestEditEMP/personal", + name: "registryNewRequestEditEmpDetail", component: Page01_Detail, meta: { Auth: true,