5374e1e6 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 9cac7d22 81a99aa9
......@@ -195,3 +195,14 @@ export function getDetailInfo(zrzbsm,lx) {
},
})
}
/**
* 批量删除户基本信息表,data为一个数组List<String>
*/
export function batchDeleteHByHbsms(data) {
return request({
url:'/system/qjH/batchDeleteHByBsms',
method:'post',
data:data
})
}
......
......@@ -6,7 +6,7 @@
width="70%"
@close="close"
:modal-append-to-body="false"
center>
>
<div class="search">
<el-row>
<el-col :span="24">
......
......@@ -4,7 +4,7 @@
<el-tab-pane label="宗地分割" name="zd">
<div class="fg-tabs top20">
<span class="tips">分割前宗地信息</span>
<el-button type="primary" class="addBtn" @click="newAdd" icon="el-icon-plus">新增</el-button>
<el-button type="primary" class="addBtn" @click="newAdd('zd')" icon="el-icon-plus">新增</el-button>
<div class="fgq">
<el-card class="data">
<div slot="header" class="clearfix">
......@@ -171,7 +171,7 @@
</template>
</table>
</div>
<zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true"
<zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogZdVisible" :isZdClose="true"
@close="close"></zd-query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
......@@ -181,7 +181,7 @@
<el-tab-pane label="多幢分割" name="dz">
<div class="fg-tabs top20">
<span class="tips">分割前多幢信息</span>
<el-button type="primary" class="addBtn" @click="newAdd" icon="el-icon-plus">新增</el-button>
<el-button type="primary" class="addBtn" @click="newAdd('dz')" icon="el-icon-plus">新增</el-button>
<div class="fgq">
<el-card class="data">
<div slot="header" class="clearfix">
......@@ -277,7 +277,7 @@
</tr>
</table>
</div>
<dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
<dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogDzVisible"
:isClose="false"
@close="close">
</dz-query-data>
......@@ -321,7 +321,8 @@
data() {
return {
tabName: 'zd',
centerDialogVisible: false,
centerDialogZdVisible: false,
centerDialogDzVisible: false,
zdFgqData: {}, // 宗地分割前数据
mapDefault:require('@assets/images/map_default.png'),
dzFgqData: {}, //多幢分割前数据
......@@ -812,16 +813,27 @@
}
},
close: function () {
this.centerDialogVisible = false;
this.centerDialogDzVisible = false;
this.centerDialogZdVisible = false;
},
newAdd: function () {
newAdd: function (type) {
this.result();
this.centerDialogVisible = true;
switch (type) {
case 'dz':
this.centerDialogDzVisible = true;
break;
case 'zd':
this.centerDialogZdVisible = true;
break;
default:
break;
}
},
getData: function (data) {
switch (this.tabName) {
case "zd":
this.centerDialogVisible=false;
this.centerDialogZdVisible=false;
this.zdFgqData = data;
break;
case "dz":
......@@ -830,7 +842,7 @@
break
}
this.dzFgqData = data;
this.centerDialogVisible=false;
this.centerDialogDzVisible=false;
break;
case "h":
this.hFgqData = data;
......
......@@ -24,9 +24,15 @@
<el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh"></el-input>
<el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
</td>
<td colspan="2" align="center" >原不动产单元</td>
<td colspan="4" >
<el-input v-model="form.ydybsm" disabled></el-input>
<!-- <td colspan="2" align="center" >原不动产单元</td>-->
<!-- <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="4" >
<input class="formInput" v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag" />
</td>
</tr>
......@@ -320,17 +326,6 @@
<tr></tr>
<tr></tr>
<tr height="30">
<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">
<td colspan="2" align="center" >东墙体归属</td>
<td colspan="4" >
......
......@@ -629,7 +629,7 @@ export default {
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
//改变楼盘表子组件的key值,重新渲染
this.time = new Date().getTime();
// this.time = new Date().getTime();
},
//实预测装换
plScYcChange() {
......