Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
e7c0cce7 by 杨威
Options

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

2 parents 9592692f bf0bf3d2
Expand all
Inline Side-by-side
Showing 4 changed files with 51 additions and 85 deletions
......@@ -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
})
}
......
......@@ -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'}">
......@@ -824,7 +824,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;
......
......@@ -163,89 +163,11 @@
</div>
</el-tab-pane>
<el-tab-pane label="多幢合并" name="dz">
<div class="hb-tabs top20">
<!-- <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> -->
<div class="hbq">
<span class="tips" style="margin-left:0;">合并前多幢信息</span>
<table border="1">
<tr>
<td class="xh">序号</td>
<td class="zddm">宗地代码</td>
<td class="bdcdyh">不动产单元号</td>
<td class="xmmc">项目名称</td>
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td class="">
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="newAdd"
>+
</el-button>
</td>
</tr>
<tr v-if="dzhbqData.length==0">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in dzhbqData" :key="index">
<td class="xh">{{index+1}}</td>
<td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
readonly="readonly"/></td>
<td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
readonly="readonly"/></td>
<td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
readonly="readonly"/></td>
<td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
readonly="readonly"/></td>
<td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
readonly="readonly"/></td>
<td class="zl"><input type="text" class="formInput" v-model="item.zl"
readonly="readonly"/></td>
<td class="cz">
<el-button
type="primary"
class="changeBtn outMinus addMinus"
@click="deleteData(item,index)"
>-
</el-button>
</td>
</tr>
</table>
</div>
<div class="hbh dzhbh">
<span class="tips" style="width:100%;display:block;margin-left:0;">合并后多幢信息</span>
<table border="1">
<tr>
<th class="xmmc">项目名称</th>
<th>幢信息</th>
</tr>
<tr v-for="item in dzhbhData" :key="item.bsm">
<td class="xmmc">
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
<td>
<!-- <span class="xz">选择</span> -->
</td>
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
:isZdClose="true"
@close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="dzhbSave">保存</el-button>
</div>
</div>
<dz-hb></dz-hb>
</el-tab-pane>
<el-tab-pane label="户合并" name="h">
<div class="hb-tabs psn" v-if="hhbtabs">
<hfghb></hfghb>
<!-- <div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn">保存</el-button>
</div> -->
</div>
</el-tab-pane>
</el-tabs>
......@@ -264,17 +186,16 @@
import QueryData from '@components/queryData/queryData'
import zdQueryData from '@components/zdQueryData/zdQueryData'
import hfghb from '../hfghb/index'
import dzHb from './../../../../components/dzHb/dzHb'
export default {
name: "",
components: {QueryData, zdQueryData, hfghb},
components: { zdQueryData, hfghb,dzHb},
props: {},
data() {
return {
tabName: 'zd',
centerDialogVisible: false,
zdhbqData: [], // 宗地合并前数据
dzhbqData: [], // 多幢合并前数据
zdhbhData: {}, // 宗地合并后数据
dzhbhData: [
{
......@@ -368,6 +289,31 @@
hHb() {
},
getData(data) {
let arr=[];
switch (this.tabName) {
case "zd":
arr = this.zdhbqData.filter(i => i.zdbsm === data.zdbsm);
if (arr.length > 0) {
this.$message.info("当前宗地已选择,请重新选择")
break
}
arr = this.zdhbqData.filter(i => i.xzqbsm !== data.xzqbsm || i.djqbsm !== data.djqbsm || i.djzqbsm !== data.djzqbsm);
if (arr.length > 0) {
this.$confirm('当前宗地不在同一地籍子区下,是否继续选择？')
.then(_ => {
this.addZdData(data);
})
.catch(_ => {
});
} else {
this.addZdData(data)
}
break
default:
break;
}
},
deleteData(item, index) {
switch (this.tabName) {
case "zd":
......@@ -475,7 +421,7 @@
}
})
},
getData(data) {
geDztData(data) {
let arr=[];
switch (this.tabName) {
case "zd":
......@@ -502,10 +448,14 @@
this.$message.info("当前多幢已选择,请重新选择")
break
}
if (this.dzhbqData.includes(data)) {
console.log(data,'data')
arr=this.dzhbqData.filter(i=>i.zdbsm !==data.zdbsm);
if (arr.length > 0) {
this.$message.info("当前选择多幢不在同一宗地下,请重新选择")
break
}
this.dzhbqData.push(data);
this.centerDialogVisible=false;
break
default:
break;
......