Merge branch 'develop' into dev

Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop
fix(registry): handle router.push based on isLeave status
2026-03-26 09:49:31 +07:00 · 2026-03-26 09:49:14 +07:00 · 2026-03-26 09:49:02 +07:00
1 changed files with 6 additions and 2 deletions
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@ -806,9 +806,13 @@ function handleBackNavigation() {
    router.go(-1);
  } else {
    if (empType.value === "") {
-      router.push("/registry-officer");
+      storeRegistry.isLeave
+        ? router.push("/registry-retire-officer")
+        : router.push("/registry-officer");
    } else if (empType.value === "-employee") {
-      router.push("/registry-employee");
+      storeRegistry.isLeave
+        ? router.push("/registry-retire-employee")
+        : router.push("/registry-employee");
    }
  }
 }
Author	SHA1	Message	Date
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	4cfcd48a20	Merge branch 'develop' into dev	2026-03-26 09:49:31 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	26ae535b15	Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop	2026-03-26 09:49:14 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	ec5f113922	fix(registry): handle router.push based on isLeave status	2026-03-26 09:49:02 +07:00