Merge remote-tracking branch 'origin/develop' into develop

2026-02-24 17:30:36 +08:00
parent ff41aa9c04 f60e070984
commit 038213a26c
2 changed files with 2 additions and 2 deletions
--- a/openhis-ui-vue3/src/layout/components/Navbar.vue
+++ b/openhis-ui-vue3/src/layout/components/Navbar.vue
@@ -240,7 +240,7 @@ function openNoticePanel() {
 }

 function goToHelpCenter() {
-  router.push({name: 'HelpCenter'});
+  window.open(window.location.origin + '/help-center/vuepress-theme-vdoing-doc/docs/.vuepress/dist/pages/520e67/index.html', '_blank');
 }
 </script>

--- a/openhis-ui-vue3/src/views/basicmanage/ward/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/ward/index.vue
@@ -379,7 +379,7 @@ const rules = ref({
  ],
  busNoParent: [
    {
-      required: form.formEnum != 4,
+      required: true,
      message: '请选择上级' + type.value,
      trigger: 'blur',
    },