From 2a47c9ed50431ff83625d7e38da0e68261c81622 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 15:10:59 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b1-inspection-order.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 558a287..9d19061 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -227,7 +227,8 @@
</el-dialog>
</div>
<div style="width: 100%;height: 100%;" v-if="active >0">
- <Add :active="active" :currentId="currentId" />
+ <Add :active="active" :currentId="currentId" v-if="active<4" />
+ <fiberOpticConfig :currentId="currentId" v-if="active==4" />
</div>
</div>
</template>
@@ -235,10 +236,12 @@
<script>
import ValueTable from '../tool/value-table.vue'
import Add from '../do/b1-ins-order/add.vue'
+ import fiberOpticConfig from '../do/b1-ins-order/fiberoptic-config.vue'
export default {
components: {
ValueTable,
- Add
+ Add,
+ fiberOpticConfig
},
data() {
return {
--
Gitblit v1.9.3