b0431b8a by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 1020f21b 5b9dcc6e
......@@ -71,3 +71,37 @@ ol, ul { list-style:none; }
::-webkit-scrollbar-track {
border-radius: 0;
}
//二级菜单样式
.tabs{
>.is-top>.is-top>.el-tabs__nav-scroll{
height: 50px;
background-color: #ffffff;
box-sizing: border-box;
padding-left: 20px;
.el-tabs__active-bar{
display: none;
}
>.el-tabs__nav{
>.el-tabs__item{
border: 1px solid #DEDEDE;
height: 30px;
line-height: 30px;
padding: 0 20px;
margin: 9px 10px 9px 0;
}
.is-active{
color: #006CFF;
background-color: #ffffff;
}
}
}
}
//弹框遮罩层样式
.v-modal{
opacity: .2;
background: #fff;
}
.el-dialog{
-webkit-box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4);
box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4);
}
\ No newline at end of file
......
<template>
<div class="main">
<div class="">
<el-dialog
title="批量室号"
:visible.sync="isVisible"
......
......@@ -208,6 +208,7 @@
},
cancel: function () {
console.log("cancel......")
this.close();
},
close: function () {
this.$emit("close")
......@@ -216,6 +217,16 @@
},
result: function () {
console.log("重置")
this.plzlData = {
qz: '',
zd: '',
zrz: '',
ljz: '',
zdy: '',
c: '',
h: '',
hz: ''
}
}
},
computed: {
......
<template>
<el-row>
<el-col :span="18">
<el-col :span="24">
<el-row>
<el-col :span="22">
<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 label="宗地编码">
<el-input
v-model="queryData.zddm"
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 label="坐落">
<el-input
v-model="queryData.zl"
placeholder="输入坐落地址"
@change="query"
></el-input>
</el-form-item>
</el-form>
</el-col>
<el-col :span="2">
<el-button type="primary" @click="query">查询</el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form :inline="true" :model="queryData" class="demo-form-inline">
<el-form-item label="不动产单元号:">
<el-form-item label="不动产单元号">
<el-input
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
@change="query"
></el-input>
</el-form-item>
<el-form-item class="demo-form-inline" label="单元类型:">
<el-button type="primary" @click="query">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<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="zrz" name="type">自然幢</el-checkbox>
......@@ -39,35 +53,43 @@
</el-form>
</el-col>
<el-col :span="2">
<el-button type="warning" @click="reset">重置</el-button>
</el-col>
</el-row>
<el-row class="row3">
<el-col :span="22" v-show="ismore">
<el-row class="row3" v-if="ismore">
<el-col :span="22">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="权利人名称:">
<el-input placeholder="输入权利人名称" v-model="queryData.qlrmc" @change="query"></el-input>
<el-input
placeholder="输入权利人名称"
v-model="queryData.qlrmc"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="项目名称:">
<el-input placeholder="输入项目名称" v-model="queryData.xmmc" @change="query"></el-input>
<el-input
placeholder="输入项目名称"
v-model="queryData.xmmc"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号:">
<el-input placeholder="输入不动产权证号" v-model="queryData.bdcqzh" @change="query"></el-input>
<el-input
placeholder="输入不动产权证号"
v-model="queryData.bdcqzh"
@change="query"
></el-input>
</el-form-item>
</el-form>
</el-col>
<el-col :span="2" :offset="offset">
<el-button type="primary" class="moreSearchBtn" @click="ismore=!ismore">更多查询
</el-button>
</el-col>
</el-row>
</el-col>
</el-row>
</template>
<script>
export default {
export default {
name: "",
components: {},
props: {},
......@@ -83,13 +105,13 @@
qszt: "",
xmmc: "",
zddm: "",
zl: ""
}
zl: "",
},
};
},
created() {
let self = this;
document.onkeydown = function (e) {
document.onkeydown = function(e) {
//按下回车提交
let key = window.event.keyCode;
//事件中keycode=13为回车事件
......@@ -98,9 +120,9 @@
}
};
},
mounted() {
},
mounted() {},
methods: {
//重置
reset() {
this.queryData = {
bdcdyh: "",
......@@ -110,35 +132,47 @@
qszt: "",
xmmc: "",
zddm: "",
zl: ""
zl: "",
};
this.query()
this.query();
},
//查询
query() {
//子组件点击查询时将表单数据发送给父组件
this.$emit("getSearchCondition", this.queryData);
},
// 高级查询
moreSearch(){
this.$message('待开发');
}
},
computed: {},
watch: {
"ismore": function (val) {
ismore: function(val) {
if (val) {
this.offset = 0
this.offset = 0;
} else {
this.offset = 22
this.offset = 22;
this.queryData.qlrmc = "";
this.queryData.xmmc = "";
this.queryData.bdcqzh = "";
}
}
},
};
},
};
</script>
<style scoped lang="less">
.el-button {
.el-row{
background-color: #EAEDF5;
}
.el-button {
width: 100px;
}
.row3{
}
.row3 {
height: 55px;
}
}
.moreSearchBtn{
background-color: #1AD6E1;
border-color: #1AD6E1;
}
</style>
......
......@@ -61,7 +61,7 @@
return {
total: 0,
pageNo: 1,
pageSize: 10,
pageSize: 15,
tableData: [],
tableHeight: "",
queryData: {}
......@@ -70,7 +70,7 @@
created() {
},
mounted() {
this.getData({})
this.getData({pageSize:15})
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
},
methods: {
......@@ -140,7 +140,7 @@
padding: 0 18px;
display: flex;
flex-direction: column;
background-color: #fcfdff;
background-color: #EAEDF5;
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb></mjftb></el-tab-pane>
<el-tab-pane label="界址点" name="jzd"><jzd></jzd></el-tab-pane>
......
<template>
<div ref="lpb" class="content_box">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
<el-tab-pane label="业主共有" name="yzgy"><yzgy></yzgy></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
......@@ -44,24 +44,24 @@ export default {
};
</script>
<style scoped lang="less">
.content_box{
box-sizing: border-box;
padding: 0 20px;
.el-tabs{
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
}
/deep/.el-tabs__content{
width: 100%;
height: 100%;
flex:1;
position: unset;
}
.el-tab-pane{
width: 100%;
height: 100%;
}
}
// .content_box{
// box-sizing: border-box;
// padding: 0 20px;
// .el-tabs{
// width: 100%;
// height: 100%;
// display: flex;
// flex-direction: column;
// }
// /deep/.el-tabs__content{
// width: 100%;
// height: 100%;
// flex:1;
// position: unset;
// }
// .el-tab-pane{
// width: 100%;
// height: 100%;
// }
// }
</style>
......
......@@ -256,7 +256,7 @@ export default {
},
//获取高度计算lpb内容区高度
getHeight() {
this.lpbContentHight = window.innerHeight - 276;
this.lpbContentHight = window.innerHeight - 285;
},
//创建楼盘
create() {
......@@ -388,7 +388,7 @@ export default {
box-sizing: border-box;
padding: 20px 0;
background-color: #ffffff;
margin-bottom: 20px;
margin-bottom: 15px;
.searchContent {
box-sizing: border-box;
padding: 0 20px;
......
......@@ -42,10 +42,27 @@ export default {
.lpb{
width: 100%;
height: 100%;
background-color: #fff;
box-sizing: border-box;
padding: 0 18px !important;
-webkit-user-select:none;
-moz-user-select:none;
-ms-user-select:none;
user-select:none;
/deep/.el-tabs__header{
margin-bottom: 0;
}
/deep/.el-tabs--card>.el-tabs__header{
background-color: #FAFAFA;
border-top: 1px solid #E4E7ED;
}
/deep/.el-tabs--card>.el-tabs__header .el-tabs__item.is-active{
background-color: #fff;
border-top: 2px solid #006CFF;
height: 42px;
}
/deep/ .el-tabs__item{
border-top: 0;
}
.el-tabs{
height: 100%;
display: flex;
......
<template>
<div class="zrz content-form" v-loading="loading">
<div class="zrz content-form main" v-loading="loading">
<el-form ref="form" :model="form" label-width="160px">
<Qlr ref="qlrxxModule" :bsm="bsm"></Qlr>
<table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable">
......@@ -528,8 +528,6 @@
.zrz {
min-height: 200px;
width: 100%;
margin-top: 10px;
float: left;
/deep/.el-input__inner{
width: 100%;
......