From 05042558a60020be98a8e86a6223bd6acbdc5237 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 28 六月 2024 11:55:50 +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 | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index b4a4ca4..2332c9f 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -914,14 +914,16 @@
this.selectUserDia = false
},
containsValue(str) {
- let symbolItem = ''
- this.symbolList.some(value =>{
- if(str.includes(value)){
- symbolItem = value
- return true
- }
- })
- return symbolItem
+ if(str){
+ let symbolItem = ''
+ this.symbolList.some(value =>{
+ if(str.includes(value)){
+ symbolItem = value
+ return true
+ }
+ })
+ return symbolItem
+ }
},
handleAsk(ask,symbolItem, value) {
try{
@@ -1001,6 +1003,9 @@
let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
if (isRTS) {
this.editTable = this.handleData(sampleList,this.containsValue, 0)
+ this.editTable.forEach(item => {
+ item.value = item.modelNum
+ })
this.bsm3Dia = true;
return
}
@@ -1024,6 +1029,7 @@
model:item.model,
symbolList:[],
sampleId:item.id,
+ modelNum:item.modelNum,
}
if (item.insProduct && item.insProduct.length > 0) {
item.insProduct.forEach(a => {
@@ -1192,6 +1198,7 @@
sampleId:a.sampleId,
value:null,
inspectionItemList:b.inspectionItemList,
+ modelNum:a.modelNum,
}
editTableNew.push(obj)
})
@@ -1349,7 +1356,7 @@
}
},
selectStandardTreeList() {
- this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
+ this.$axios.get(this.$api.standardTree.selectStandardTreeList2).then(res => {
this.list = res.data
this.list.forEach(a => {
this.expandedKeys.push(a.label)
--
Gitblit v1.9.3