bug-4971 试剂更换验证

src/views/component/newReagent/newReagent.vue

@@ -30,7 +30,7 @@
                                 <span v-else>{{ row.nongDu|| '/' }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="样品编号" prop="biaoBenHao" width="100">
+                        <el-table-column label="样品编号" prop="biaoBenHao" width="150">
                             <template slot-scope="{row}">
                                 <el-input v-if="!disabled" v-model="row.biaoBenHao" size="mini" placeholder="请输入" />
                                 <span v-else>{{ row.biaoBenHao|| '/' }}</span>
@@ -38,13 +38,13 @@
                         </el-table-column>
                         <el-table-column label="旧试剂测得结果" prop="jiuJieGuo" width="130">
                             <template slot-scope="{row}">
-                                <el-input v-if="!disabled" v-model="row.jiuJieGuo" :min="0" size="mini" placeholder="请输入" type="number" />
+                                <el-input v-if="!disabled" v-model="row.jiuJieGuo" :min="0" size="mini" placeholder="请输入" />
                                 <span v-else>{{ row.jiuJieGuo|| '/' }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="新试剂测得结果" prop="xinJieGuo" width="130">
                             <template slot-scope="{row}">
-                                <el-input v-if="!disabled" v-model="row.xinJieGuo" :min="0" size="mini" placeholder="请输入" type="number" />
+                                <el-input v-if="!disabled" v-model="row.xinJieGuo" :min="0" size="mini" placeholder="请输入" />
                                 <span v-else>{{ row.xinJieGuo|| '/' }}</span>
                             </template>
                         </el-table-column>
@@ -438,15 +438,18 @@ export default {
                 const { jiSuanFangShi, xinJieGuo, jiuJieGuo, zuiXiaoFanWei, jianCeXiangMu } = item
 
                 // 计算差值/偏倚
-                if (jiSuanFangShi === '|Y-X|') {
-                    item.shiJiChaZhi = Math.abs((xinJieGuo * 100000 - jiuJieGuo * 100000) / 100000)
-                    item.xiangFu = normalizePercent(item.shiJiChaZhi) <= normalizePercent(zuiXiaoFanWei) ? '相符' : '不相符'
-                    item.jieGuo = ''
-                } else {
-                    item.jieGuo = this.deleteAccuracy(Math.abs(xinJieGuo - jiuJieGuo) / jiuJieGuo)
-                    item.xiangFu = normalizePercent(item.jieGuo) <= normalizePercent(item.yunXuPianYi) ? '相符' : '不相符'
-                    item.shiJiChaZhi = ''
+                if(!isNaN(xinJieGuo) && !isNaN(jiuJieGuo)){
+                    if (jiSuanFangShi === '|Y-X|') {
+                        item.shiJiChaZhi = Math.abs((xinJieGuo * 100000 - jiuJieGuo * 100000) / 100000)
+                        item.xiangFu = normalizePercent(item.shiJiChaZhi) <= normalizePercent(zuiXiaoFanWei) ? '相符' : '不相符'
+                        item.jieGuo = ''
+                    } else {
+                        item.jieGuo = this.deleteAccuracy(Math.abs(xinJieGuo - jiuJieGuo) / jiuJieGuo)
+                        item.xiangFu = normalizePercent(item.jieGuo) <= normalizePercent(item.yunXuPianYi) ? '相符' : '不相符'
+                        item.shiJiChaZhi = ''
+                    }
                 }
+                
 
                 // 统计符合率
                 const stats = projectStats.get(jianCeXiangMu) || { total: 0, yes: 0 }