930baca4 by renchao@pashanhoo.com

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

2 parents cb128d56 439724e9
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
96 <el-row :gutter="10" v-if="ruleForm.qlxx"> 96 <el-row :gutter="10" v-if="ruleForm.qlxx">
97 <el-col :span="8"> 97 <el-col :span="8">
98 <el-form-item label="房屋用途:"> 98 <el-form-item label="房屋用途:">
99 <el-select v-model="ruleForm.ygdj.ghyt"> 99 <el-select v-model="ruleForm.ygdj.ghyt" :disabled="!viewEdit">
100 <el-option 100 <el-option
101 v-for="item in dictData['A17']" 101 v-for="item in dictData['A17']"
102 :key="item.dcode" 102 :key="item.dcode"
...@@ -182,6 +182,7 @@ ...@@ -182,6 +182,7 @@
182 <el-col :span="24"> 182 <el-col :span="24">
183 <el-form-item label="附记:"> 183 <el-form-item label="附记:">
184 <el-input 184 <el-input
185 :disabled="!viewEdit"
185 v-model="ruleForm.ygdj.fj" 186 v-model="ruleForm.ygdj.fj"
186 type="textarea" 187 type="textarea"
187 maxlength="500" 188 maxlength="500"
......