76 门诊预约挂号

openhis-ui-vue3/src/store/modules/user.js

@@ -1,7 +1,7 @@
-import {getInfo, login, logout} from '@/api/login'
-import {getToken, removeToken, setToken} from '@/utils/auth'
+import { login, logout, getInfo } from '@/api/login'
+import { getToken, setToken, removeToken } from '@/utils/auth'
 import defAva from '@/assets/images/user.png'
-import {defineStore} from 'pinia'
+import { defineStore } from 'pinia'
 
 const useUserStore = defineStore(
   'user',
@@ -19,9 +19,7 @@ const useUserStore = defineStore(
       roles: [],
       permissions: [],
       tenantId: '',
-      tenantName: '', // 租户名称
-      hospitalName:'',
-      optionMap: {} // 租户配置项Map（从sys_tenant_option表读取）
+      hospitalName:''
     }),
     actions: {
       // 登录
@@ -64,10 +62,9 @@ const useUserStore = defineStore(
             this.practitionerId = res.practitionerId
             this.fixmedinsCode = res.optionJson.fixmedinsCode
             this.avatar = avatar
-            this.optionMap = res.optionMap || {}
-            // 优先从optionMap获取配置，如果没有则从optionJson获取
-            this.hospitalName = this.optionMap.hospitalName || res.optionJson.hospitalName || ''
-            this.tenantName = res.tenantName || ''
+            this.hospitalName = res.optionJson.hospitalName
+            // 获取tenantId，优先从res.user获取，否则从res获取
+            this.tenantId = user.tenantId || res.tenantId || this.tenantId
 
             resolve(res)
           }).catch(error => {