cd3475f4 by renchao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 2634909f 610a6876
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
159 </el-radio-group> 159 </el-radio-group>
160 </el-form-item> 160 </el-form-item>
161 </el-col> 161 </el-col>
162 <el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0"> 162 <el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0&&ruleForm.sldyList[0].sqfbcz=='0'">
163 <el-form-item label="持证人:"> 163 <el-form-item label="持证人:">
164 <el-select 164 <el-select
165 v-model="ruleForm.czr" 165 v-model="ruleForm.czr"
......
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
160 </el-radio-group> 160 </el-radio-group>
161 </el-form-item> 161 </el-form-item>
162 </el-col> 162 </el-col>
163 <el-col :span="5" v-show="ruleForm.sldyList[0].gyfs != '0'"> 163 <el-col :span="5" v-show="ruleForm.sldyList[0].gyfs != '0'&&ruleForm.sldyList[0].sqfbcz == '0' ">
164 <el-form-item label="持证人:"> 164 <el-form-item label="持证人:">
165 <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit"> 165 <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit">
166 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value"> 166 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
......