From 71a8e88eccd5626877c4ab2c93f523c4f71d79c1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 09 八月 2024 10:38:28 +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 | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index aef1696..17c6272 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -35,12 +35,12 @@
</div>
<div class="search-item" style="margin-right: 10px;">
<label style="width: 100px">姣忔牴绠℃娊妫�鏍囧噯閲�</label>
- <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @blur="addStandNum" :disabled="active!=1" style="width:100px"></el-input>
+ <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @blur="addStandNum" :disabled="active!=1" style="width:70px"></el-input>
</div>
<div class="search-item">
<label style="width: 100px">姣忔牴绠℃娊妫�妫�娴嬮噺</label>
<el-input v-model="packageInfo.testNum" placeholder="璇疯緭鍏�" size="small" @blur="addTestNum"
- :disabled="packageInfo.radio===0||active!=1" style="width:100px"></el-input>
+ :disabled="packageInfo.radio===0||active!=1" style="width:70px"></el-input>
</div>
</div>
<el-table ref="table0" :data="bushing" tooltip-effect="dark" style="width: 100%" height="203px" size="small"
@@ -527,7 +527,8 @@
})
})
- if(this.multiFiberList.length == 1) {
+ // 閫夋嫨鐨勬椂鍊欏氨灏唂iberList鐨勫�艰祴鍊肩粰瀵瑰簲鐨刦iberList
+ if(this.multiFiberList.length > 0) {
this.multiFiberList.forEach(item => {
this.fibersList.forEach(a => {
if(a.ident == item.ident){
@@ -535,10 +536,6 @@
}
})
})
- }else if(this.multiFiberList.length > 1) {
- this.fibersList.forEach(item => {
- item.fiber = this.fiberList
- })
}
}
},
--
Gitblit v1.9.3