解决合并冲突

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
+    },
   }
 })