fix(registry): use window.open instead of router.push
This commit is contained in:
parent
6b0d3b9887
commit
4af1421770
4 changed files with 22 additions and 7 deletions
|
|
@ -269,14 +269,15 @@ async function fetchProfile(id: string, avatarName: string) {
|
|||
}
|
||||
|
||||
function redirecToRegistry() {
|
||||
router.push(
|
||||
window.open(
|
||||
`/registry-${
|
||||
employeeClass.value.toLocaleLowerCase() === "perm"
|
||||
? "employee"
|
||||
: employeeClass.value.toLocaleLowerCase() === "temp"
|
||||
? "temp"
|
||||
: "officer"
|
||||
}/${props.id}`
|
||||
}/${props.id}`,
|
||||
"_blank"
|
||||
);
|
||||
modal.value = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -196,9 +196,9 @@ function onClickHistory() {
|
|||
*/
|
||||
function onClickViewDetail(id: string) {
|
||||
if (empType.value === "officer") {
|
||||
router.push(`/registry-officer/${id}`);
|
||||
window.open(`/registry-officer/${id}`, "_blank");
|
||||
} else {
|
||||
router.push(`/registry-employee/${id}`);
|
||||
window.open(`/registry-employee/${id}`, "_blank");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -800,6 +800,19 @@ function openDialogSendTransferResign(
|
|||
: (modalDialogResign.value = true);
|
||||
}
|
||||
|
||||
/** ฟังก์ชันจัดการการกลับหน้า*/
|
||||
function handleBackNavigation() {
|
||||
if (window.history.length > 1) {
|
||||
router.go(-1);
|
||||
} else {
|
||||
if (empType.value === "") {
|
||||
router.push("/registry-officer");
|
||||
} else if (empType.value === "-employee") {
|
||||
router.push("/registry-employee");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
await fetchDataPersonal();
|
||||
});
|
||||
|
|
@ -816,7 +829,7 @@ onMounted(async () => {
|
|||
flat
|
||||
color="primary"
|
||||
class="q-mr-sm"
|
||||
@click="router.go(-1)"
|
||||
@click="handleBackNavigation"
|
||||
/>
|
||||
{{ titleName }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -82,10 +82,11 @@ async function fetchProfile(id: string, avatarName: string) {
|
|||
* function rediract ไปทะเบียนประวัติ
|
||||
*/
|
||||
function redirecToRegistry() {
|
||||
router.push(
|
||||
window.open(
|
||||
`/registry${props.employeeClass ? props.employeeClass : "-officer"}/${
|
||||
profileId.value
|
||||
}`
|
||||
}`,
|
||||
"_blank"
|
||||
);
|
||||
modal.value = false;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue