2fd6f005 by weimo934

feat(fg):修改宗地分割前样式

1 parent 2f62c379
......@@ -216,3 +216,18 @@ export function exportShp(data) {
responseType: 'arraybuffer'
})
}
/**
* 获取该宗地上的所有自然幢
*/
export function getZrz(zdBsm) {
return request({
url:"/bg/zdSplitMerge/byZdbsm",
method:"get",
params:{
zdBsm
}
})
}
......
......@@ -3,45 +3,39 @@
<el-tabs v-model="tabName" type="card" class="menu">
<el-tab-pane label="宗地分割" name="zd">
<div class="fg-tabs">
<span class="tips">分割前宗地信息</span>
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="table">
<span class="tips">分割前宗地信息</span>
<table border="1">
<tr>
<th class="xh">序号</th>
<th class="zddm">宗地代码</th>
<th class="bdcdyh">不动产单元号</th>
<th class="xmmc">项目名称</th>
<th class="bdcqzh">不动产权证号</th>
<th class="qlr">权利人</th>
<th class="zl">坐落</th>
</tr>
<tr v-if="Object.keys(zdFgqData)==0">
<td colspan="7">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else>
<td class="xh">1</td>
<td class="zddm"><input type="text" class="formInput" v-model="zdFgqData.zddm"
readonly="readonly"/>
</td>
<td class="bdcdyh"><input type="text" class="formInput" v-model="zdFgqData.bdcdyh"
readonly="readonly"/>
</td>
<td class="xmmc"><input type="text" class="formInput" v-model="zdFgqData.xmmc"
readonly="readonly"/>
</td>
<td class="bdcqzh"><input type="text" class="formInput" v-model="zdFgqData.bdcqzh"
readonly="readonly"/>
</td>
<td class="qlr"><input type="text" class="formInput" v-model="zdFgqData.qlr"
readonly="readonly"/>
</td>
<td class="zl"><input type="text" class="formInput" v-model="zdFgqData.zl"
readonly="readonly"/></td>
</tr>
</table>
<div class="fgq">
<div class="data">
<ul>
<li>宗地代码:{{zdFgqData.zddm}}</li>
<li>不动产单元号:{{zdFgqData.bdcdyh}}</li>
<li>项目名称:{{zdFgqData.xmmc}}</li>
<li>不动产权证号:{{zdFgqData.bdcqzh}}</li>
<li>权利人:{{zdFgqData.qlr}}</li>
<li>坐落:{{zdFgqData.zl}}</li>
</ul>
</div>
<div class="zxx">
<div class="dz">
<div class="title">
<span>多幢信息({{zdZxx.zrzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li>
</ul>
</div>
<div class="zrz">
<div class="title">
<span>自然幢信息({{zdZxx.dzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="(index+1)%2==0?'':'border'">{{item.xmmc}}
</li>
</ul>
</div>
</div>
</div>
<div class="fgh">
<span class="tips">分割后宗地信息</span>
......@@ -120,8 +114,35 @@
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
<td class="zxx">
<!-- {{item.fwlist.zbsm}}-->
<span @click="xzzrz(index)" class="xz">选择</span>
<!--<el-select placeholder="请选择多幢" @change="xzDz(i.bsm,index)" v-model="zdFghData.newZdlist.fwlist[1].zbsm">
<el-option
v-for="i in zdZxx.dzList"
:key="i.bsm"
:label="i.xmmc"
:value="i.bsm">
</el-option>
</el-select>
<el-select placeholder="请选择自然幢" @change="xzZrz(i.bsm,index)" v-model="zdFghData.newZdlist.fwlist[1].zbsm">
<el-option
v-for="i in zdZxx.zrzList"
:key="i.bsm"
:label="i.xmmc"
:value="i.bsm">
</el-option>
</el-select>-->
<!-- <span @click="xzzrz(index)" class="xz">选择</span>-->
<el-dropdown @command="handleCommand">
<span class="el-dropdown-link">
选择多幢<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="(ce,index) in zdZxx.dzList" :key="index" :command="ce" >{{ce.xmmc}}</el-dropdown-item>
<!--<el-dropdown-item command="b">狮子头</el-dropdown-item>
<el-dropdown-item command="c">螺蛳粉</el-dropdown-item>
<el-dropdown-item command="d" disabled>双皮奶</el-dropdown-item>
<el-dropdown-item command="e" divided>蚵仔煎</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
</td>
</tr>
<tr>
......@@ -187,7 +208,7 @@
</el-dialog>
<zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true"
@close="close"></zd-query-data>
@close="close"></zd-query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
......@@ -195,45 +216,39 @@
</el-tab-pane>
<el-tab-pane label="多幢分割" name="dz">
<div class="fg-tabs">
<span class="tips">分割前多幢信息</span>
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="table">
<span class="tips">分割前多幢信息</span>
<table border="1">
<tr>
<th class="xh">序号</th>
<th class="zddm">宗地代码</th>
<th class="bdcdyh">不动产单元号</th>
<th class="xmmc">项目名称</th>
<th class="bdcqzh">不动产权证号</th>
<th class="qlr">权利人</th>
<th class="zl">坐落</th>
</tr>
<tr v-if="Object.keys(dzFgqData)==0">
<td colspan="7">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else>
<td class="xh">1</td>
<td class="zddm"><input type="text" class="formInput" v-model="dzFgqData.zddm"
readonly="readonly"/>
</td>
<td class="bdcdyh"><input type="text" class="formInput" v-model="dzFgqData.bdcdyh"
readonly="readonly"/>
</td>
<td class="xmmc"><input type="text" class="formInput" v-model="dzFgqData.xmmc"
readonly="readonly"/>
</td>
<td class="bdcqzh"><input type="text" class="formInput" v-model="dzFgqData.bdcqzh"
readonly="readonly"/>
</td>
<td class="qlr"><input type="text" class="formInput" v-model="dzFgqData.qlr"
readonly="readonly"/>
</td>
<td class="zl"><input type="text" class="formInput" v-model="dzFgqData.zl"
readonly="readonly"/></td>
</tr>
</table>
<div class="fgq">
<div class="data">
<ul>
<li>宗地代码:{{dzFgqData.zddm}}</li>
<li>不动产单元号:{{dzFgqData.bdcdyh}}</li>
<li>项目名称:{{dzFgqData.xmmc}}</li>
<li>不动产权证号:{{dzFgqData.bdcqzh}}</li>
<li>权利人:{{dzFgqData.qlr}}</li>
<li>坐落:{{dzFgqData.zl}}</li>
</ul>
</div>
<div class="zxx">
<div class="dz">
<div class="title">
<span class="title">多幢信息({{zdZxx.zrzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li>
</ul>
</div>
<div class="zrz">
<div class="title">
<span class="title">自然幢信息({{zdZxx.dzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="(index+1)%2==0?'':'border'">{{item.xmmc}}
</li>
</ul>
</div>
</div>
</div>
<div class="fgh">
<span class="tips">分割后多幢信息</span>
......@@ -386,45 +401,39 @@
</el-tab-pane>
<el-tab-pane label="户分割" name="h">
<div class="fg-tabs">
<span class="tips">分割前户信息</span>
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="table">
<span class="tips">分割前户信息</span>
<table border="1">
<tr>
<th class="xh">序号</th>
<th class="zddm">宗地代码</th>
<th class="bdcdyh">不动产单元号</th>
<th class="xmmc">项目名称</th>
<th class="bdcqzh">不动产权证号</th>
<th class="qlr">权利人</th>
<th class="zl">坐落</th>
</tr>
<tr v-if="Object.keys(hFgqData)==0">
<td colspan="7">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else>
<td class="xh">1</td>
<td class="zddm"><input type="text" class="formInput" v-model="hFgqData.zddm"
readonly="readonly"/>
</td>
<td class="bdcdyh"><input type="text" class="formInput" v-model="hFgqData.bdcdyh"
readonly="readonly"/>
</td>
<td class="xmmc"><input type="text" class="formInput" v-model="hFgqData.xmmc"
readonly="readonly"/>
</td>
<td class="bdcqzh"><input type="text" class="formInput" v-model="hFgqData.bdcqzh"
readonly="readonly"/>
</td>
<td class="qlr"><input type="text" class="formInput" v-model="hFgqData.qlr"
readonly="readonly"/>
</td>
<td class="zl"><input type="text" class="formInput" v-model="hFgqData.zl"
readonly="readonly"/></td>
</tr>
</table>
<div class="fgq">
<div class="data">
<ul>
<li>宗地代码:{{zdFgqData.zddm}}</li>
<li>不动产单元号:{{zdFgqData.bdcdyh}}</li>
<li>项目名称:{{zdFgqData.xmmc}}</li>
<li>不动产权证号:{{zdFgqData.bdcqzh}}</li>
<li>权利人:{{zdFgqData.qlr}}</li>
<li>坐落:{{zdFgqData.zl}}</li>
</ul>
</div>
<div class="zxx">
<div class="dz">
<div class="title">
<span>多幢信息({{zdZxx.zrzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li>
</ul>
</div>
<div class="zrz">
<div class="title">
<span>自然幢信息({{zdZxx.dzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="(index+1)%2==0?'':'border'">{{item.xmmc}}
</li>
</ul>
</div>
</div>
</div>
<div class="fgh">
<span class="tips">分割后户信息</span>
......@@ -587,8 +596,8 @@
getListByPbsm,
getDdicByMC
} from "./../../../../api/common";
import {getQjZdjbxxDetailById,zdfg} from './../../../../api/zd'
import {getZdxx,ZdfggetZxx} from './../../../../api/dz'
import {getQjZdjbxxDetailById, zdfg, getZrz} from './../../../../api/zd'
import {getZdxx, ZdfggetZxx} from './../../../../api/dz'
import {getHZdxx} from './../../../../api/h'
import QueryData from './../../../../components/queryData/queryData'
import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
......@@ -607,7 +616,11 @@
zdFgqData: {}, // 宗地分割前数据
dzFgqData: {}, //多幢分割前数据
hFgqData: {}, // 户分割前数据
zdZxx:{}, // 宗地选择幢
zdZxx: {
zrzList: [],
dzList: []
}, // 宗地选择幢
zdAllZrz: [],
xzq: [],
djq: [],
djzq: [],
......@@ -709,11 +722,27 @@
})
},
methods: {
ZdgetDzXx(zdbsm){
ZdfggetZxx(zdbsm).then(res=>{
xzDz(bsm,index){
this.zdFghData.newZdlist.fwlist[index].push({
zbsm:bsm,
ztype:'dz'
})
console.log(this.zdFghData,'zdFghData')
},
xzZrz(bsm,index){
this.zdFghData.newZdlist.fwlist[index].push({
zbsm:bsm,
ztype:'zrz'
})
console.log(this.zdFghData,'zdFghData')
},
handleCommand(command) {
this.$message('click on item ' + command);
},
ZdgetDzXx(zdbsm) {
ZdfggetZxx(zdbsm).then(res => {
if (res.success) {
this.zdZxx=res.result;
console.log(res.result,"宗地分割多幢信息");
this.zdZxx = res.result;
}
})
},
......@@ -788,8 +817,8 @@
this.checkedData.fwlist = [{zbsm: '', ztype: ''}]
})
},
getDzZdjbxx(id){
getZdxx(id).then(res=>{
getDzZdjbxx(id) {
getZdxx(id).then(res => {
this.checkedData = res.result
// 用户bsm暂时传空
this.checkedData.userbsm = ''
......@@ -797,8 +826,8 @@
this.checkedData.fwlist = [{zbsm: '', ztype: ''}]
})
},
getHZdxx(id){
getHZdxx(id).then(res=>{
getHZdxx(id) {
getHZdxx(id).then(res => {
this.checkedData = res.result
// 用户bsm暂时传空
this.checkedData.userbsm = ''
......@@ -995,7 +1024,7 @@
hFgqData: {
handler: function (item) {
this.hFgqData.oldZdbsm = item.glbsm;
console.log(item.glbsm,"户bsm")
console.log(item.glbsm, "户bsm")
this.getHZdxx(item.glbsm);
},
deep: true
......@@ -1057,6 +1086,79 @@
z-index: 99 !important;
}
.fgq {
margin-left: 20px;
margin-top: 20px;
display: flex;
flex-direction: column;
flex-flow: nowrap;
.data {
background-color: white;
height: 180px;
overflow: auto;
ul {
li {
padding: 5px;
line-height: 20px;
}
}
}
.zxx {
display: flex;
flex-direction: column;
flex-flow: nowrap;
background-color: white;
.title {
color: red;
text-align: center;
}
.dz {
width: 33%;
border-right: 1px solid #000;
height: 180px;
overflow: auto;
ul {
overflow: auto;
li {
padding: 5px;
text-align: center;
line-height: 20px;
}
}
}
.zrz {
width: 66%;
height: 180px;
overflow: auto;
ul {
li {
padding: 5px;
width: 48%;
text-align: center;
display: inline-block;
}
}
}
}
}
.border {
border-right: 1px solid #000;
}
.fgq .data {
width: 30%;
border: 1px solid #000;
}
.fgq .zxx {
width: 67%;
margin-left: 20px;
border: 1px solid #000;
}
.fg-tabs {
height: auto;
width: 100%;
......@@ -1067,10 +1169,10 @@
padding: 18px;
}
.addBtn {
position: absolute;
right: 30px;
top: -46px;
z-index: 999;
/* position: absolute;
right: 30px;
top: -46px;
z-index: 999;*/
}
table {
margin-top: 10px;
......@@ -1116,7 +1218,7 @@
}
.fgh {
box-sizing: border-box;
padding: 0 18px;
/*padding: 0 18px;*/
margin-top: 10px;
}
.header-button {
......@@ -1134,6 +1236,7 @@
}
.tips {
color: #9B9B9B;
margin-left: 20px;
}
}
......