From 48e38a0a41dfbaa2776dade107101ea439c17a22 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 20 六月 2024 11:48:53 +0800
Subject: [PATCH] 添加检验方法
---
src/components/do/b1-ins-order/add.vue | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 03bbca0..b75659e 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -163,7 +163,7 @@
</el-select>
</div>
</el-col>
- <el-col class="search_thing" :span="6">
+ <el-col class="search_thing" :span="6" style="display: none;">
<div class="search_label"><span class="required-span">* </span>濮旀墭浜猴細</div>
<div class="search_input">
<el-input size="small" clearable disabled v-model="addObj.custom"></el-input>
@@ -171,6 +171,12 @@
<template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
:disabled="active>1"></el-button></template>
</el-input> -->
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label">鍒跺崟浜猴細</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
@@ -303,12 +309,6 @@
<div class="search_label">OTC璁㈠崟鍙凤細</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label">鍒跺崟浜猴細</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
@@ -801,6 +801,8 @@
totalArr: [],
model: null,
standardMethodListId: null,
+ symbolList:[
+ 'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z']
}
},
watch: {
@@ -906,9 +908,8 @@
this.selectUserDia = false
},
containsValue(str) {
- let arr = ['RTS','D','W','X','H','L']
let symbolItem = ''
- arr.some(value =>{
+ this.symbolList.some(value =>{
if(str.includes(value)){
symbolItem = value
return true
@@ -942,6 +943,12 @@
return code[index] + '' + num
}
}
+ }catch(e){}
+ },
+ handleTell(tell,symbolItem, value){
+ try{
+ let num = this.replaceAll(tell, symbolItem, value)
+ return num
}catch(e){}
},
replaceAll(str,find,value) {
@@ -985,9 +992,7 @@
this.saveMethod(sampleList)
}).catch(() => {})
}else{
- let isRTS = this.totalArr.find(a => a.ask != null && (a.ask.includes('RTS') || a.ask.includes('D') || a.ask
- .includes('W') ||
- a.ask.includes('X') || a.ask.includes('H') || a.ask.includes('L')) && a.state == 1)
+ 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.bsm3Dia = true;
@@ -1024,6 +1029,10 @@
if (ask) {
a.ask = ask
}
+ let tell = this.handleTell(a.tell, f.symbolItem,f.value)
+ if (tell) {
+ a.tell = tell
+ }
}
})
}
@@ -1042,16 +1051,16 @@
let str = calBack(c.ask)
str&&obj.symbolList.push(str)
}else if(type==1){
- // let ask = calBack(c.ask, c.rts)
- // if (ask && c.state == 1) {
- // c.ask = csk
- // }
let arr = this.editTable.filter(b => b.sampleId == item.id)
arr.forEach(f => {
if(c.ask.includes(f.symbolItem)){
let ask = calBack(c.ask, f.symbolItem,f.value)
if (ask) {
c.ask = ask
+ }
+ let tell = this.handleTell(c.tell, f.symbolItem,f.value)
+ if (tell) {
+ c.tell = tell
}
}
})
@@ -1081,6 +1090,10 @@
if (ask) {
c.ask = ask
}
+ let tell = this.handleTell(c.tell, f.symbolItem,f.value)
+ if (tell) {
+ c.tell = tell
+ }
}
})
}
@@ -1107,6 +1120,10 @@
if (ask) {
d.ask = ask
}
+ let tell = this.handleTell(d.tell, f.symbolItem,f.value)
+ if (tell) {
+ d.tell = tell
+ }
}
})
}
--
Gitblit v1.9.3