From 2612914b538d345c861a8fbe5e330eec1abc1fdd Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 12 六月 2024 15:57:11 +0800
Subject: [PATCH] 修改RTS
---
src/components/do/b1-ins-order/add.vue | 62 +++++++++++++++++++++----------
src/components/do/b1-ins-order/fiberoptic-config.vue | 49 ++++++++++++++----------
2 files changed, 70 insertions(+), 41 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index ec27cad..c247a92 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: []
@@ -1229,11 +1239,10 @@
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) {
@@ -1488,10 +1497,8 @@
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) {
@@ -1696,18 +1703,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()
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index f44e8fb..c69bb70 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -269,15 +269,25 @@
</el-col>
</el-col>
</el-row>
- <el-row v-if="bsm3">
+ <!-- <el-row v-if="bsm3">
<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-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>
@@ -340,9 +350,9 @@
bsm2Val2: [],
bsm2Val3: [],
sampleIds:[],
- bsm3: false,
bsm3Val: null,
bsmRow3: null,
+ bsm3Dia: false,
}
},
computed: {
@@ -758,11 +768,8 @@
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
}
})
@@ -839,11 +846,10 @@
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
}
},
computationalPairing(n){
@@ -916,18 +922,19 @@
}
}
}
- if(this.bsm3){
- if(!this.bsm3Val){
- this.$message.error('RST蹇呴』濉啓')
- return
+ 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