60b00c34 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 456b7b10 eec74a76
......@@ -28,45 +28,67 @@
<!-- <td colspan="4" >-->
<!-- <el-input v-model="form.ydybsm" disabled></el-input>-->
<!-- </td>-->
<td colspan="2" align="center" >
<span>坐落<i class="requisite">*</i></span>
</td>
<td colspan="2" align="center" >逻辑幢号</td>
<td colspan="4" >
<input class="formInput" v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag" />
<el-input v-model="form.ljzh" disabled></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >逻辑幢号</td>
<td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td>
<td colspan="4" >
<el-input v-model="form.ljzh" disabled></el-input>
<el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag" ref="fwxzbsm">
<el-option
v-for="item in $store.state.fwxzOptions"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</td>
<td colspan="2" align="center" >层号</td>
<td colspan="2" align="center" >所在单元</td>
<td colspan="4" >
<el-input v-model="form.ch" :disabled="disableFlag"></el-input>
<el-input v-model="form.zdymc" disabled></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >实际层数</td>
<td colspan="2" align="center" >层号</td>
<td colspan="4" >
<el-input v-model="form.sjcs" :disabled="disableFlag"></el-input>
<el-input v-model="form.ch" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >实际层</td>
<td colspan="4" >
<el-input v-model="form.sjc" :disabled="disableFlag"></el-input>
<el-input v-model="form.sjc" disabled></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >所在单元</td>
<td colspan="4" >
<el-input v-model="form.zdymc" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >房屋编号</td>
<td colspan="4" >
<el-input v-model="form.fwbh" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >实际层数</td>
<td colspan="4" >
<el-input v-model="form.sjcs" disabled></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >室号</td>
<td colspan="4" >
<el-input v-model="form.shbw" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >户号</td>
<td colspan="4" >
<el-input v-model="form.hh" disabled></el-input>
</td>
</tr>
<tr height="30">
......@@ -81,30 +103,16 @@
</el-option>
</el-select>
</td>
<td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td>
<td colspan="4" >
<el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag" ref="fwxzbsm">
<el-option
v-for="item in $store.state.fwxzOptions"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >户号</td>
<td colspan="2" align="center" >名义层</td>
<td colspan="4" >
<el-input v-model="form.hh" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >室号</td>
<td colspan="4" >
<el-input v-model="form.shbw" :disabled="disableFlag"></el-input>
<el-input v-model="form.myc" disabled></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >户型</td>
<td colspan="4" >
......@@ -157,52 +165,52 @@
<tr height="30">
<td colspan="2" rowspan="6" align="center" >预测</td>
<td colspan="2" align="center" >建筑面积(㎡) </td>
<td colspan="2" align="center" >建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" rowspan="6" align="center" >实测</td>
<td colspan="2" align="center" >建筑面积(㎡)</td>
<td colspan="2" align="center" >建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.scjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >套内建筑面积(㎡))</td>
<td colspan="2" align="center" >套内建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.yctnjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >套内建筑面积(㎡)</td>
<td colspan="2" align="center" >套内建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.sctnjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >分摊建筑面积(㎡)</td>
<td colspan="2" align="center" >分摊建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycftjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >分摊建筑面积(㎡)</td>
<td colspan="2" align="center" >分摊建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.scftjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >地下部分建筑面积(㎡)</td>
<td colspan="2" align="center" >地下部分建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycdxbfjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >地下部分建筑面积(㎡)</td>
<td colspan="2" align="center" >地下部分建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.scdxbfjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >其它建筑面积(㎡)</td>
<td colspan="2" align="center" >其它建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.ycqtjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input>
</td>
<td colspan="2" align="center" >其它建筑面积(㎡)</td>
<td colspan="2" align="center" >其它建筑面积(㎡)</td>
<td colspan="2" align="center" >
<el-input v-model="form.scqtjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input>
</td>
......@@ -217,7 +225,29 @@
<input class="formInput" v-model="form.scftxs" type="number" :disabled="form.scyclx==='0'||disableFlag" @blur="inputFtxsBlur($event)" ref="scftxs" />
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >共有土地面积(㎡)</td>
<td colspan="2" >
<el-input v-model="form.gytdmj" type="number" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >分摊土地面积(㎡)</td>
<td colspan="2" >
<el-input v-model="form.fttdmj" type="number" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >多幢独用土地面积(㎡)</td>
<td colspan="2" >
<el-input v-model="form.dytdmj" type="number" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr>
<td colspan="2" align="center" >
<span>坐落<i class="requisite">*</i></span>
</td>
<td colspan="10" >
<input class="formInput" v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag" />
</td>
</tr>
<tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
<td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
......@@ -228,10 +258,10 @@
@click="addYtInfo"
>+</el-button
>
<span>用途<i class="requisite">*</i></span>
<span>房屋用途<i class="requisite">*</i></span>
</td>
<td width="30" colspan="1" align="center" >
<td width="30" colspan="2" align="center" >
<el-button
type="primary"
class="changeBtn addMinus inMinus"
......@@ -240,7 +270,7 @@
>
规划用途
</td>
<td width="30" colspan="4" align="center" >
<td width="30" colspan="2" align="center" >
<el-select-tree
ref="ghyt"
v-if="show"
......@@ -256,7 +286,7 @@
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
<td width="30" colspan="1" align="center" >用途</td>
<td width="30" colspan="2" align="center" >用途</td>
<td width="30" colspan="4" align="center" >
<el-select-tree
ref="yt"
......@@ -286,10 +316,10 @@
>
<span>房屋结构<i class="requisite">*</i></span>
</td>
<td colspan="1" align="center" >
<span @click="deleteFwjgInfo(index)">删除</span>
<td colspan="2" align="center" >
<span @click="deleteFwjgInfo(index)">房屋结构</span>
</td>
<td colspan="9" >
<td colspan="8" >
<el-select v-model="item1.fwjgzdbsm" ref="fwjg" placeholder="请选择" :disabled="disableFlag">
<el-option
v-for="item in $store.state.jgOptions"
......@@ -301,20 +331,6 @@
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >共有土地面积(㎡)</td>
<td colspan="2" >
<el-input v-model="form.gytdmj" type="number" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >分摊土地面积(㎡)</td>
<td colspan="2" >
<el-input v-model="form.fttdmj" type="number" :disabled="disableFlag"></el-input>
</td>
<td colspan="2" align="center" >多幢独用土地面积(㎡)</td>
<td colspan="2" >
<el-input v-model="form.dytdmj" type="number" :disabled="disableFlag"></el-input>
</td>
</tr>
<tr>
......