Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -69,7 +69,7 @@
 			<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-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>

@@ -2,9 +2,9 @@
     <el-tabs v-model="activeName" class="tabs">
         <el-tab-pane label="添加" name="tj">
             <div class="main">
-                <p class="tips">查询条件</p>
+                <!-- <p class="tips">查询条件</p> -->
                 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
-                <p class="tips">查询列表</p>
+                <!-- <p class="tips">查询列表</p> -->
                 <div class="dataGrid" ref="dataGrid">
                     <el-table
                             :data="tableData"

 <template>
 	<div class="main">
 		<template v-if="isCxlz">
-			<p class="tips">查询条件</p>
+			<!-- <p class="tips">查询条件</p> -->
 			<div class="search">
 				<el-row>
 					<el-col :span="24" style="margin-left: -10px;">
@@ -49,7 +49,7 @@
 					</el-col>
 				</el-row>
 			</div>
-			<p class="tips">查询列表</p>
+			<!-- <p class="tips">查询列表</p> -->
 			<el-table :data="Data" :height="tableHeight">
 				<td class="xh">序号</td>
 				<td class="cz">操作</td>

 <template>
 	<div class="main">
 		<template v-if="isFwsxbg">
-			<p class="tips">查询条件</p>
+			<!-- <p class="tips">查询条件</p> -->
 			<SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
-			<p class="tips">查询列表</p>
+			<!-- <p class="tips">查询列表</p> -->
 			<div class="dataGrid" ref="dataGrid">
 				<el-table
 					:data="tableData"

@@ -2,9 +2,9 @@
     <el-tabs v-model="activeName" class="tabs">
         <el-tab-pane label="更正" name="gz">
             <div class="main">
-                <p class="tips">查询条件</p>
+                <!-- <p class="tips">查询条件</p> -->
                 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
-                <p class="tips">查询列表</p>
+                <!-- <p class="tips">查询列表</p> -->
                 <div class="dataGrid" ref="dataGrid">
                     <el-table
                             :data="tableData"

@@ -2,9 +2,9 @@
     <el-tabs v-model="activeName" class="tabs">
         <el-tab-pane label="综合查询" name="zhcx">
             <div class="main">
-                <p class="tips">查询条件</p>
+                <!-- <p class="tips">查询条件</p> -->
                 <SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
-                <p class="tips">查询列表</p>
+                <!-- <p class="tips">查询列表</p> -->
                 <div class="dataGrid" ref="dataGrid">
                     <el-table
                             :data="tableData"