From c321b88b97de37e6822774a3127a79a4eabfcbe9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 05 七月 2024 09:58:26 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 48806e7..3e8517e 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -524,14 +524,14 @@
prop="resValue"
label="琛板噺宸�"
align="center"
- v-if="wareForm.inspectionItemSubclass!=20"
+ v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'"
min-width="150">
</el-table-column>
<el-table-column
prop="insResult"
label="缁撹"
align="center"
- min-width="150" v-if="wareForm.inspectionItemSubclass!=20">
+ min-width="150" v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'">
<template slot-scope="scope">
<span v-if="scope.row.insResult===1" style="color: green;">鍚堟牸</span>
<span v-else-if="scope.row.insResult===0" style="color: red;">涓嶅悎鏍�</span>
@@ -793,7 +793,7 @@
currentTab:null,
wareForm:{
inspectionItem:1,
- inspectionItemSubclass:20,
+ inspectionItemSubclass:'20(甯告俯)',
},
wareForm0:{},
numOptions:[],
@@ -977,7 +977,7 @@
v:row.comValue
}
}]
- if(this.wareForm.inspectionItemSubclass!=20){
+ if(this.wareForm.inspectionItemSubclass!='20(甯告俯)'){
row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(3):''
this.param[row.id].resValue.v.v = row.resValue
if(row.ask&&row.resValue){
@@ -1008,7 +1008,12 @@
this.wareForm[type] = Number(m)
}
let wareForm = {...this.wareForm}
- wareForm.inspectionItemSubclass = wareForm.inspectionItemSubclass+'鈩�'
+ if(this.wareForm.inspectionItemSubclass=='20(甯告俯)'){
+ wareForm.inspectionItemSubclass ='20鈩�(甯告俯)'
+ console.log(wareForm)
+ }else{
+ wareForm.inspectionItemSubclass = wareForm.inspectionItemSubclass+'鈩�'
+ }
this.wareTableDataLoading = true
this.$axios.post(this.$api.insOrderPlan.temCycle,{
sampleId:this.currentSample.id,
@@ -1398,7 +1403,7 @@
this.temperatureOptions = []
mySet1.forEach(m => {
this.temperatureOptions.push({
- value:m,
+ value:String(m),
label:m
})
})
@@ -1697,6 +1702,9 @@
}else{
if(ask){
comp = ask.map((m, i) => {
+ if (m.includes('RTS')) {
+ m = m.replace('RTS*', '')
+ }
if (m.includes('=')) {
let str = this.handleFraction(m.split('=')[1])
if(typeof res == 'string'&&typeof str == 'string'){
@@ -1750,7 +1758,13 @@
let comResult = ''
try {
if(this.getInspectionValueType(item.i)==1){
+ let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask?this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
comResult = excelFunction.compute(item.v.f.replace(/=/g, ' '),comValue)
+ // 瑁呭椤圭洰妫�楠屽�艰浆鍖�
+ if (this.PROJECT === '瑁呭鐢电紗' && ask[0].includes('RTS')) {
+ let num2 = new this.$Big(comResult)
+ comResult = num2.toExponential()
+ }
}else{
let valueList = [];
item.valueList.forEach(a => {
@@ -1760,7 +1774,6 @@
value: 0,
})
})
- console.log(comValue)
for (var a in comValue) {
valueList.forEach(b => {
if (b.name == a) {
@@ -1809,7 +1822,14 @@
handleFraction(str){
if(str&&typeof(str)=='string'&&str.includes('/')){
return eval(str.split('/')[0]/str.split('/')[1])
- }else{
+ } else if (str && typeof(str) == 'string' && str.includes('*') && str.includes('^')) {
+ const num1 = str.split('*')
+ const num2 = num1[1].split('^')
+ let num3 = new this.$Big(num2[0]);
+ let num4 = new this.$Big(num2[1]);
+ let num5 = Math.pow(num3, num4) // 璁＄畻娆℃柟
+ return num1[0] * num5 // 鏈�鍚庤绠椾箻娉�
+ } else{
return str
}
},
--
Gitblit v1.9.3