From 8e0602b290e4aea4beeb6d3a7a2be27ea579f14a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 04 七月 2024 18:15:58 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-ins-order/add.vue | 7 +++++--
src/components/do/b1-inspect-order-plan/Inspection.vue | 18 +++++++++++++++++-
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 346e0b1..97f8f39 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1112,6 +1112,9 @@
throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
}
})
+ if (!o.temperatureData.some(item => item.temperaturePoint == '20')) {
+ throw this.$message.error(`${o.value + '娉㈤暱娌℃湁閰嶇疆20鈩冩俯搴︾偣'}`)
+ }
})
let entrustTime = this.circulateForm.entrustTime
let entrustNum = this.circulateForm.entrustNum
@@ -1123,7 +1126,7 @@
o.temperatureData.unshift({temperaturePoint: 20})
o.temperatureData.forEach(t => {
if (!t.askSymbol) {
- const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + null
+ const askObj = t.temperaturePoint + '鈩�(甯告俯)' + ',' + o.value + ',' + null
askArr.push(askObj)
} else {
const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + t.askSymbol + t.askNum
@@ -1149,7 +1152,7 @@
})
temperaturePointList = Array.from(new Set(temperaturePointList))
temperaturePointList2 = Array.from(new Set(temperaturePointList2))
- temperaturePointList2.unshift(20 + '鈩�')
+ temperaturePointList2.unshift(20 + '鈩�(甯告俯)')
let additionArr = []
askNum.forEach(a => {
additionArr.push(temperaturePointList.join(',') + a)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 48806e7..05a6303 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1697,6 +1697,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 +1753,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 => {
@@ -1809,7 +1818,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