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 | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 5461704..d6e3822 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1393,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