Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
07b87cf8 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents fc5c8870 46c6dc4d
Inline Side-by-side
Showing 7 changed files with 397 additions and 154 deletions
<template>
<div class="main">
<div>
<el-dialog
title="选择宗地"
:visible.sync="isVisible"
......
......@@ -90,6 +90,7 @@ service.interceptors.response.use(
},
error => {
if (error && error.response) {
loadingInstance.close();
switch (error.response.status) {
case 400:
error.message = '请求错误';
......
<template>
<div class="main">
<div class="search">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
</el-col>
<el-col :span="8" class="">
<!-- <el-row :gutter="10" class="shop">
<el-col :span="8" class="inputtitle">
<span>宗地编码</span>
<el-input v-model="queryData.zddm"></el-input>
</el-col>
<el-col :span="4" class="inputtitle">
不动产权证号:
</el-col>
<el-col :span="8" class="">
<el-col :span="8" class="inputtitle">
<span>不动产权证号</span>
<el-input v-model="queryData.bdcqzh"></el-input>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4" class="inputtitle">
不动产权单元号:
</el-col>
<el-col :span="8">
<el-col :span="8" class="inputtitle">
<span>不动产权单元号</span>
<el-input v-model="queryData.bdcdyh"></el-input>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4" class="inputtitle">
权利人:
</el-col>
......@@ -38,8 +30,114 @@
<el-col :span="8">
<el-input v-model="queryData.zl"></el-input>
</el-col>
</el-row> -->
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
<el-input
v-model="queryData.bdcqzh"
placeholder="输入坐落地址"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="不动产单元号">
<el-input
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="权利人">
<el-input
v-model="queryData.qlrmc"
placeholder="输入权利人姓名"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="坐落">
<el-input
v-model="queryData.zl"
placeholder="输入坐落地址"
@change="query"
></el-input>
</el-form-item>
<!-- <el-button
type="primary"
class="moreSearchBtn"
@click="moreSearch"
>高级查询
</el-button> -->
<!-- @click="ismore = !ismore" -->
</el-form>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form :inline="true" :model="queryData" class="demo-form-inline">
<el-form-item class="demo-form-inline" label="查询范围">
<el-checkbox-group v-model="queryData.dylxs" @change="query">
<el-checkbox label="zd" name="type">宗地</el-checkbox>
<el-checkbox label="dz" name="type">多幢</el-checkbox>
<el-checkbox label="zrz" name="type">自然幢</el-checkbox>
<el-checkbox label="h" name="type">户</el-checkbox>
<el-checkbox label="gzw" name="type">构筑物</el-checkbox>
<el-checkbox label="lq" name="type">林权</el-checkbox>
<el-checkbox label="zh" name="type">宗海</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-button type="primary" @click="query">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
</el-form>
</el-col>
<el-col :span="2">
</el-col>
</el-row>
<table border="1">
<el-table
:data="Data"
:height="tableHeight"
:row-class-name="tableRowClassName"
>
<td class="xh">序号</td>
<td class="cz">操作</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>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="xzzrz(scope.row)" type="text" size="small"
>选择
</el-button>
</template>
</el-table-column>
<el-table-column prop="zddm" align="left" label="宗地代码">
</el-table-column>
<el-table-column prop="bdcdyh" align="left" label="不动产单元号">
</el-table-column>
<el-table-column prop="xmmc" align="left" width="150" label="项目名称">
</el-table-column>
<el-table-column prop="bdcqzh" align="left" label="不动产权证号">
</el-table-column>
<el-table-column prop="qlrmc" align="left" width="120" label="权利人">
</el-table-column>
<el-table-column prop="zl" align="left" label="坐落"></el-table-column>
</el-table>
<!-- <table border="1">
<tr>
<td class="xh">序号</td>
<td class="cz">操作</td>
......@@ -67,7 +165,7 @@
<td class="qlr" :title="item.qlr">{{ item.qlr }}</td>
<td class="zl">{{ item.zl }}</td>
</tr>
</table>
</table> -->
</div>
<span slot="footer" class="dialog-footer"> </span>
<cxlz-query-data
......@@ -116,12 +214,22 @@
},
Data: [],
dylxs: ["zd"],
tableHeight:0
};
},
created() {
},
mounted() {
this.getData(this.queryData);
if ((document.documentElement.clientWidth || document.body.clientWidth) < 1890) {
this.$nextTick(()=>{
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 355;
})
}else{
this.$nextTick(()=>{
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 304;
})
}
},
methods: {
currentChange: function (val) {
......@@ -170,7 +278,6 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
}
table {
......@@ -199,6 +306,14 @@
.inputtitle {
line-height: 40px;
span{
display: inline-block;
width: 120px;
text-align: left;
}
/deep/ .el-input{
width: calc(100% - 120px);
}
}
.shop {
......@@ -250,4 +365,10 @@
width: auto;
height: auto;
}
/deep/ .el-form-item__label{
width: 96px;
}
/deep/ .el-form{
margin-left: -28px;
}
</style>
......
......@@ -8,13 +8,13 @@
<span class="tips">分割前宗地信息</span>
<table border="1">
<tr>
<td>序号</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
<th>序号</th>
<th>宗地代码</th>
<th>不动产单元号</th>
<th>项目名称</th>
<th>不动产权证号</th>
<th>权利人</th>
<th>坐落</th>
</tr>
<tr v-if="Object.keys(bgqData)==0">
<td colspan="7">
......@@ -41,14 +41,14 @@
<span class="tips">分割后宗地信息</span>
<table border="1">
<tr>
<td>操作</td>
<td>行政区</td>
<td>地籍区</td>
<td>地籍子区</td>
<td>所有权类型</td>
<td>土地特征码</td>
<td>项目名称</td>
<td>幢信息</td>
<th>操作</th>
<th>行政区</th>
<th>地籍区</th>
<th>地籍子区</th>
<th>所有权类型</th>
<th>土地特征码</th>
<th>项目名称</th>
<th>幢信息</th>
</tr>
<tr v-for="(item,index) in fghData.newZdlist" :key="index">
<td @click="delRow(index)">-</td>
......@@ -167,7 +167,7 @@
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
@close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
</div>
</el-tab-pane>
......@@ -178,13 +178,13 @@
<span class="tips">分割前宗地信息</span>
<table border="1">
<tr>
<td>序号</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
<th>序号</th>
<th>宗地代码</th>
<th>不动产单元号</th>
<th>项目名称</th>
<th>不动产权证号</th>
<th>权利人</th>
<th>坐落</th>
</tr>
<tr v-if="Object.keys(bgqData)==0">
<td colspan="7">
......@@ -211,14 +211,14 @@
<span class="tips">分割后宗地信息</span>
<table border="1">
<tr>
<td>操作</td>
<td>行政区</td>
<td>地籍区</td>
<td>地籍子区</td>
<td>所有权类型</td>
<td>土地特征码</td>
<td>项目名称</td>
<td>幢信息</td>
<th>操作</th>
<th>行政区</th>
<th>地籍区</th>
<th>地籍子区</th>
<th>所有权类型</th>
<th>土地特征码</th>
<th>项目名称</th>
<th>幢信息</th>
</tr>
<tr v-for="(item,index) in fghData.newZdlist" :key="index">
<td @click="delRow(index)">-</td>
......@@ -336,7 +336,7 @@
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
@close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
</div>
</el-tab-pane>
......@@ -347,13 +347,13 @@
<span class="tips">分割前宗地信息</span>
<table border="1">
<tr>
<td>序号</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
<th>序号</th>
<th>宗地代码</th>
<th>不动产单元号</th>
<th>项目名称</th>
<th>不动产权证号</th>
<th>权利人</th>
<th>坐落</th>
</tr>
<tr v-if="Object.keys(bgqData)==0">
<td colspan="7">
......@@ -380,14 +380,14 @@
<span class="tips">分割后宗地信息</span>
<table border="1">
<tr>
<td>操作</td>
<td>行政区</td>
<td>地籍区</td>
<td>地籍子区</td>
<td>所有权类型</td>
<td>土地特征码</td>
<td>项目名称</td>
<td>幢信息</td>
<th>操作</th>
<th>行政区</th>
<th>地籍区</th>
<th>地籍子区</th>
<th>所有权类型</th>
<th>土地特征码</th>
<th>项目名称</th>
<th>幢信息</th>
</tr>
<tr v-for="(item,index) in fghData.newZdlist" :key="index">
<td @click="delRow(index)">-</td>
......@@ -505,7 +505,7 @@
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
@close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
</div>
</el-tab-pane>
......@@ -860,13 +860,19 @@
position: absolute;
right: 30px;
top: -46px;
z-index: 999;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
tr:nth-of-type(odd){
background: #FAFAFA;
th{
height: 36px;
}
}
.formInput {
margin: 0;
height: 36px;
......@@ -906,9 +912,6 @@
bottom: 0;
text-align: center;
background-color: #ffffff;
/deep/ .el-button{
margin-top: 5px;
}
}
.xz-container {
border: 1px solid #000;
......@@ -920,4 +923,14 @@
color: #9B9B9B;
}
}
.saveBtn{
background-color: #00CACD;
border-color: #00CACD;
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn:hover{
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
</style>
......
......@@ -13,8 +13,7 @@
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>办理
</el-button
>
</el-button>
<el-button type="text" size="small">定位</el-button>
</template>
</el-table-column>
......@@ -26,23 +25,33 @@
</el-table-column>
<el-table-column prop="dylx" align="left" width="120" label="类型">
<template slot-scope="scope">
{{scope.row.dylx | bdcLxFilter}}
{{ scope.row.dylx | bdcLxFilter }}
</template>
</el-table-column>
<el-table-column prop="qlrmc" align="left" width="120" label="权利人">
</el-table-column>
<el-table-column prop="zl" align="left" label="坐落"></el-table-column>
<el-table-column prop="addtime" align="left" width="120" label="转入时间">
<el-table-column
prop="addtime"
align="left"
width="120"
label="转入时间"
>
<template slot-scope="scope">
{{scope.row.addtime | timeFilter}}
{{ scope.row.addtime | timeFilter }}
</template>
</el-table-column>
<el-table-column prop="cjr" align="left" width="120" label="创建人">
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination background layout="prev, pager, next" :total="total"
:current-page="pageNo" @current-change="handleCurrentChange">
<el-pagination
background
layout="prev, pager, next,total"
:total="total"
:current-page="pageNo"
@current-change="handleCurrentChange"
>
</el-pagination>
</div>
</div>
......@@ -50,13 +59,13 @@
</template>
<script>
import SearchHead from "../../../../components/searchHead/searchHead";
import {getSearchList} from "../../../../api/search";
import {copyZdjbxx} from "../../../../api/common";
import SearchHead from "../../../../components/searchHead/searchHead";
import { getSearchList } from "../../../../api/search";
import { copyZdjbxx } from "../../../../api/common";
export default {
export default {
name: "",
components: {SearchHead},
components: { SearchHead },
props: {},
data() {
return {
......@@ -65,22 +74,23 @@
pageNo: 1,
pageSize: 10,
tableData: [],
tableHeight: "100px",
queryData: {}
tableHeight: "100",
queryData: {},
};
},
created() {
},
created() {},
mounted() {
this.getData({})
this.$nextTick(()=>{
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
})
this.getData({});
// console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight');
this.$nextTick(() => {
this.tableHeight =
(document.documentElement.clientHeight || document.body.clientHeight) -
304;
});
},
methods: {
onSubmit() {
},
tableRowClassName({row, rowIndex}) {
onSubmit() {},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 !== 0) {
return "even-row";
} else {
......@@ -94,24 +104,24 @@
this.getData(this.queryData);
},
getData(data) {
data['qszt'] = this.qszt
getSearchList(data).then(res => {
this.tableData = res.result.records
this.total = res.result.total
})
data["qszt"] = this.qszt;
getSearchList(data).then((res) => {
this.tableData = res.result.records;
this.total = res.result.total;
});
},
//获取子组件点击查询触发的事件
geQuerytData(obj) {
this.queryData = obj
this.queryData = obj;
//将obj作为参数调用接口查询表格数据
this.queryData['pageSize'] = this.pageSize
this.pageNo = 1
this.queryData['pageNo'] = 1
this.getData(this.queryData)
this.queryData["pageSize"] = this.pageSize;
this.pageNo = 1;
this.queryData["pageNo"] = 1;
this.getData(this.queryData);
},
//点击办理
handleClick(row) {
console.log('fwsxbg');
console.log("fwsxbg");
console.log(row);
var bsm = row.glbsm;
var type;
......@@ -119,7 +129,7 @@
switch (row.dylx) {
case "zrz":
type = "1";
this.$store.state.zrzbsm = row.glbsm
this.$store.state.zrzbsm = row.glbsm;
path = "/zrz";
break;
case "zd":
......@@ -128,15 +138,15 @@
path = "/zd";
break;
case "h":
type = "2"
this.$store.state.hbsm = row.glbsm
type = "2";
this.$store.state.hbsm = row.glbsm;
break;
default:
break;
}
var params = {"id": bsm, "type": type};
var params = { id: bsm, type: type };
copyZdjbxx(params)
.then((res => {
.then((res) => {
if (res.code == 200) {
this.$message({
message: res.message,
......@@ -148,7 +158,13 @@
type: "warning",
});
}
}));
})
.catch((error) => {
this.$message({
message: res.message,
type: "error",
});
});
//this.$router.push({
// path: path,
// query: {
......@@ -160,17 +176,11 @@
},
computed: {},
watch: {},
};
};
</script>
<style scoped lang="less">
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px !important;
display: flex;
flex-direction: column;
background-color: #fcfdff;
.main {
background-color: #eaedf5;
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
......@@ -185,8 +195,8 @@
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
padding: 18px 0 0 0;
}
}
}
</style>
......
<template>
<div>
<el-tabs v-model="tabName" @tab-click="handleClick">
<div class="hb" ref="hbBox">
<el-tabs v-model="tabName" class="menu" @tab-click="handleClick">
<el-tab-pane label="宗地合并" name="zd">
<div class="main">
<div class="hb-tabs">
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="header">
<span>合并后项目名称:</span>
<span>合并后项目名称</span>
<el-input></el-input>
<el-button type="primary" @click="newAdd">新增</el-button>
<el-button type="primary">保存</el-button>
</div>
<div class="table">
<table border="1">
<tr>
<td>序号</td>
......@@ -37,21 +36,23 @@
<td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
@close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn">保存</el-button>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="多幢合并" name="dz">
<div class="main">
<div class="hb-tabs">
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="header">
<span>合并后项目名称:</span>
<span>合并后项目名称</span>
<el-input></el-input>
<el-button type="primary" @click="newAdd">新增</el-button>
<el-button type="primary">保存</el-button>
</div>
<div class="table">
<table border="1">
<tr>
<td>序号</td>
......@@ -77,21 +78,22 @@
<td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
@close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn">保存</el-button>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="户合并" name="h">
<div class="main">
<div class="hb-tabs">
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="header">
<span>合并后项目名称:</span>
<span>合并后项目名称</span>
<el-input></el-input>
<el-button type="primary" @click="newAdd">新增</el-button>
<el-button type="primary">保存</el-button>
</div>
<div class="table">
<table border="1">
<tr>
<td>序号</td>
......@@ -117,8 +119,12 @@
<td><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td>
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
@close="close"></query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn">保存</el-button>
</div>
</div>
</el-tab-pane>
</el-tabs>
......@@ -136,12 +142,16 @@
return {
tabName: 'zd',
centerDialogVisible: false,
bgqData: []
bgqData: [],
fgBoxWidth:0
}
},
created() {
},
mounted() {
this.$nextTick(()=>{
this.fgBoxWidth = this.$refs.hbBox.clientWidth;
})
},
methods: {
handleClick(tab, event) {
......@@ -166,17 +176,71 @@
}
</script>
<style scoped lang="less">
.main {
.hb{
.menu{
/deep/.el-tabs__content{
position: unset;
margin-top: 62px;
overflow: visible;
}
/deep/.el-tabs__header{
position: -webkit-fixed;
position: fixed;
top: 120px;
z-index: 999;
width: 100%;
margin-bottom: 0;
border: 0;
/deep/.el-tabs__nav-scroll{
height: 50px;
box-sizing: border-box;
padding: 18px;
padding-left: 20px;
.el-tabs__active-bar{
display: none;
}
>.el-tabs__nav{
border: 0;
>.el-tabs__item{
border: 1px solid #DEDEDE;
height: 36px;
line-height: 36px;
padding: 0 20px;
margin: 9px 10px 9px 0;
background-color: #ffffff;
}
.is-active{
color: #006CFF;
border: 1px solid #006CFF;
}
}
}
/deep/.el-tabs__nav-wrap::after{
width: 0;
}
}
}
}
.hb-tabs {
height: auto;
width: 80%;
width: 100%;
position: relative;
.addBtn{
position: absolute;
right: 30px;
top: -46px;
z-index: 999;
}
.header {
box-sizing: border-box;
padding: 18px 18px 0 18px;
display: flex;
justify-items: left;
span {
width: 130px;
line-height: 40px;
color: #9B9B9B;
}
.el-input {
width: 200px;
......@@ -184,12 +248,28 @@
}
}
.header-button {
height: 50px;
position: fixed;
bottom: 0;
text-align: center;
background-color: #ffffff;
}
.table{
box-sizing: border-box;
padding: 0 18px;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
tr:nth-of-type(odd){
background: #FAFAFA;
th{
height: 36px;
}
}
.formInput {
margin: 0;
height: 36px;
......@@ -215,5 +295,15 @@
.noData {
color: #b2b2b2;
}
.saveBtn{
background-color: #00CACD;
border-color: #00CACD;
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn:hover{
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
}
</style>
......
......@@ -2,8 +2,8 @@
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane>
<el-tab-pane label="合并" name="hb"><hb></hb></el-tab-pane>
<el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg></fwsxbg></el-tab-pane>
<el-tab-pane label="合并" name="hb"><hb v-if="hbLoad"></hb></el-tab-pane>
<el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
<el-tab-pane label="重新落宗" name="cxlz"><cxlz></cxlz></el-tab-pane>
</el-tabs>
</div>
......@@ -23,11 +23,19 @@ export default {
data() {
return {
activeName: "fg",
hbLoad:false, //默认不加载合并tab
fwsxbgLoad:false, //默认不加载范围属性变更tab
};
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
console.log(tab.name);
if(!this.hbLoad){
this.hbLoad = tab.name == 'hb' ? true : false
}
if(!this.fwsxbgLoad){
this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false
}
},
},
created() {},
......