From 41fa6f8ecd63fac641b7ad967df401ba92a4d7c3 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Tue, 17 Mar 2026 17:03:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
=?UTF-8?q?=20=E6=A0=B7=E5=93=81+LBA+ADA=20=E7=89=A9=E8=B5=84=E6=A3=80?=
=?UTF-8?q?=E6=9F=A5=EF=BC=8CNA=E8=AE=A1=E7=AE=97=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/calUnitTools.js | 16 +-
.../business/comps/template/TemplateTable.vue | 10 +-
.../business/comps/template/comps/lba/LBA003.vue | 2 +-
.../business/comps/template/comps/lba/LBA004.vue | 2 +-
.../business/comps/template/comps/lba/LBA005.vue | 1042 --------------------
.../business/comps/template/comps/lba/LBA007.vue | 1042 --------------------
.../business/comps/template/comps/lba/LBA008.vue | 2 +-
.../business/comps/template/comps/yp/YP002.vue | 4 +-
.../business/comps/template/comps/yp/YP003.vue | 2 +-
9 files changed, 18 insertions(+), 2104 deletions(-)
delete mode 100644 src/views/business/comps/template/comps/lba/LBA005.vue
delete mode 100644 src/views/business/comps/template/comps/lba/LBA007.vue
diff --git a/src/utils/calUnitTools.js b/src/utils/calUnitTools.js
index 3d82e64..4ad979f 100644
--- a/src/utils/calUnitTools.js
+++ b/src/utils/calUnitTools.js
@@ -54,10 +54,10 @@ export function subTj(valueArr, unitArr) {
}
export function addDecimals(a, b) {
- if (Number.isNaN(a)) {
+ if (Number.isNaN(a) || a == 'NA') {
a = 0
}
- if (Number.isNaN(b)) {
+ if (Number.isNaN(b) || b == 'NA') {
b = 0
}
const strA = a.toString()
@@ -75,10 +75,10 @@ export function addDecimals(a, b) {
}
export function subDecimals(a, b) {
- if (Number.isNaN(a)) {
+ if (Number.isNaN(a) || a == 'NA') {
a = 0
}
- if (Number.isNaN(b)) {
+ if (Number.isNaN(b) || a == 'NA') {
b = 0
}
const strA = a.toString()
@@ -96,7 +96,7 @@ export function subDecimals(a, b) {
}
export function multiplyDecimals(a, b) {
- if (Number.isNaN(a) || Number.isNaN(b)) {
+ if (Number.isNaN(a) || Number.isNaN(b) || a == 'NA' || b == 'NA') {
return 0
}
const strA = a.toString()
@@ -187,11 +187,9 @@ export function uniqeYqOne(newList) {
let resultList = []
for (var i = 0; i < newList.length; i++) {
let _index = _.findIndex(resultList, function (item) {
- return (
- item.bh == newList[i].bh
- )
+ return item.bh == newList[i].bh
})
- if (_index <0) {
+ if (_index < 0) {
resultList.push(newList[i])
}
}
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index 6da29db..2517548 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -68,9 +68,9 @@ import PCR012 from "./comps/pcr/PCR012.vue";
import LBA002 from "./comps/lba/LBA002.vue";
import LBA003 from "./comps/lba/LBA003.vue";
import LBA004 from "./comps/lba/LBA004.vue";
-import LBA005 from "./comps/lba/LBA005.vue";
+// LBA005-使用SP456
import LBA006 from "./comps/lba/LBA006.vue";
-import LBA007 from "./comps/lba/LBA007.vue";
+// LBA007-使用SP456
import LBA008 from "./comps/lba/LBA008.vue";
//ADA
@@ -78,9 +78,9 @@ import LBA008 from "./comps/lba/LBA008.vue";
// ADA002-使用LBA002
// ADA003-使用LBA003
// ADA004-使用LBA004
-// ADA005-使用LBA005
+// ADA005-使用SP456
// ADA006-使用LBA006
-// ADA007-使用LBA007
+// ADA007-使用SP456
//样品
// YP001-使用SP001
@@ -145,9 +145,7 @@ export default {
LBA002,
LBA003,
LBA004,
- LBA005,
LBA006,
- LBA007,
LBA008,
//样品
YP002,
diff --git a/src/views/business/comps/template/comps/lba/LBA003.vue b/src/views/business/comps/template/comps/lba/LBA003.vue
index f1e2b05..cf7c06d 100644
--- a/src/views/business/comps/template/comps/lba/LBA003.vue
+++ b/src/views/business/comps/template/comps/lba/LBA003.vue
@@ -8,7 +8,7 @@
{{ formData.bdmc }}
{{ formData.bdmc }}