diff --git a/src/store/modules/dictData.ts b/src/store/modules/dictData.ts index 20e0799..79fb53a 100644 --- a/src/store/modules/dictData.ts +++ b/src/store/modules/dictData.ts @@ -1,28 +1,29 @@ //字典数据管理 import { defineStore } from 'pinia' -// export const useDictDataStore = defineStore('dictData', { -// state: () => ({ -// dictData: { -// XMGL: [], -// ITEMCLASS: [] -// } -// }), -// actions: { -// setDictData(data: any) { -// this.dictData = { ...this.dictData, ...data } -// } -// } -// }) -//仪器数据 -export const useYQStore = defineStore('yqStore', { +export const useComDictStore = defineStore('comDict', { state: () => ({ - yqList: [] as any[], // 存储仪器列表 + dictData: { + XMGL: [], + ITEMCLASS: [] + } }), actions: { - setYQList(data: any[]) { - this.yqList = data + setDictData(data: any) { + this.dictData = { ...this.dictData, ...data } } } }) + +//仪器数据 +// export const useYQStore = defineStore('yqStore', { +// state: () => ({ +// yqList: [] as any[], // 存储仪器列表 +// }), +// actions: { +// setYQList(data: any[]) { +// this.yqList = data +// } +// } +// }) diff --git a/src/views/liswork/labItem/index.vue b/src/views/liswork/labItem/index.vue index bd4c507..b526770 100644 --- a/src/views/liswork/labItem/index.vue +++ b/src/views/liswork/labItem/index.vue @@ -76,31 +76,31 @@
@@ -110,17 +110,17 @@ + + diff --git a/src/views/liswork/labItem/tab/base/child/MultiRef.vue b/src/views/liswork/labItem/tab/base/child/MultiRef.vue new file mode 100644 index 0000000..9e46407 --- /dev/null +++ b/src/views/liswork/labItem/tab/base/child/MultiRef.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/views/liswork/xtwh/reportsetting/index.vue b/src/views/liswork/xtwh/reportsetting/index.vue index 538e460..7da3942 100644 --- a/src/views/liswork/xtwh/reportsetting/index.vue +++ b/src/views/liswork/xtwh/reportsetting/index.vue @@ -42,7 +42,7 @@