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 +++++--
1 files changed, 5 insertions(+), 2 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)
--
Gitblit v1.9.3