diff --git a/package.json b/package.json index 00c114e..466dd6e 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "js-cookie": "3.0.5", "jsbarcode": "^3.12.1", "jsencrypt": "3.3.2", + "lodash": "^4.17.21", "mitt": "^3.0.1", "nprogress": "0.2.0", "pinia": "2.1.7", @@ -50,6 +51,7 @@ }, "devDependencies": { "@eslint/js": "^9.27.0", + "@types/lodash": "^4.17.21", "@types/vue": "^2.0.0", "@typescript-eslint/eslint-plugin": "^8.46.2", "@typescript-eslint/parser": "^8.46.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9b06f24..7d36d8c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,6 +56,9 @@ importers: jsencrypt: specifier: 3.3.2 version: 3.3.2 + lodash: + specifier: ^4.17.21 + version: 4.17.21 mitt: specifier: ^3.0.1 version: 3.0.1 @@ -77,6 +80,9 @@ importers: sortablejs: specifier: ^1.14.0 version: 1.14.0 + three: + specifier: ^0.181.2 + version: 0.181.2 vue: specifier: 3.5.23 version: 3.5.23(typescript@5.9.3) @@ -111,6 +117,9 @@ importers: '@eslint/js': specifier: ^9.27.0 version: 9.27.0 + '@types/lodash': + specifier: ^4.17.21 + version: 4.17.21 '@types/vue': specifier: ^2.0.0 version: 2.0.0(typescript@5.9.3) @@ -599,8 +608,8 @@ packages: '@types/lodash-es@4.17.12': resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==} - '@types/lodash@4.17.20': - resolution: {integrity: sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==} + '@types/lodash@4.17.21': + resolution: {integrity: sha512-FOvQ0YPD5NOfPgMzJihoT+Za5pdkDJWcbpuj1DjaKZIr/gxodQjY/uWEFlTNqW2ugXHUiL8lRQgw63dzKHZdeQ==} '@types/minimatch@3.0.5': resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==} @@ -2503,6 +2512,9 @@ packages: text-segmentation@1.0.3: resolution: {integrity: sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==} + three@0.181.2: + resolution: {integrity: sha512-k/CjiZ80bYss6Qs7/ex1TBlPD11whT9oKfT8oTGiHa34W4JRd1NiH/Tr1DbHWQ2/vMUypxksLnF2CfmlmM5XFQ==} + tiny-emitter@2.1.0: resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==} @@ -3113,9 +3125,9 @@ snapshots: '@types/lodash-es@4.17.12': dependencies: - '@types/lodash': 4.17.20 + '@types/lodash': 4.17.21 - '@types/lodash@4.17.20': {} + '@types/lodash@4.17.21': {} '@types/minimatch@3.0.5': {} @@ -3817,7 +3829,7 @@ snapshots: '@element-plus/icons-vue': 2.3.2(vue@3.5.23(typescript@5.9.3)) '@floating-ui/dom': 1.6.13 '@popperjs/core': '@sxzz/popperjs-es@2.11.7' - '@types/lodash': 4.17.20 + '@types/lodash': 4.17.21 '@types/lodash-es': 4.17.12 '@vueuse/core': 9.13.0(vue@3.5.23(typescript@5.9.3)) async-validator: 4.2.5 @@ -5355,6 +5367,8 @@ snapshots: dependencies: utrie: 1.0.2 + three@0.181.2: {} + tiny-emitter@2.1.0: {} to-object-path@0.3.0: diff --git a/src/api/liswork/labItem/LabItemApi.ts b/src/api/liswork/labItem/LabItemApi.ts index eface31..ead6931 100644 --- a/src/api/liswork/labItem/LabItemApi.ts +++ b/src/api/liswork/labItem/LabItemApi.ts @@ -103,4 +103,14 @@ export function deleteXmInfoVs(query:any){ method: 'delete', params: query }) +} + + +//删除检验项目 +export function deleteXmInfoService(query:any){ + return request({ + url: '/xminfo/del', + method: 'delete', + params: query + }) } \ No newline at end of file diff --git a/src/hooks/lisData/dictData.ts b/src/hooks/lisData/dictData.ts index 79890d6..ca34233 100644 --- a/src/hooks/lisData/dictData.ts +++ b/src/hooks/lisData/dictData.ts @@ -28,6 +28,10 @@ export const getDictData = async (...args: string[]) => { if(dictRefs.LF != undefined) dictData.value.LF = toRaw(dictRefs.LF.value) || [] if(dictRefs.BT != undefined) dictData.value.BT = toRaw(dictRefs.BT.value) || [] if(dictRefs.SLZQ != undefined) dictData.value.SLZQ = toRaw(dictRefs.SLZQ.value) || [] + if(dictRefs.UT != undefined) dictData.value.UT = toRaw(dictRefs.UT.value) || [] //单位 + if(dictRefs.MD != undefined) dictData.value.MD = toRaw(dictRefs.MD.value) || [] //测试方法 + if(dictRefs.ITEMCLASS != undefined) dictData.value.ITEMCLASS = toRaw(dictRefs.ITEMCLASS.value) || [] //细菌项目类别 + if(dictRefs.GBDM != undefined) dictData.value.GBDM = toRaw(dictRefs.GBDM.value) || [] //国标代码 } //字典数据格式化方法 diff --git a/src/types/Object.d.ts b/src/types/Object.d.ts index fa27f22..d498644 100644 --- a/src/types/Object.d.ts +++ b/src/types/Object.d.ts @@ -19,6 +19,10 @@ export interface DictData { LF?: Array; BT?: Array; SLZQ?: Array; + UT?: Array; + MD?: Array; + ITEMCLASS?: Array; + GBDM?: Array; [key: string]: any[] | undefined; // 添加索引签名以支持动态访问 } diff --git a/src/views/liswork/labItem/BatchInstrVs.vue b/src/views/liswork/labItem/BatchInstrVs.vue new file mode 100644 index 0000000..6426d94 --- /dev/null +++ b/src/views/liswork/labItem/BatchInstrVs.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/views/liswork/labItem/index.vue b/src/views/liswork/labItem/index.vue index cd1f8b3..39a797b 100644 --- a/src/views/liswork/labItem/index.vue +++ b/src/views/liswork/labItem/index.vue @@ -2,35 +2,34 @@
- + - - - + + + - + - + - + - + + @change="getList" /> @@ -40,34 +39,36 @@ - + + 刷新 新增 删除 - 删除对应 + 批量项目对应 + 批量删除对应 保存 - - -