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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index c69bb70..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>
@@ -501,8 +501,8 @@
this.miresModels = []
res.data.forEach(a => {
this.miresModels.push({
- label: a.sample,
- value: a.sample
+ label: a.model,
+ value: a.model
})
})
})
--
Gitblit v1.9.3