bf0bf3d2 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents d9bf8c9e 085644f5
......@@ -122,6 +122,7 @@
zl: "",
pageNo: 1,
pageSize: 10,
type:'all',
},
Data: [],
isVisible: false
......@@ -165,7 +166,8 @@
zddm: "",
zl: "",
pageNo: 1,
pageSize: 10
pageSize: 10,
type:'all',
};
this.getData(this.queryData)
},
......
......@@ -3,7 +3,7 @@
<el-col :span="24">
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="宗地编码">
<el-input
v-model="queryData.zddm"
......@@ -11,14 +11,14 @@
@change="query"
></el-input>
</el-form-item>
<el-form-item label="坐落">
<el-form-item label="项目名称">
<el-input
v-model="queryData.zl"
placeholder="输入坐落地址"
@change="query"
placeholder="输入项目名称"
v-model="queryData.xmmc"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="不动产单元号">
<el-form-item label="不动产单元号:">
<el-input
maxlength="28"
v-model="queryData.bdcdyh"
......@@ -32,49 +32,30 @@
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-form>
</el-col>
<el-col :span="2">
</el-col>
</el-row>
<el-row class="row3" v-if="ismore">
<el-col :span="22">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="权利人名称:">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="权利人名称">
<el-input
placeholder="输入权利人名称"
v-model="queryData.qlrmc"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="项目名称:">
<el-form-item label="坐落:">
<el-input
placeholder="输入项目名称"
v-model="queryData.xmmc"
@change="query"
v-model="queryData.zl"
placeholder="输入坐落地址"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号:">
<el-form-item label="不动产权证号">
<el-input
placeholder="输入不动产权证号"
v-model="queryData.bdcqzh"
......@@ -86,6 +67,25 @@
<el-col :span="2" :offset="offset">
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px">
<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" v-show="type !== 'add'"></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-form>
</el-col>
<el-col :span="2">
</el-col>
</el-row>
</el-col>
</el-row>
</template>
......@@ -94,7 +94,13 @@
export default {
name: "",
components: {},
props: {},
props: {
type:{
type:String,
default:'all',
required:true
}
},
data() {
return {
offset: 22,
......@@ -108,6 +114,7 @@ export default {
xmmc: "",
zddm: "",
zl: "",
type:this.type
},
};
},
......@@ -146,7 +153,13 @@ export default {
},
// 高级查询
moreSearch(){
this.$message('待开发');
if(this.ismore === true){
this.ismore = false;
}else {
this.ismore = true;
}
// this.$message('待开发');
}
},
computed: {},
......
......@@ -105,24 +105,6 @@ export default {
select: false,
},
],
tempTab: [
{
path: "/zrz",
name: "自然幢",
},
{
path: "/dz",
name: "多幢",
},
{
path: "/h",
name: "户",
},
{
path: "/zd",
name: "宗地",
},
],
// 上导航选中id
indId: undefined,
menuList: [],
......
<template>
<div class="main">
<SearchHead @getSearchCondition="geQuerytData"></SearchHead>
<SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
......@@ -60,6 +60,7 @@
props: {},
data() {
return {
type:'add',
total: 0,
pageNo: 1,
pageSize: 15,
......@@ -91,6 +92,7 @@
},
getData(data) {
data['qszt'] = this.qszt
data['type'] = this.type
getSearchList(data).then(res => {
this.tableData = res.result.records
this.total = res.result.total
......
......@@ -131,6 +131,7 @@ export default {
zl: "",
pageNo: 1,
pageSize: 12,
type:'add',
},
Data: [],
dylxs: ["zd"],
......@@ -181,6 +182,7 @@ export default {
zl: "",
pageNo: 1,
pageSize: 12,
type:'add',
};
this.getData(this.queryData);
},
......
<template>
<div class="main">
<SearchHead @getSearchCondition="geQuerytData"></SearchHead>
<SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
......@@ -75,6 +75,7 @@ export default {
props: {},
data() {
return {
type:'fwsxbg',
qszt: ['2'],
total: 0,
pageNo: 1,
......@@ -110,6 +111,7 @@ export default {
this.getData(this.queryData);
},
getData(data) {
data['type'] = this.type
data["qszt"] = this.qszt;
getSearchList(data).then((res) => {
this.tableData = res.result.records;
......
......@@ -226,13 +226,14 @@ export default {
return {
queryData:{
bdcdyh: "",
bdcqzh: "",
dylxs: ['zrz'],
qlrmc: "",
qszt: [],
xmmc: "",
zddm: "",
zl: "",
bdcqzh: "",
dylxs: ['zrz'],
qlrmc: "",
qszt: [],
xmmc: "",
zddm: "",
zl: "",
type:'all',
pageNo:1,
pageSize:15
},
......@@ -341,7 +342,8 @@ export default {
bdcdyh:'',
bdcqzh:'',
pageNo:1,
pageSize:10
pageSize:10,
type:'all'
};
this.search()
},
......
<template>
<div class="main">
<SearchHead @getSearchCondition="geQuerytData"></SearchHead>
<SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
......@@ -68,6 +68,7 @@
props: {},
data() {
return {
type:'modify',
qszt: ['1'],
total: 0,
pageNo: 1,
......@@ -99,6 +100,7 @@
this.getData(this.queryData);
},
getData(data) {
data['type'] = this.type
data['qszt'] = this.qszt
getSearchList(data).then(res => {
this.tableData = res.result.records
......
<template>
<div class="main">
<SearchHead @getSearchCondition="geQuerytData"></SearchHead>
<SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
......@@ -64,6 +64,7 @@
props: {},
data() {
return {
type:'all',
total: 0,
pageNo: 1,
pageSize: 15,
......@@ -100,6 +101,7 @@
this.getData(this.queryData);
},
getData(data) {
data['type'] = this.type
getSearchList(data).then(res => {
this.tableData = res.result.records
this.total = res.result.total
......
......@@ -24,7 +24,7 @@
<tr>
<td class="cz"><el-button
type="primary"
class="changeBtn outAdd addMinus"
class="changeBtn inAdd addMinus"
@click="addRow"
>+</el-button
></td>
......@@ -37,7 +37,7 @@
<td class="cz">
<el-button
type="primary"
class="changeBtn outMinus addMinus"
class="changeBtn inMinus addMinus"
@click="delRow(i)"
>-</el-button
>
......
<template>
<div class="lpbContent-wrap" ref="lpbContentWrap">
<div
:class="
lpbData.ljzs.length == 0 ? 'column-reverse lpbContent' : 'lpbContent'
"
:class="lpbData.ljzs.length == 0 ? ' lpbContent' : 'lpbContent'"
ref="lpbContent"
v-loading="loading"
>
......@@ -73,12 +71,12 @@
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
</ul>
</td>
</tr>
......@@ -139,12 +137,12 @@
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
</ul>
</td>
</tr>
......@@ -211,12 +209,12 @@
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
</ul>
</td>
</tr>
......@@ -265,12 +263,12 @@
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
</ul>
</td>
</tr>
......@@ -445,7 +443,7 @@ export default {
this.getLpb(this.zrzbsm, "1");
setTimeout(() => {
//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
this.lpbContentWidth = this.$store.state.contentWidth - 39 - 20;
//让滚动条滚动至最下面 -6是横向滚动条的高度
this.$refs.lpbContent.scrollTop =
this.$refs.lpbContent.scrollHeight -
......
......@@ -15,7 +15,7 @@
<td>
<el-button
type="primary"
class="changeBtn outAdd addMinus"
class="changeBtn inAdd addMinus"
@click="addRow"
>+</el-button
>
......@@ -31,7 +31,7 @@
<td>
<el-button
type="primary"
class="changeBtn outMinus addMinus"
class="changeBtn inMinus addMinus"
@click="delRow(i)"
>-</el-button
>
......