Просмотр исходного кода

试剂更换验证组件调整相符计算逻辑

zhonghuizhen 7 месяцев назад
Родитель
Сommit
9b28820d2b
1 измененных файлов с 7 добавлено и 7 удалено
  1. 7 7
      src/views/component/newReagent/newNegativeReagent.vue

+ 7 - 7
src/views/component/newReagent/newNegativeReagent.vue

@@ -133,7 +133,7 @@
                   placeholder="请选择"
                 >
                   <el-option label="Y-X" value="Y-X" />
-                  <el-option label="Y-X/X(%)" value="Y-X/X(%)" />
+                  <el-option label="(Y-X)/X(%)" value="(Y-X)/X(%)" />
                 </el-select>
                 <span v-else>{{ row.jiSuanFangShi || '/' }}</span>
               </template>
@@ -343,7 +343,7 @@ export default {
         biaoBenHao: '',
         jiuJieGuo: '',
         xinJieGuo: '',
-        jiSuanFangShi: 'Y-X/X(%)',
+        jiSuanFangShi: '(Y-X)/X(%)',
         shiJiChaZhi: '',
         jieGuo: '',
         zuiXiaoFanWei: xianDingFanWei,
@@ -575,13 +575,13 @@ export default {
 
       const hasPyOrCz = this.reagentData.some(
         (item) =>
-          (item.jiSuanFangShi === 'Y-X/X(%)' && !item.yunXuPianYi) ||
+          (item.jiSuanFangShi === '(Y-X)/X(%)' && !item.yunXuPianYi) ||
           (item.jiSuanFangShi === 'Y-X' && !item.zuiXiaoFanWei)
       )
 
       if (hasPyOrCz) {
         this.$message.warning(
-          `计算方式为 Y-X/X(%) 请填写允许偏倚,计算方式为 Y-X 请填写${
+          `计算方式为 (Y-X)/X(%) 请填写允许偏倚,计算方式为 Y-X 请填写${
             this.isHz ? '允许差值' : '限定范围'
           }`
         )
@@ -608,8 +608,8 @@ export default {
           //item.shiJiChaZhi = Math.abs((xinJieGuo * 100000 - jiuJieGuo * 100000) / 100000)
           item.shiJiChaZhi = (xinJieGuo * 100000 - jiuJieGuo * 100000) / 100000
           item.xiangFu =
-            normalizePercent(item.shiJiChaZhi) <=
-            normalizePercent(zuiXiaoFanWei)
+          Math.abs(normalizePercent(item.shiJiChaZhi)) <=
+          Math.abs(normalizePercent(zuiXiaoFanWei))
               ? '相符'
               : '不相符'
           item.jieGuo = ''
@@ -617,7 +617,7 @@ export default {
           //item.jieGuo = this.deleteAccuracy(Math.abs(xinJieGuo - jiuJieGuo) / jiuJieGuo)
           item.jieGuo =  this.deleteAccuracy((xinJieGuo - jiuJieGuo) / jiuJieGuo)
           item.xiangFu =
-            normalizePercent(item.jieGuo) <= normalizePercent(item.yunXuPianYi)
+          Math.abs(normalizePercent(item.jieGuo)) <= Math.abs(normalizePercent(item.yunXuPianYi))
               ? '相符'
               : '不相符'
           item.shiJiChaZhi = ''