解决合并冲突

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

@@ -19,6 +19,7 @@ const useUserStore = defineStore(
       roles: [],
       permissions: [],
       tenantId: '',
+      hospitalName:'',
       status: '' // 用户状态：0-启用(管理员), 1-禁用(普通人员)
     }),
     actions: {
@@ -53,6 +54,7 @@ const useUserStore = defineStore(
             } else {
               this.roles = ['ROLE_DEFAULT']
             }
+            // console.log('user info:', user);
             this.id = user.userId
             this.name = user.userName // 用户账号（对应数据库的user_name字段，如'admin'）
             this.orgId = user.orgId
@@ -61,6 +63,8 @@ const useUserStore = defineStore(
             this.practitionerId = res.practitionerId
             this.fixmedinsCode = res.optionJson.fixmedinsCode
             this.avatar = avatar
+            this.hospitalName = res.optionJson.hospitalName
+
             this.status = user.status // 保存用户状态
             resolve(res)
           }).catch(error => {

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

@@ -14,6 +14,7 @@ export const useStore = defineStore('current', {
     currentDataBS:null, //报损
     currentDataLYCK:null, //领用出库
     currentDataLYTK:null, //领用退库
+    remainingDays:null, //有效期天数
   }),
   actions: {
     setCurrentData(data) {
@@ -54,6 +55,9 @@ export const useStore = defineStore('current', {
     setCurrentDataLYTK(data) {
       this.currentDataLYTK = data
     },
+    setRemainingDays(data) {
+      this.remainingDays = data
+    },
     
     clearCurrentDataDBAll() {
       this.currentDataDBAll = null
@@ -92,6 +96,10 @@ export const useStore = defineStore('current', {
     },
     clearCurrentDataDB() {
       this.currentDataDB = null
-    }
+    },
+
+    clearRemainingDays() {
+      this.remainingDays = null
+    },
   }
 })