From 0e37a0395c373d2d068e648550a7bdb9c8eb001c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 19 六月 2024 09:23:37 +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/fiberoptic-config.vue |   59 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index f44e8fb..1377575 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -104,11 +104,11 @@
         </el-col>
       </el-row>
       <el-row :gutter="10">
-        <el-col :span="12">
+        <el-col :span="12" v-if="packageInfo.ismiers">
           <div class="grid-content">
             <h5>鍏夌氦甯�
               <el-button size="mini" type="primary" class="btns" @click="addFibers"
-                :disabled="packageInfo.ismiers===false||miresModel===null||miresStandard===null" v-if="active==1">鐢熸垚鍏夌氦甯�</el-button>
+                :disabled="miresModel===null||miresStandard===null" v-if="active==1">鐢熸垚鍏夌氦甯�</el-button>
               <el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0" v-if="active==1">娓呴櫎</el-button>
             </h5>
             <div
@@ -150,7 +150,7 @@
             </el-table>
           </div>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="!packageInfo.ismiers?24:12">
           <div class="grid-content">
             <h5>鍏夌氦<el-button size="mini" type="primary" class="btns" @click="addFiber"
                 :disabled="mireModel===null||mireStandard===null" v-if="active==1">鍏夌氦閰嶈壊</el-button></h5>
@@ -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: {
@@ -491,8 +501,8 @@
           this.miresModels = []
           res.data.forEach(a => {
             this.miresModels.push({
-              label: a.sample,
-              value: a.sample
+              label: a.model,
+              value: a.model
             })
           })
         })
@@ -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