03f28a9f by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 19a39201 5bf3d73b
......@@ -33,3 +33,14 @@ export function dzList(data) {
data:data
})
}
/**
* 多幢分割选择自然幢列表
* @param data
*/
export function zrzList(data) {
return request({
url:'/fw/qjZrz/zrzList',
method:'post',
data:data
})
}
......
<template>
<el-row>
<el-col :span="24">
<el-col :span="24" style="margin-left: -10px;">
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="宗地编码">
<el-form-item label="不动产单元号">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
@change="query"
></el-input>
</el-form-item>
......@@ -18,11 +19,10 @@
@change="query"
></el-input>
</el-form-item>
<el-form-item label="不动产单元号:">
<el-form-item label="宗地编码">
<el-input
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
v-model="queryData.zddm"
placeholder="输入宗地编码"
@change="query"
></el-input>
</el-form-item>
......@@ -41,6 +41,13 @@
<el-row class="row3" v-if="ismore">
<el-col :span="22">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="不动产权证号">
<el-input
placeholder="输入不动产权证号"
v-model="queryData.bdcqzh"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="权利人名称">
<el-input
placeholder="输入权利人名称"
......@@ -48,20 +55,13 @@
@change="query"
></el-input>
</el-form-item>
<el-form-item label="坐落:">
<el-form-item label="坐落">
<el-input
v-model="queryData.zl"
placeholder="输入坐落地址"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
<el-input
placeholder="输入不动产权证号"
v-model="queryData.bdcqzh"
@change="query"
></el-input>
</el-form-item>
</el-form>
</el-col>
<el-col :span="2" :offset="offset">
......
......@@ -165,19 +165,11 @@ export default {
this.getTreeList();
}
},
"$store.state.zdbsm": function(bsm) {
this.getRightTree(bsm);
},
"$store.state.zrzbsm": function(bsm) {
this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
},
"$store.state.treeData":function (val) {
console.log(val,'val');
this.pd = val;
},
'$store.state.treeZdbsm':function (val) {
console.log(val,'val');
// console.log(val,'val');
},
},
mounted(){
......@@ -210,7 +202,10 @@ export default {
icon: "iconfont icontianjia",
path: "/add",
},
{ name: "更正", icon: "iconfont icongengzheng", path: "/modify" },
{
name: "更正",
icon: "iconfont icongengzheng",
path: "/modify" },
{
name: "变更",
icon: "iconfont iconbiangeng",
......
......@@ -294,7 +294,7 @@
</table>
</div>
<dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
:isClose="true"
:isClose="false"
@close="close">
</dz-query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
......@@ -584,7 +584,6 @@
dzfgGetZrzxx(dzbsm){
dzfgGetZrzxx(dzbsm).then(res => {
if (res.success) {
console.log(res.result,'res.result');
res.result.forEach(item=>{
item.hasChoosed = ''
})
......@@ -824,7 +823,12 @@
this.zdFgqData = data;
break;
case "dz":
if (data.zrzCount < 2) {
this.$message.error("当前多幢下自然幢数量小于2,请重新选择")
break
}
this.dzFgqData = data;
this.centerDialogVisible=false;
break;
case "h":
this.hFgqData = data;
......
......@@ -156,6 +156,7 @@ import { insertDzjbxx } from "../../../api/dz";
export default {
name: "",
components: {},
inject:['getRightTree','getRightTreeByZrzbsm'],
props: ['auth'],
data() {
return {
......@@ -269,6 +270,7 @@ export default {
this.$store.state.zdbsm = res.result;
//todo 跳转到宗地基本信息内容表页面 (预留)
this.close();
this.getRightTree(this.$store.state.zdbsm);
this.$router.push({
path: '/zd', query:{
source: 2,
......@@ -290,7 +292,6 @@ export default {
//todo 在新增时,如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
this.$refs['ruleForm1'].validate((valid) => {
if (valid) {
this.ruleForm1.zdbsm = this.auth ? this.$store.state.zdbsm : '';
this.ruleForm1.dzbsm = this.auth ? this.$store.state.dzbsm : '';
insertZrzjbxx(this.ruleForm1)
......@@ -304,7 +305,10 @@ export default {
this.$store.state.zdbsm=res.result.zdbsm;
this.$store.state.zrzbsm=res.result.bsm;
this.$store.state.xmmc=res.result.xmmc;
this.$store.state.newZdbsm = res.result.zdbsm;
this.close();
//获取左侧树数据
this.getRightTreeByZrzbsm(this.$store.state.zdbsm);
this.$router.push({
path: '/zrz', query:{
source: 1,
......@@ -338,6 +342,7 @@ export default {
this.$store.state.zdbsm=res.result.zdbsm;
this.$store.state.dzbsm=res.result.bsm;
this.$store.state.xmmc=res.result.xmmc;
this.$store.state.newZdbsm = res.result.zdbsm;
this.close();
this.$router.push({
path: '/dz', query:{
......
......@@ -62,21 +62,21 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm,hs)"
@click="handleTdClick($event.target, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
<span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick"></li>
</ul>
</td>
</tr>
......@@ -128,21 +128,21 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm,hs)"
@click="handleTdClick($event.target, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
<span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick"></li>
</ul>
</td>
</tr>
......@@ -200,21 +200,21 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm,hs)"
@click="handleTdClick($event.target, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
<span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick"></li>
</ul>
</td>
</tr>
......@@ -254,21 +254,21 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm,hs)"
@click="handleTdClick($event.target, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
<span @click.stop="dyztIconClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="dyztIconClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="dyztIconClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt" @click.stop="hDyztClick($event, hs.bsm,hs)">
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'" @click.stop="dyztIconClick"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'" @click.stop="dyztIconClick"></li>
</ul>
</td>
</tr>
......@@ -585,9 +585,9 @@ export default {
clearTimeout(self.time);
self.time = setTimeout(() => {
//判断点击的户是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
if (e.className.indexOf("tdSelect") == -1) {
//未选中→选中
e.target.className = "tdSelect"; //加边框
e.className = "tdSelect"; //加边框
if(this.isHbfg){
this.fghbChoosedList.push(hs);
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
......@@ -596,7 +596,7 @@ export default {
}
} else {
//选中→未选中
e.target.className = "";
e.className = "";
if(this.isHbfg){
this.deleteArrOption(this.fghbChoosedList, hs)
this.deleteArrOption(this.hbsmList, bsm);
......@@ -691,6 +691,13 @@ export default {
this.lpbChVisible = true;
}
},
// 户单元状态点击事件
hDyztClick(e,bsm,hs){
this.handleTdClick(e.target.parentNode,bsm,hs);
},
dyztIconClick(){
},
// 层选中事件
handleClickC(e, item) {
if (this.isHbfg) {
......@@ -786,10 +793,6 @@ export default {
}
});
},
//end
qsztClick(){
},
//户合并
handleHb(type){
let olbBsms = '';
......