diff --git a/src/app.config.ts b/src/app.config.ts index c094e6d..d25db11 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -56,7 +56,7 @@ const generatePopupPath = (routeName: any) => { if (routeName.includes("scholarship")) { return `${path}/manual/chapter-10-user-scholarship`; } - if (routeName.includes("retire")) { + if (routeName.includes("Retire")) { return `${path}/manual/chapter-11-user-retire`; } else { return manualConfig[routeName as keyof typeof manualConfig]; diff --git a/src/modules/11_probation/views/mainDetail.vue b/src/modules/11_probation/views/mainDetail.vue index 7b8c5aa..8ebd9e7 100644 --- a/src/modules/11_probation/views/mainDetail.vue +++ b/src/modules/11_probation/views/mainDetail.vue @@ -30,7 +30,7 @@ const mode = ref($q.screen.gt.xs); const profileImg = ref(""); const router = useRouter(); const route = useRoute(); -const idEva = ref(route.params.id as string) +const idEva = ref(route.params.id as string); const formData = reactive({ prefix: "", firstName: "", @@ -115,7 +115,7 @@ function onMobile(type: string) { function getMain() { showLoader(); http - .get(config.API.orgPosition+`/${idEva.value}`) + .get(config.API.orgPosition + `/${idEva.value}`) .then(async (res) => { const data = res.data.result; formData.prefix = data.prefix; @@ -185,8 +185,7 @@ onMounted(async () => { flat color="primary" class="q-mr-sm" - @click="router.go(-1) - " + @click="router.go(-1)" /> รายละเอียดงานที่ได้รับมอบหมาย @@ -366,12 +365,8 @@ onMounted(async () => {