Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
7fcc0686 by 杨威
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents b5105c8a a6c7c8f5
Inline Side-by-side
Showing 4 changed files with 185 additions and 63 deletions
......@@ -231,3 +231,13 @@ export function getZrz(zdBsm) {
})
}
/**
* 宗地合并
*/
export function ZdHb(data) {
return request({
url:"/bg/zdSplitMerge/zdHb",
method:'post',
data:data
})
}
......
......@@ -19,19 +19,21 @@
<div class="zxx">
<div class="dz">
<div class="title">
<span>多幢信息({{zdZxx.zrzList.length}}个)</span>
<span>多幢信息({{zdZxx.dzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="[{'border':'((index+1)%2) == 0'},{'nosearch':!zdDzList.includes(item)}]"
>{{item.displays}}</li>
</ul>
</div>
<div class="zrz">
<div class="title">
<span>自然幢信息({{zdZxx.dzList.length}}个)</span>
<span>自然幢信息({{zdZxx.zrzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="(index+1)%2==0?'':'border'">{{item.xmmc}}
<li v-for="(item,index) in zdZxx.zrzList" :key="index"
:class="[{'border':'((index+1)%2) == 0'},{'nosearch':!zdZrzList.includes(item)}]">{{item.displays}}
</li>
</ul>
</div>
......@@ -49,6 +51,7 @@
<th class="tdtzm">土地特征码</th>
<th class="xmmc">项目名称</th>
<th class="zxx">幢信息</th>
<th class="">选择</th>
</tr>
<tr v-for="(item,index) in zdFghData.newZdlist" :key="index">
<td class="cz">
......@@ -114,33 +117,36 @@
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
<td class="zxx">
<!--<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>多幢:</span>
<ul>
<li v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex">{{dzItem}}</li>
</ul>
<span>自然幢:</span>
<ul>
<li v-for="(dzItem,dzIndex) in item.zrz" :key="dzIndex">{{dzItem}}</li>
</ul>
</td>
<td class="">
<el-dropdown @command="dzHandleCommand($event,index)">
<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 slot="dropdown">
<el-dropdown-item v-for="(childItem,childIndex) in zdDzList"
:key="childIndex" :command="childItem.bsm">
{{childItem.xmmc}}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-dropdown @command="zrzHandleCommand($event,index)">
<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="(childItem,childIndex) in zdZrzList"
:key="childIndex" :command="childItem.bsm">
{{childItem.xmmc}}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</td>
......@@ -616,6 +622,8 @@
zdFgqData: {}, // 宗地分割前数据
dzFgqData: {}, //多幢分割前数据
hFgqData: {}, // 户分割前数据
zdZrzList: [], // 宗地自然幢集合
zdDzList: [], // 宗地多幢集合
zdZxx: {
zrzList: [],
dzList: []
......@@ -722,27 +730,72 @@
})
},
methods: {
xzDz(bsm,index){
// 重置数据
result(){
switch (this.tabName) {
case "zd":
this.zdFghData={
oldZdbsm: "",
newZdlist: []
}
break
case "dz":
this.dzFghData={
oldZdbsm: "",
newZdlist: []
}
break
case "h":
this.hFghData={
oldZdbsm: "",
newZdlist: []
}
break;
default:
break
}
},
xzDz(bsm, index) {
this.zdFghData.newZdlist.fwlist[index].push({
zbsm:bsm,
ztype:'dz'
zbsm: bsm,
ztype: 'dz'
})
console.log(this.zdFghData,'zdFghData')
console.log(this.zdFghData, 'zdFghData')
},
xzZrz(bsm,index){
xzZrz(bsm, index) {
this.zdFghData.newZdlist.fwlist[index].push({
zbsm:bsm,
ztype:'zrz'
zbsm: bsm,
ztype: 'zrz'
})
console.log(this.zdFghData,'zdFghData')
console.log(this.zdFghData, 'zdFghData')
},
handleCommand(command) {
this.$message('click on item ' + command);
dzHandleCommand(command, index) {
console.log(command,"============")
let item = this.zdDzList.filter(i => i.bsm == command)[0];
console.log(item,"item........")
console.log(this.zdDzList,"zdDzlist")
this.zdFghData.newZdlist[index].fwlist.push({
zbsm: command,
ztype: 'dz'
});
this.zdFghData.newZdlist[index].dz.push(item.xmmc)
this.zdDzList = this.zdDzList.filter(i => i.bsm !== command);
},
zrzHandleCommand(command, index) {
let item = this.zdZrzList.filter(i => i.bsm == command)[0];
this.zdFghData.newZdlist[index].fwlist.push({
zbsm: command,
ztype: 'zrz'
})
this.zdFghData.newZdlist[index].zrz.push(item.xmmc)
this.zdZrzList = this.zdZrzList.filter(i => i.bsm !== command);
},
ZdgetDzXx(zdbsm) {
ZdfggetZxx(zdbsm).then(res => {
if (res.success) {
this.zdZxx = res.result;
this.zdZrzList = res.result.zrzList
this.zdDzList = res.result.dzList
}
})
},
......@@ -813,8 +866,10 @@
this.checkedData = res.result
// 用户bsm暂时传空
this.checkedData.userbsm = ''
this.checkedData.dz=[],
this.checkedData.zrz=[],
// fwlist 暂时传空
this.checkedData.fwlist = [{zbsm: '', ztype: ''}]
this.checkedData.fwlist = []
})
},
getDzZdjbxx(id) {
......@@ -822,8 +877,10 @@
this.checkedData = res.result
// 用户bsm暂时传空
this.checkedData.userbsm = ''
this.checkedData.dz=[],
this.checkedData.zrz=[],
// fwlist 暂时传空
this.checkedData.fwlist = [{zbsm: '', ztype: ''}]
this.checkedData.fwlist = []
})
},
getHZdxx(id) {
......@@ -831,8 +888,10 @@
this.checkedData = res.result
// 用户bsm暂时传空
this.checkedData.userbsm = ''
this.checkedData.dz=[],
this.checkedData.zrz=[],
// fwlist 暂时传空
this.checkedData.fwlist = [{zbsm: '', ztype: ''}]
this.checkedData.fwlist = []
})
},
getzdtzm() {
......@@ -911,12 +970,7 @@
syqlxbsm: "",
zdtzmbsm: "",
userbsm: "",
fwlist: [
{
zbsm: "",
ztype: ""
}
]
fwlist: []
});
this.changeXzq(this.checkedData.xzqbsm)
this.changeDjq(this.checkedData.djqbsm)
......@@ -931,12 +985,7 @@
syqlxbsm: "",
zdtzmbsm: "",
userbsm: "",
fwlist: [
{
zbsm: "",
ztype: ""
}
]
fwlist: []
});
this.changeXzq(this.checkedData.xzqbsm)
this.changeDjq(this.checkedData.djqbsm)
......@@ -951,12 +1000,7 @@
syqlxbsm: "",
zdtzmbsm: "",
userbsm: "",
fwlist: [
{
zbsm: "",
ztype: ""
}
]
fwlist: []
});
this.changeXzq(this.checkedData.xzqbsm)
this.changeDjq(this.checkedData.djqbsm)
......@@ -985,6 +1029,7 @@
this.centerDialogVisible = false;
},
newAdd: function () {
this.result();
this.centerDialogVisible = true;
},
getData: function (data) {
......@@ -1123,7 +1168,6 @@
padding: 5px;
text-align: center;
line-height: 20px;
}
}
}
......@@ -1137,7 +1181,6 @@
width: 48%;
text-align: center;
display: inline-block;
}
}
}
......@@ -1219,7 +1262,12 @@
.fgh {
box-sizing: border-box;
/*padding: 0 18px;*/
height: 480px;
overflow: auto;
margin-top: 10px;
table{
margin: 0 20px ;
}
}
.header-button {
height: 50px;
......@@ -1259,4 +1307,7 @@
.xzq, .djq, .djzq {
width: 150px;
}
.nosearch{
color: #BBB !important;
}
</style>
......
......@@ -15,6 +15,7 @@
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td class="cz">操作</td>
</tr>
<tr v-if="zdhbqData.length==0">
<td colspan="7">
......@@ -35,6 +36,7 @@
readonly="readonly"/></td>
<td class="zl"><input type="text" class="formInput" v-model="item.zl"
readonly="readonly"/></td>
<td class="cz" @click="deleteData(index)"><span>删除</span></td>
</tr>
</table>
</div>
......@@ -114,7 +116,7 @@
@close="close"></zd-query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn">保存</el-button>
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
</div>
</el-tab-pane>
......@@ -361,6 +363,7 @@
getListByPbsm,
getDdicByMC
} from "./../../../../api/common";
import {ZdHb} from "./../../../../api/zd"
import QueryData from './../../../../components/queryData/queryData'
import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
......@@ -409,6 +412,64 @@
})
},
methods: {
save(){
switch (this.tabName) {
case "zd":
this.zdHb();
break
case "dz":
break
case "h":
break;
default:
break
}
},
zdHb(){
let oldBsm= this.zdhbqData.map(function (item,index) {
return item.zdbsm;
}).join(",")
let data={
newzddjqbsm: this.zdhbhData.djqbsm,
newzddjzqbsm: this.zdhbhData.djzqbsm,
newzdsyqlxbsm: this.zdhbqData.syqlxbsm,
newzduserbsm: "",
newzdxmmc: this.zdhbqData.xmmc,
newzdxzqbsm: this.zdhbqData.xzqbsm,
newzdzdtzmbsm: this.zdhbqData.zdtzmbsm,
oldzdbsms: oldBsm
}
console.log(this.zdhbhData,"宗地合并后数据");
console.log(this.zdhbqData,"宗地合并前数据")
ZdHb(data).then(res=>{
if (res.success) {
this.$message.success("合并成功")
}else {
this.$message.error("合并失败")
}
})
},
dzHb(){
},
hHb(){
},
deleteData(index){
switch (this.tabName) {
case "zd":
this.zdhbqData.splice(index,1)
break
case "dz":
this.dzhbqData.splice(index,1)
break
case "h":
this.hhbqData.splice(index,1)
break
default:
break
}
},
getzdtzm() {
getDdicByMC('宗地（宗海）特征码').then(res => {
this.tdtzm = res.result
......