From c26e25fc5307d23fddcda5f6692ec62acbecc8f3 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 12 六月 2024 14:43:59 +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 | 79 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 13 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index e28f310..ec27cad 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -294,12 +294,12 @@
v-model="addObj.remark" :readonly="active>1"></el-input>
</div>
</el-col>
- <el-col class="search_thing" :span="6" v-if="active==1">
+ <!-- <el-col class="search_thing" :span="6" v-if="active==1">
<div class="search_label">RTS锛�</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="RTS"></el-input>
</div>
- </el-col>
+ </el-col> -->
</el-row>
</div>
<div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
@@ -559,6 +559,14 @@
</el-col>
</el-col>
</el-row>
+ <el-row v-if="bsm3">
+ <el-col class="search_thing" :span="22">
+ <div class="search_label"><span class="required-span">* </span>RTS锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="bsm3Val"></el-input>
+ </div>
+ </el-col>
+ </el-row>
</div>
</el-dialog>
</div>
@@ -710,6 +718,9 @@
bsm2Dia: false,
bsm2Val2: [],
bsm2Val3: [],
+ bsmRow3:null,
+ bsm3Val:null,
+ bsm3:false,
total: 0,
RTS: '',
totalArr: []
@@ -808,7 +819,7 @@
this.addObj.companyId = selects.id
this.selectUserDia = false
},
- handleAsk(ask) {
+ handleAsk(ask,rts) {
let code = [">", "<", "=", "锛�", "锛�", "鈮�", "鈮�", "卤"];
if (ask.includes('RTS')) {
if (ask.includes('&')) {
@@ -819,7 +830,7 @@
let index = code.findIndex(b => m.includes(b))
if (index > -1) {
let arr = m.split(code[index]).filter(b => !!b)
- let num = eval(this.replaceAll(arr[0], 'RTS', this.RTS))
+ let num = eval(this.replaceAll(arr[0], 'RTS', rts))
m = code[index] + '' + num
arr1.push(m)
}
@@ -830,7 +841,7 @@
let index = code.findIndex(b => ask.includes(b))
if (index > -1) {
let arr = ask.split(code[index]).filter(b => !!b)
- let num = eval(this.replaceAll(arr[0], 'RTS', this.RTS))
+ let num = eval(this.replaceAll(arr[0], 'RTS', rts))
return code[index] + '' + num
}
}
@@ -862,8 +873,6 @@
this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
} else if (!this.sampleList.every(m => m.standardMethodListId)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
- } else if (this.totalArr.find(a => a.ask!=null&&a.ask.includes('RTS')&&a.state==1) && !this.RTS) {
- this.$message.error('璇疯緭鍏TS')
} else {
let sampleList = this.HaveJson(this.sampleList)
let isRTS = this.totalArr.find(a=>a.ask!=null&&a.ask.includes('RTS')&&a.state==1)
@@ -872,7 +881,7 @@
if(item.insProduct&&item.insProduct.length>0){
item.insProduct.forEach(a=>{
if(a.state==1){
- let ask = this.handleAsk(a.ask)
+ let ask = this.handleAsk(a.ask,a.rts)
if(ask&&a.state==1){
a.ask = ask
}
@@ -887,7 +896,7 @@
if(b.productList&&b.productList.length>0){
b.productList.forEach(c=>{
if(c.state==1){
- let ask = this.handleAsk(c.ask)
+ let ask = this.handleAsk(c.ask,c.rts)
if(ask&&c.state==1){
c.ask = ask
}
@@ -901,7 +910,7 @@
if(b.productList&&b.productList.length>0){
b.productList.forEach(c=>{
if(c.state==1){
- let ask = this.handleAsk(c.ask)
+ let ask = this.handleAsk(c.ask,c.rts)
if(ask&&c.state==1){
c.ask = ask
}
@@ -913,7 +922,7 @@
if(c.productList&&c.productList.length>0){
c.productList.forEach(d=>{
if(d.state==1){
- let ask = this.handleAsk(d.ask)
+ let ask = this.handleAsk(d.ask,d.rts)
if(ask){
d.ask = ask
}
@@ -1125,6 +1134,7 @@
addStandardTree() {
if (this.selectTree == null) return
this.sampleList = []
+ this.productList = []
for (var i = 0; i < this.addObj.sampleNum; i++) {
this.sample.joinName = null
this.sample.joinModel = null
@@ -1207,8 +1217,23 @@
this.computationalPairing(this.sampleList.length)
this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
}
- } else if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && row.state === 1) {
+ } else if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && row.state === 1 && this.sampleList.length > 1) {
this.bsm2 = false
+ } else if(row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length < 2){
+ this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
+ row.state = row.state == 1 ? 0 : 1
+ this.$refs.productTable.toggleRowSelection(row, false)
+ return
+ }
+ if (row.ask.includes('RTS')&&row.state === 1) {
+ this.bsmRow3 = null;
+ row.rts = ''
+ this.bsm3Val = ''
+ this.bsm3 = true
+ this.bsm1Dia = true
+ this.bsmRow3 = row
+ }else{
+ this.bsm3 = false
}
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
@@ -1433,6 +1458,7 @@
return m
})
}
+ this.bsmRow3 = [];
this.productList.forEach(p => {
if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
if (p.section.indexOf('[') > -1) {
@@ -1451,8 +1477,21 @@
this.computationalPairing(this.sampleList.length)
this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
}
- } else if (p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && p.state === 1) {
+ } else if (p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && p.state === 1 && this.sampleList.length > 1) {
this.bsm2 = false
+ } else if(p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length < 2){
+ this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
+ this.$refs.productTable.clearSelection()
+ return
+ }
+ if (p.ask.includes('RTS')&&p.state === 1) {
+ p.rts = ''
+ this.bsm3Val = ''
+ this.bsm3 = true
+ this.bsm1Dia = true
+ this.bsmRow3.push(p)
+ }else{
+ this.bsm3 = false
}
})
if (e.length > 0) {
@@ -1657,6 +1696,20 @@
}
}
}
+ if(this.bsm3){
+ if(!this.bsm3Val){
+ this.$message.error('RST蹇呴』濉啓')
+ return
+ }else{
+ if(Array.isArray(this.bsmRow3)){
+ this.bsmRow3.forEach(item=>{
+ item.rts = this.bsm3Val
+ })
+ }else{
+ this.bsmRow3.rts = this.bsm3Val
+ }
+ }
+ }
done()
},
getTotal() {
--
Gitblit v1.9.3