Merge remote-tracking branch 'origin/master'

 <template>
-    <div class="main">
+    <div class="mainbox1">
         <template v-if="isFwsxbg">
             <!-- <p class="tips">查询条件</p> -->
             <el-row class="box">
@@ -127,6 +127,7 @@
                             layout="prev, pager, next,total"
                             :total="total"
                             :current-page="pageNo"
+						    :page-size="pageSize"
                             @current-change="handleCurrentChange"
                     >
                     </el-pagination>
@@ -143,7 +144,6 @@
                         maxlength="28"
                         v-model="bdcdyh"
                         :style="{ width: inputWidth + 'px' }"
-                        @change="inputChange"
                         class="searchInput"
                         placeholder="输入不动产单元号或室号"
                 ><i
@@ -389,17 +389,21 @@
                 lpbContentHeight: 0,
                 lpbContentwidth: 0,
                 lpbloading:true,
+			    hbsm:''  
             };
         },
         created() {},
         mounted() {
+            this.queryData.pageNo = this.pageNo;
+            this.queryData.pageSize = this.pageSize;
+            this.queryData.type = this.queryType;
             this.getData(this.queryData);
             // console.log(document.documentElement.clientHeight || document.body.clientHeight,'document.documentElement.clientHeight || document.body.clientHeight');
             this.$nextTick(() => {
                 this.tableHeight =
                     (document.documentElement.clientHeight || document.body.clientHeight) -
-                    352;
-                this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 222;
+                    342;
+                this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 262;
             });
         },
         methods: {
@@ -417,16 +421,20 @@
             },
             // 查询
             query(){
+                this.queryData.pageNo = this.pageNo;
+                this.queryData.pageSize = this.pageSize;
+                this.queryData.type = this.queryType;
                 this.getData(this.queryData)
             },
             // 更多查询
             moreSearch(){
+                console.log(this.tableHeight);
                 if(this.ismore === true){
                     this.ismore = false;
-                    this.$parent.tableHeight+=55;
+                    this.tableHeight+=69;
                 }else {
                     this.ismore = true;
-                    this.$parent.tableHeight-=55;
+                    this.tableHeight-=69;
                 }
             },
             onSubmit() {},
@@ -469,11 +477,16 @@
             //点击办理
             handleClick(row) {
                 let params = { bsm: row.bsm, type: this.queryType };
-                if(this.queryType == 'h'){
+			    this.bdcdyh = row.bdcdyh;
+                if(row.dylx == 'h0' || row.dylx == 'h1'){
+				    this.hbsm = row.bsm;
                     getQjHDetailByBsm(row.bsm).then((res)=>{
                         if(res.code===200){
                             this.zrzbsm = res.result.zrzbsm;
                             this.isFwsxbg = false;
+                            this.$nextTick(()=>{
+                                this.scyclx = row.dylx == 'h0' ? '0':'1'
+                            })
                         }
                     })
                 }else{
@@ -704,6 +717,8 @@
                     this.getLpbFwytAndQlxz();
                     this.$nextTick(()=>{
                         this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
+                        this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
+                        this.$refs.lpbContent.hbsmList.push(this.hbsm)
                     })
                 }
             },
@@ -723,16 +738,17 @@
 </script>
 
 <style scoped lang="less">
-    .main{
-        padding: 0;
+    .mainbox1{
+        width: 100%;
+        height: 100%;
+        box-sizing: border-box;
+        padding:20px;
+        background-color: #eaedf5;
         .box{
             background-color: white;
             padding: 10px 0;
             margin-bottom: 10px;
         }
-    }
-    /*.main {
-        background-color: #eaedf5;
          .tips{
             color: #9B9B9B;
             margin-left: 2px;
@@ -852,5 +868,9 @@
             }
 
         }
+    }
+    /*.main {
+        background-color: #eaedf5;
+       
     }*/
 </style>

 <template>
-	<div class="main">
+	<div class="mainbox">
 		<el-tabs v-model="tabName" @tab-click="handleClick" class="menu">
 			<el-tab-pane label="宗地" name="zd">
 				<fwsxbg-tab queryType="zd"></fwsxbg-tab>
@@ -61,14 +61,21 @@ export default {
 };
 </script>
 <style scoped lang="less">
-	.main {
+	.mainbox {
+		width: 100%;
 		height: 100%;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		padding: 0;
 		.menu {
 			height: 100%;
 			/deep/ .el-tabs__content {
 				position: unset;
 				margin-top: 40px;
 				overflow: visible;
+				/deep/.el-tab-pane{
+					height: calc(100% - 0px);
+				}
 			}
 			/deep/ .el-tabs__header {
 				position: -webkit-fixed;