From a0b1fdec2bc5ddad11e981936b80d0fdf1e4bc69 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 09:25:06 +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 | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 146b2e8..d6e3822 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1101,22 +1101,31 @@
this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
return
}
+
const opticalProjectList = JSON.parse(JSON.stringify(this.opticalProjectList))
let entrustTime = this.circulateForm.entrustTime
let entrustNum = this.circulateForm.entrustNum
let temperaturePoint1 = JSON.parse(JSON.stringify(this.temperatureData))
-
+ temperaturePoint1.forEach(t => {
+ if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
+ throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ }
+ })
let temperaturePoint = JSON.parse(JSON.stringify(this.temperatureData))
- temperaturePoint.unshift({temperaturePoint: 20, askSymbol: null, askNum: null})
+ temperaturePoint.unshift({temperaturePoint: 20})
let askArr = []
let opticalProjectArr = []
// 鎷兼帴瑕佹眰鍊糰sk
opticalProjectList.forEach(o => {
opticalProjectArr.push(o.value)
temperaturePoint.forEach(t => {
- t.temperaturePoint = t.temperaturePoint + '鈩�'
- const askObj = t.temperaturePoint + ',' + o.value + ',' + t.askSymbol + t.askNum
- askArr.push(askObj)
+ if (!t.askSymbol) {
+ const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + null
+ askArr.push(askObj)
+ } else {
+ const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + t.askSymbol + t.askNum
+ askArr.push(askObj)
+ }
})
})
askArr.push(this.circulateForm.entrustNum)
@@ -1132,9 +1141,6 @@
temperaturePointList.push(t.temperaturePoint)
})
temperaturePoint1.forEach(t => {
- if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
- throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
- }
t.temperaturePoint = t.temperaturePoint + '鈩�'
askNum.push(t.askSymbol + t.askNum + 'dB/Km')
temperaturePointList2.push(t.temperaturePoint)
@@ -1143,6 +1149,7 @@
askNum.forEach(a => {
additionArr.push(temperaturePointList2.join(',') + a)
})
+ temperaturePointList2.unshift(20 + '鈩�')
const tell = '娓╁害鑼冨洿:' + temperaturePointList2.join(',') + ';' + '淇濇俯鏃堕棿:' + entrustTime + ';' + '寰幆娆℃暟:'
+ entrustNum + ';' + '鍏夌氦(' + opticalProjectArr.join(',') + ')' + '闄勫姞琛板噺缁濆鍊�:' + additionArr.join(';')
this.productList.forEach(item => {
@@ -1151,6 +1158,8 @@
item.tell = tell
}
})
+ console.log('ask---', ask)
+ console.log('tell---', tell)
this.circulateShow = false
},
beforeCirculateShowClose () {
@@ -1384,18 +1393,36 @@
})
}else if(type==1){
let arr = this.editTable.filter(b => b.sampleId == item.id)
- arr.forEach(f => {
- if(a.ask.includes(f.symbolItem)){
- let ask = calBack(a.ask, f.symbolItem,f.value)
- if (ask) {
- a.ask = ask
+ for (var i=0;i<arr.length;i++){
+ if(a.ask){
+ if(a.ask.includes(arr[i].symbolItem)){
+ let ask = calBack(a.ask, arr[i].symbolItem,arr[i].value)
+ if (ask) {
+ a.ask = ask
+ }
+ let tell = this.handleTell(a.tell, arr[i].symbolItem,arr[i].value)
+ if (tell) {
+ a.tell = tell
+ }
}
- let tell = this.handleTell(a.tell, f.symbolItem,f.value)
- if (tell) {
- a.tell = tell
- }
+ }else{
+ this.$message.error('瑕佹眰鍊间负绌猴紝闇�瑕佸幓鏍囧噯搴撶淮鎶わ紒')
}
- })
+ }
+ // arr.forEach(f => {
+ // if(a.ask){
+ // if(a.ask.includes(f.symbolItem)){
+ // let ask = calBack(a.ask, f.symbolItem,f.value)
+ // if (ask) {
+ // a.ask = ask
+ // }
+ // let tell = this.handleTell(a.tell, f.symbolItem,f.value)
+ // if (tell) {
+ // a.tell = tell
+ // }
+ // }
+ // }else{}
+ // })
}
}
})
--
Gitblit v1.9.3