From d1b46161801b8b4641bdec066796d75d80eebb2f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 04 六月 2024 13:36:17 +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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 359d6f1..859813e 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -91,8 +91,8 @@
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" width="70" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="manDay" label="棰勮鏃堕棿" width="90" show-overflow-tooltip>
- </el-table-column>
+ <!-- <el-table-column prop="manDay" label="棰勮鏃堕棿" width="90" show-overflow-tooltip>
+ </el-table-column> -->
<el-table-column prop="ask" label="妫�娴嬭姹�" show-overflow-tooltip width="200px">
<template slot-scope="scope">
<el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead"></el-input>
@@ -289,7 +289,7 @@
}
})
this.models = this.models.replace(',', '')
- this.packageInfo.ismiers = this.models.split(',').every(e=>e.indexOf('d')>-1)
+ this.packageInfo.ismiers = this.models.split(',').every(e=>(e.indexOf('d')>-1||e.indexOf('D')))
if(this.sample[0].bushing === undefined || this.sample[0].bushing === null){
this.bushing = []
}else{
--
Gitblit v1.9.3