feat:样品分析计算bug

pages/analysis/sample/sample-work-detail.vue

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

pages/material/outbound/index.vue

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