232e4aa9 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents f205d763 334c33ea
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
21 <td colspan="2" align="center" >不动产单元号</td> 21 <td colspan="2" align="center" >不动产单元号</td>
22 <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号--> 22 <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号-->
23 <td colspan="4" > 23 <td colspan="4" >
24 <el-input v-model="form.bdcdyh" style="width: 70%" disabled></el-input> 24 <el-input v-model="form.bdcdyh" v-show="form.bdcdyh === ''||form.bdcdyh == null" style="width: 70%" disabled></el-input>
25 <el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button> 25 <el-input v-model="form.bdcdyh" v-show="form.bdcdyh !== ''&&form.bdcdyh != null" style="width: 100%" disabled></el-input>
26 <el-button v-show="form.bdcdyh === ''||form.bdcdyh == null" @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
26 </td> 27 </td>
27 <td colspan="2" align="center" >原不动产单元</td> 28 <td colspan="2" align="center" >原不动产单元</td>
28 <td colspan="4" > 29 <td colspan="4" >
......