232e4aa9 by weimo934

Merge remote-tracking branch 'origin/master'

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