From 86180d1e80a0cc6faf147495d7e78bfeaf329214 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:04:01 +0800
Subject: [PATCH] 小功能修复
---
src/components/do/b1-ins-order/add.vue | 80 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 23 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 9ff08a8..d3e75ff 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -559,15 +559,25 @@
</el-col>
</el-col>
</el-row>
- <el-row v-if="bsm3">
+ <!-- <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>
+ </el-row> -->
</div>
+ </el-dialog>
+ <el-dialog title="RTS濉啓" :visible.sync="bsm3Dia" width="500px" :show-close="false" :before-close="beforeClose0">
+ <el-row>
+ <el-col class="search_thing" :span="22" style="display: flex;align-items: center;">
+ <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>
</el-dialog>
</div>
</template>
@@ -720,7 +730,7 @@
bsm2Val3: [],
bsmRow3:null,
bsm3Val:null,
- bsm3:false,
+ bsm3Dia:false,
total: 0,
RTS: '',
totalArr: []
@@ -947,7 +957,7 @@
return a
})),
pairing: JSON.stringify(this.bsm2Val2)
- })
+ })
}).then(res => {
this.saveLoad = false
if (res.code == 201) return
@@ -1103,6 +1113,8 @@
this.sample.insProduct = []
this.sample.id = this.count
this.sample.childSampleList = []
+ this.sample.insulating = null
+ this.sample.sheath = null
this.sampleList.push(this.HaveJson(this.sample))
this.count++
}
@@ -1134,6 +1146,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
@@ -1216,18 +1229,22 @@
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.bsm3Dia = true
this.bsmRow3 = row
}else{
- this.bsm3 = false
+ this.bsm3Dia = false
}
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
@@ -1471,17 +1488,19 @@
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.bsm3Dia = true
this.bsmRow3.push(p)
- }else{
- this.bsm3 = false
}
})
if (e.length > 0) {
@@ -1686,18 +1705,33 @@
}
}
}
- if(this.bsm3){
- if(!this.bsm3Val){
- this.$message.error('RST蹇呴』濉啓')
- return
+ // 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()
+ },
+ beforeClose0(done) {
+ if(!this.bsm3Val){
+ this.$message.error('RST蹇呴』濉啓')
+ return
+ }else{
+ if(Array.isArray(this.bsmRow3)){
+ this.bsmRow3.forEach(item=>{
+ item.rts = this.bsm3Val
+ })
}else{
- if(Array.isArray(this.bsmRow3)){
- this.bsmRow3.forEach(item=>{
- item.rts = this.bsm3Val
- })
- }else{
- this.bsmRow3.rts = this.bsm3Val
- }
+ this.bsmRow3.rts = this.bsm3Val
}
}
done()
--
Gitblit v1.9.3