zgty/zgty-mas-m
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

feat:样品分析计算bug

Browse Source
This commit is contained in:
houjunxiang
2026-02-12 15:43:19 +08:00
parent 21b72ca52a
commit 46edadbd43
3 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
nx/helper/calcAnalysisValue.js
View File

File diff suppressed because it is too large Load Diff

12
pages/analysis/sample/sample-work-detail.vue
View File

@@ -594,7 +594,7 @@ const checkBh = () => {
let hasHb = true let hasHb = true
for (const g of fieldGroup.value) { for (const g of fieldGroup.value) {
for (const f of g.fields) { for (const f of g.fields) {
if (f.title && f.title.indexOf(cupNumKey) >= 0) { if (f.title && f.title.indexOf(cupNumKey) >= 0 && f.hidden != 1) {
if (typeof f.value === 'undefined' || f.value === null || f.value === '') hasHb = false if (typeof f.value === 'undefined' || f.value === null || f.value === '') hasHb = false
} }
} }
@@ -681,7 +681,7 @@ const saveDetail = async () => {
} }
// 如果处理后的值不为空，重新赋值该字段到其他样品类型下的样品上，并触发每一个样品的计算 // 如果处理后的值不为空，重新赋值该字段到其他样品类型下的样品上，并触发每一个样品的计算
for (const col of currentAssayType.value.columns) { for (const col of currentAssayType.value.columns) {
if (col.fieldIndex === sourceKey) { if (col.hidden != 1 && col.fieldIndex === sourceKey) {
if (item.value) { if (item.value) {
dynamicFormData[item.target] = item.value dynamicFormData[item.target] = item.value
} else { } else {
@@ -723,7 +723,7 @@ function updateTableDataByConfigFields() {
for (const key in dynamicFormData) { for (const key in dynamicFormData) {
for (const tab of needCalcTabs) { for (const tab of needCalcTabs) {
const columnObj = tab.columns.find(c => { const columnObj = tab.columns.find(c => {
if (c.formula) { if (c.formula && c.hidden !== 1) {
let FromKey = c.formula.split(':') let FromKey = c.formula.split(':')
return FromKey[1] === key || FromKey[0] === 'GetFrom' return FromKey[1] === key || FromKey[0] === 'GetFrom'
} }
@@ -1135,7 +1135,11 @@ const listenNumKeyboard = () => {
function syncFieldValueByEqualParamNo() { function syncFieldValueByEqualParamNo() {
for (const group of fieldGroup.value) { for (const group of fieldGroup.value) {
group.fields.forEach(field => { group.fields.forEach(field => {
if (field.paramNo === selectedField.value.paramNo && field.type === selectedField.value.type) { if (
field.paramNo === selectedField.value.paramNo &&
field.type === selectedField.value.type &&
field.hidden === selectedField.value.hidden
) {
field.value = selectedField.value.value field.value = selectedField.value.value
} }
}) })

9
pages/material/outbound/index.vue
View File

@@ -43,14 +43,19 @@
> >
</template> </template>
<template v-else> <template v-else>
<view class="mt4">
<view
>溶液编号：<text class="black">{{ item.code }}</text></view
>
</view>
<view class="mt4"> <view class="mt4">
<view <view
>溶液名称：<text class="black">{{ item.code }}</text></view >溶液名称：<text class="black">{{ item.name }}</text></view
> >
</view> </view>
<view class="mt4"> <view class="mt4">
<view <view
>规格：<text class="black">{{ item.name }}</text></view >规格：<text class="black">{{ item.modelNo }}</text></view
> >
</view> </view>
<view class="mt4" <view class="mt4"