From 347030895032792e730394b362ce1473c0df6b03 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期四, 04 七月 2024 18:15:36 +0800
Subject: [PATCH] 1.表格要求值计算 2.温度循环下单逻辑修改
---
src/components/do/b1-ins-order/add.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 20b16e4..03c77c1 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1021,9 +1021,9 @@
temperatureDataList: [
{label: '<', value: '<'},
{label: '鈮�', value: '鈮�'},
- {label: '锛�', value: '锛�'},
+ {label: '=', value: '='},
{label: '鈮�', value: '鈮�'},
- {label: '锛�', value: '锛�'},
+ {label: '>', value: '>'},
]
}
},
@@ -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)
@@ -1391,7 +1394,7 @@
}).catch(() => {})
}else{
let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
- if (isRTS) {
+ if (isRTS&&this.PROJECT=='妫�娴嬩腑蹇�') {
this.editTable = this.handleData(sampleList,this.containsValue, 0)
this.editTable.forEach(item => {
item.value = item.modelNum
--
Gitblit v1.9.3