867c6bbc by weimo934

feat(*):、宗地分割 宗地合并自然幢、户重新落宗 选择宗地,添加功能:权属状态=1 or 权属状态=2

1 parent cd1d73e7
......@@ -9,3 +9,11 @@ export function getSearchList(data) {
data : data,
})
}
export function zdlist(data) {
return request({
url: '/zd/qjZdjbxx/zdlist',
method: 'post',
data:data
})
}
......
......@@ -91,7 +91,7 @@
</template>
<script>
import {getSearchList} from './../../api/search'
import {zdlist} from './../../api/search'
import {zrzcxlz} from './../../api/h'
import {Message} from 'element-ui'
......@@ -103,9 +103,8 @@
queryData: {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: "2",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......@@ -141,7 +140,7 @@
},
methods: {
saveNotarize: function (val) {
this.zdbsm = val.glbsm;
this.zdbsm = val.zdbsm;
this.$confirm('将落宗在该宗地上, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -176,7 +175,7 @@
bdcdyh: "",
bdcqzh: "",
qlrmc: "",
qszt: "2",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......@@ -186,8 +185,7 @@
this.getData(this.queryData)
},
getData: function (data) {
data['dylxs'] = this.dylxs;
getSearchList(data).then(res => {
zdlist(data).then(res => {
this.Data = res.result.records
this.total = res.result.total;
})
......
......@@ -64,19 +64,19 @@
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
<query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
:isZdClose="true"></query-data>
<zd-query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
:isZdClose="true"></zd-query-data>
</el-dialog>
</template>
<script>
import queryData from './../../components/queryData/queryData'
import zdQueryData from './../../components/zdQueryData/zdQueryData'
import {zdXlcd, hzl} from './../../api/zd'
import {Message} from 'element-ui'
export default {
name: "hCxlz",
components: {queryData},
components: {zdQueryData},
data() {
return {
zd: {},
......
......@@ -107,7 +107,7 @@
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: "2",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......@@ -151,7 +151,7 @@
bdcdyh: "",
bdcqzh: "",
qlrmc: "",
qszt: "2",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......
......@@ -103,7 +103,7 @@ export default {
bdcqzh: "",
dylxs: [],
qlrmc: "",
qszt: "",
qszt: [],
xmmc: "",
zddm: "",
zl: "",
......@@ -131,7 +131,7 @@ export default {
bdcqzh: "",
dylxs: [],
qlrmc: "",
qszt: "",
qszt: [],
xmmc: "",
zddm: "",
zl: "",
......
<template>
<div>
<el-dialog
title="新增"
:visible.sync="isVisible"
width="50%"
@close="close"
:modal-append-to-body="false"
center>
<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-input v-model="queryData.zddm"></el-input>
</el-col>
<el-col :span="4" class="inputtitle">
不动产权证号:
</el-col>
<el-col :span="8" class="">
<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-input v-model="queryData.bdcdyh"></el-input>
</el-col>
<el-col :span="4" class="inputtitle">
权利人:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.qlrmc"></el-input>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4" class="inputtitle">
坐落:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.zl"></el-input>
</el-col>
</el-row>
<table border="1">
<tr>
<td>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
</tr>
<tr v-if="Data.length==0">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in Data" :key="index">
<td>{{index+1}}</td>
<td @click="addData(item)" class="xz">
<span>选择</span>
</td>
<td>{{item.zddm}}</td>
<td>{{item.bdcdyh}}</td>
<td>{{item.xmmc}}</td>
<td>{{item.bdcqzh}}</td>
<td>{{item.qlr}}</td>
<td>{{item.zl}}</td>
</tr>
</table>
</div>
<span slot="footer" class="dialog-footer">
</span>
<div class="page">
<el-pagination
background
layout="prev, pager, next,total"
:page-size="queryData.pageSize"
:total="total"
@current-change="currentChange"
>
</el-pagination>
</div>
</el-dialog>
</div>
</template>
<script>
import {zdlist} from './../../api/search'
export default {
name: "zdQueryData",
data() {
return {
total:1,
queryData: {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
pageNo: 1,
pageSize: 10,
},
Data: [],
isVisible: false
}
},
props: {
centerDialogVisible: {
type: Boolean,
default: function () {
return false
}
},
qszt:{
type:Array,
default:function () {
return ['2']
}
},
isZdClose:{
type:Boolean,
default:false
}
},
mounted() {
this.getData(this.queryData)
},
created() {
},
methods: {
currentChange: function (val) {
this.queryData.pageNo = val;
this.getData(this.queryData);
},
result: function () {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
qlrmc: "",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
pageNo: 1,
pageSize: 10
};
this.getData(this.queryData)
},
getData: function (data) {
data['dylxs'] = this.dylxs;
zdlist(data).then(res => {
this.Data = res.result.records
this.total = res.result.total;
})
},
search: function () {
this.getData(this.queryData)
},
addData: function (val) {
this.$emit("getData", val)
if (this.isZdClose) {
this.close();
}
},
close: function () {
this.$emit('close')
this.result();
}
},
watch: {
centerDialogVisible(val) {
this.isVisible = val
}
}
}
</script>
<style scoped lang="less">
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
tr:hover{
background-color: #F5F7FA;
}
}
td {
text-align: center;
height: 36px;
min-width: 50px;
}
table:hover {
cursor: pointer;
}
.inputtitle {
line-height: 40px;
}
.shop {
margin-top: 20px;
}
.xz {
color: blue;
}
.noData {
color: #b2b2b2;
}
</style>
......@@ -61,7 +61,7 @@
total: 0,
pageNo: 1,
pageSize: 10,
qszt: 1,
qszt: ['1', '2'],
queryData: {},
formData: {
user: "",
......@@ -80,8 +80,8 @@
pageSize: this.pageSize,
})
this.$nextTick(() => {
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
});
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
});
},
methods: {
handleCurrentChange(val) {
......
......@@ -121,7 +121,7 @@ export default {
bdcqzh: "",
dylxs: ["zrz"],
qlrmc: "",
qszt: "2",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......@@ -171,7 +171,7 @@ export default {
bdcqzh: "",
dylxs: ["zrz"],
qlrmc: "",
qszt: "2",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......
......@@ -186,8 +186,8 @@
</div>
</el-dialog>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true"
@close="close"></query-data>
<zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true"
@close="close"></zd-query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
......@@ -589,12 +589,13 @@
} from "./../../../../api/common";
import {getQjZdjbxxDetailById} from './../../../../api/zd'
import QueryData from './../../../../components/queryData/queryData'
import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
import {zdfg} from './../../../../api/zd'
import {Message} from 'element-ui'
export default {
name: "",
components: {QueryData},
components: {QueryData,zdQueryData},
props: {},
data() {
return {
......
......@@ -69,7 +69,7 @@ export default {
props: {},
data() {
return {
qszt: 2,
qszt: ['2'],
total: 0,
pageNo: 1,
pageSize: 10,
......@@ -169,8 +169,8 @@ export default {
message: res.message,
type: "error",
});
});
});
},
},
computed: {},
......
......@@ -110,8 +110,8 @@
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
@close="close"></query-data>
<zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
@close="close"></zd-query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn">保存</el-button>
......@@ -362,10 +362,11 @@
getDdicByMC
} from "./../../../../api/common";
import QueryData from './../../../../components/queryData/queryData'
import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
export default {
name: "",
components: {QueryData},
components: {QueryData,zdQueryData},
props: {},
data() {
return {
......
......@@ -60,7 +60,7 @@
props: {},
data() {
return {
qszt: 1,
qszt: ['1'],
total: 0,
pageNo: 1,
pageSize: 10,
......@@ -167,9 +167,9 @@
type: "error",
});
});
}).catch(() => {
});
},
},
......