From f087cefd4b161173532c513df707a628634f1771 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Thu, 2 Jun 2022 10:50:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E6=B2=BB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/caloudong.vue  | 121 +++++++---------
 src/views/modules/cabaseinfo/capingfang.vue | 131 +++++++-----------
 src/views/modules/cabaseinfo/carental.vue   | 130 ++++++++----------
 src/views/modules/cabaseinfo/caresident.vue | 143 +++++++------------
 src/views/modules/cabaseinfo/carotators.vue | 145 +++++++-------------
 5 files changed, 261 insertions(+), 409 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 21ce6384..e664a0b2 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -1,75 +1,55 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caLoudong}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.buildingId" placeholder="buildingId" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button class="diy-button--add" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item> -->
-        <!-- <el-form-item>
-          <el-button class="diy-button--delete" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item> -->
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="buildingId" label="楼栋ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingType" label="楼宇类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingName" label="楼宇名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingUse" label="用途分类" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingStatus" label="楼宇状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingStructure" label="楼宇结构" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingUseage" label="使用现状" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="constructionTime" label="建筑时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingAddr" label="所处位置" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingLeader" label="楼栋长" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="layerCount" label="楼层数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="basementLayerCount" label="地下楼层数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseBeginLayer" label="住宅开始层数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="unitCount" label="单元数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="layerRoomCount" label="每层每单元户数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="roomCount" label="总房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="elevatorCount" label="电梯数量" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingArea" label="建筑面积" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingPmc" label="物业公司" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingDesc" label="介绍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pointStatus" label="标绘状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityId" label="小区主键" header-align="center" align="center"></el-table-column>
-        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('axis:caloudong:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('axis:caloudong:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column> -->
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <el-card>
+        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+          <el-form-item label="楼宇名称" prop="buildingName" >
+            <el-input v-model="dataForm.buildingName" placeholder="楼宇名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="小区（单位）名称" prop="communityName" >
+            <el-input v-model="dataForm.communityName" placeholder="小区（单位）名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+          </el-form-item>
+          <!-- <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item> -->
+        </el-form>
+      </el-card>
+      <el-card shadow="never" class="aui-card--fill">
+        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+          <el-table-column prop="buildingName" label="楼宇名称" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="buildingUse" label="用途分类" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="buildingAddr" label="所处位置" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="layerCount" label="楼层数" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="unitCount" label="单元数" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="roomCount" label="总房屋数" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="elevatorCount" label="电梯数量" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="buildingPmc" label="物业公司" header-align="center" align="center"></el-table-column>
+          <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+            <template slot-scope="scope">
+              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :current-page="page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="pageSizeChangeHandle"
+          @current-change="pageCurrentChangeHandle">
+        </el-pagination>
+        <!-- 弹窗, 新增 / 修改 -->
+        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      </el-card>
     </div>
-  </el-card>
 </template>
 
 <script>
@@ -86,7 +66,8 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        // buildingId: ''
+        buildingName: '',
+        communityName: ''
       }
     }
   },
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index d057ff42..042115b8 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -1,85 +1,55 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caPingfang}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.buildingId" placeholder="buildingId" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caPingfang:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caPingfang:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item> -->
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="buildingId" label="楼栋ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingType" label="楼宇类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingName" label="楼宇名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingUse" label="用途分类" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingStatus" label="楼宇状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingStructure" label="楼宇结构" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingUseage" label="使用现状" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="constructionTime" label="建筑时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingAddr" label="所处位置" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingLeader" label="楼栋长" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="layerCount" label="楼层数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="basementLayerCount" label="地下楼层数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseBeginLayer" label="住宅开始层数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="unitCount" label="单元数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="layerRoomCount" label="每层每单元户数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="roomCount" label="总房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="elevatorCount" label="电梯数量" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingArea" label="建筑面积" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingPmc" label="物业公司" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingDesc" label="介绍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pointStatus" label="标绘状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute1" label="扩展字段1" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute2" label="扩展字段2" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute3" label="扩展字段3" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute4" label="扩展字段4" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute5" label="扩展字段5" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute6" label="小区主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute7" label="扩展字段7" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityId" label="小区主键" header-align="center" align="center"></el-table-column>
-        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('axis:caPingfang:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('axis:caPingfang:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column> -->
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <el-card>
+        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+          <el-form-item label="楼宇名称" prop="buildingName" >
+            <el-input v-model="dataForm.buildingName" placeholder="楼宇名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="小区（单位）名称" prop="communityName" >
+            <el-input v-model="dataForm.communityName" placeholder="小区（单位）名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+          </el-form-item>
+          <!-- <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item> -->
+        </el-form>
+      </el-card>
+      <el-card shadow="never" class="aui-card--fill">
+        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+          <el-table-column prop="buildingName" label="楼宇名称" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="buildingUse" label="用途分类" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="buildingAddr" label="所处位置" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="layerCount" label="楼层数" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="unitCount" label="单元数" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="roomCount" label="总房屋数" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="elevatorCount" label="电梯数量" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="buildingPmc" label="物业公司" header-align="center" align="center"></el-table-column>
+          <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+            <template slot-scope="scope">
+              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :current-page="page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="pageSizeChangeHandle"
+          @current-change="pageCurrentChangeHandle">
+        </el-pagination>
+        <!-- 弹窗, 新增 / 修改 -->
+        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      </el-card>
     </div>
-  </el-card>
 </template>
 
 <script>
@@ -96,7 +66,8 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        buildingId: ''
+        buildingName: '',
+        communityName: ''
       }
     }
   },
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index adabbcf1..332b944d 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -1,81 +1,57 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caRental}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.rentalId" placeholder="rentalId" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caRental:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caRental:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item> -->
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="rentalId" label="出租房ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseId" label="房屋ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseName" label="房屋编号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseAddress" label="房屋地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseUse" label="建筑用途" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseArea" label="建筑面积（平方米）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idType" label="证件代码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idCard" label="证件号码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentName" label="房主姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="telephone" label="房主联系方式" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddress" label="房主现居详址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="rentUse" label="出租用途" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="troubleType" label="隐患类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="renterId" label="承租人ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="renterCardNumber" label="承租人公民身份证号码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="renterCardType" label="承租人证件类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="renterName" label="承租人姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="renterPhone" label="承租人联系方式" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pointStatus" label="标绘状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute1" label="承租单位" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute2" label="承租日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute3" label="承租期限" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute4" label="扩展字段4" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute5" label="扩展字段5" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute6" label="扩展字段6" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute7" label="扩展字段7" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
-        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('axis:caRental:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('axis:caRental:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column> -->
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <el-card>
+        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+          <el-form-item label="房屋编号" prop="houseName" >
+            <el-input v-model="dataForm.houseName" placeholder="房屋编号" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="房主姓名" prop="residentName" >
+            <el-input v-model="dataForm.residentName" placeholder="房主姓名" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="承租人姓名" prop="renterName" >
+            <el-input v-model="dataForm.renterName" placeholder="承租人姓名" clearable></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+          </el-form-item>
+          <!-- <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item> -->
+        </el-form>
+      </el-card>
+      <el-card shadow="never" class="aui-card--fill">
+        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+          <el-table-column prop="houseName" label="房屋编号" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="houseAddress" label="房屋地址" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="houseArea" label="建筑面积（平方米）" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="residentName" label="房主姓名" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="telephone" label="房主联系方式" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="rentUse" label="出租用途" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="renterName" label="承租人姓名" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="renterPhone" label="承租人联系方式" header-align="center" align="center"></el-table-column>
+          <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+            <template slot-scope="scope">
+              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :current-page="page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="pageSizeChangeHandle"
+          @current-change="pageCurrentChangeHandle">
+        </el-pagination>
+        <!-- 弹窗, 新增 / 修改 -->
+        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      </el-card>
     </div>
-  </el-card>
 </template>
 
 <script>
@@ -92,7 +68,9 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        rentalId: ''
+        houseName: '',
+        residentName: '',
+        renterName: ''
       }
     }
   },
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index 5491cb69..05cf46eb 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -1,95 +1,56 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caResident}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.residentId" placeholder="residentId" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item> -->
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="residentId" label="人口ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentProperty" label="人口性质" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentType" label="居民分类" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idType" label="证件类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idCard" label="证件号码（公民身份证号）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentName" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sex" label="性别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="birthday" label="出生日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nation" label="民族" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="telephone" label="联系方式" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdProv" label="户籍省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdCity" label="户籍市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdCounty" label="户籍县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdTown" label="户籍镇街" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdVillage" label="户籍社区/村" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressDetail" label="户籍详址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveProv" label="现住省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveCity" label="现住市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveCounty" label="现住县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveTown" label="现住镇街" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveVillage" label="现住社区/村" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressDetail" label="现住详址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressProv" label="籍贯省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressCity" label="籍贯市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressCounty" label="籍贯县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="formerName" label="曾用名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="education" label="学历" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="occupation" label="职业" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="occupationType" label="职业类别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="serviceAddress" label="服务处所" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="marriageStatus" label="婚姻状况" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="party" label="政治面貌" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="religious" label="宗教信仰" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="conversionState" label="有无皈依（已受洗）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nationality" label="国籍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute1" label="扩展字段1" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute2" label="扩展字段2" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute3" label="扩展字段3" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute4" label="扩展字段4" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute5" label="扩展字段5" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute6" label="扩展字段6" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute7" label="扩展字段7" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
-        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('axis:caResident:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('axis:caResident:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column> -->
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <el-card>
+        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+          <el-form-item label="身份证号" prop="idCard" >
+            <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="姓名" prop="residentName" >
+            <el-input v-model="dataForm.residentName" placeholder="姓名" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="联系方式" prop="telephone" >
+            <el-input v-model="dataForm.telephone" placeholder="联系方式" clearable></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+          </el-form-item>
+          <!-- <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item> -->
+        </el-form>
+      </el-card>
+      <el-card shadow="never" class="aui-card--fill">
+        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+          <el-table-column prop="idCard" label="证件号码（公民身份证号）" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="residentName" label="姓名" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="sex" label="性别" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="birthday" label="出生日期" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="telephone" label="联系方式" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="householdAddressDetail" label="户籍详址" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="curliveAddressDetail" label="现住详址" header-align="center" align="center"></el-table-column>
+          <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+            <template slot-scope="scope">
+              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :current-page="page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="pageSizeChangeHandle"
+          @current-change="pageCurrentChangeHandle">
+        </el-pagination>
+        <!-- 弹窗, 新增 / 修改 -->
+        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      </el-card>
     </div>
-  </el-card>
 </template>
 
 <script>
@@ -106,7 +67,9 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        residentId: ''
+        idCard: '',
+        residentName: '',
+        telephone: ''
       }
     }
   },
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index d7ccee2a..0d8eb828 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -1,98 +1,55 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caRotators}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.rotatorsId" placeholder="rotatorsId" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caRotators:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caRotators:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item> -->
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="rotatorsId" label="主键id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idCard" label="公民身份证号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idType" label="证件类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="rotatorsName" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="formerName" label="曾用名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sex" label="性别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="birthday" label="出生日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nation" label="民族" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressProv" label="籍贯省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressCity" label="籍贯市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressCountry" label="籍贯县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="marriageStatus" label="婚姻状况" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="party" label="政治面貌" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="education" label="学历" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="religious" label="宗教信仰" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="occupationType" label="职业类别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="occupation" label="职业" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="serviceAddress" label="服务处所" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="telephone" label="联系方式" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressProv" label="户籍地省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressCity" label="户籍地市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressCountry" label="户籍地县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressTown" label="户籍地镇街" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressVillage" label="户籍地社区/村" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressDetail" label="户籍门(楼)详址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressProv" label="现住地省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressCity" label="现住地市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressCountry" label="现住地县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressTown" label="现住地镇街" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressVillage" label="现住地社区/村" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressDetail" label="现住门(楼)详址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="inflowReason" label="流入原因" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="certificateType" label="办证类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="certificateNumber" label="证件号码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="signDate" label="登记日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="endDate" label="证件到期日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residenceType" label="住所类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="isFocusPerson" label="是否重点关注人员" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deleteFlag" label="删除标识（正常的数据存：normal，逻辑删除的标识为：delete）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="platcode" label="数据来源编码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute1" label="是否注销" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute2" label="注销原因" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute3" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute4" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute5" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute6" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute7" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute8" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute9" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute10" label="" header-align="center" align="center"></el-table-column>
-        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('axis:caRotators:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('axis:caRotators:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column> -->
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <el-card>
+        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+          <el-form-item label="身份证号" prop="idCard" >
+            <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="姓名" prop="residentName" >
+            <el-input v-model="dataForm.residentName" placeholder="姓名" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="联系方式" prop="telephone" >
+            <el-input v-model="dataForm.telephone" placeholder="联系方式" clearable></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+          </el-form-item>
+          <!-- <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item> -->
+        </el-form>
+      </el-card>
+      <el-card shadow="never" class="aui-card--fill">
+        <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+          <el-table-column prop="idCard" label="公民身份证号" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="rotatorsName" label="姓名" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="sex" label="性别" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="birthday" label="出生日期" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="householdAddressDetail" label="户籍门(楼)详址" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="curliveAddressDetail" label="现住门(楼)详址" header-align="center" align="center"></el-table-column>
+          <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+            <template slot-scope="scope">
+              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          :current-page="page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="pageSizeChangeHandle"
+          @current-change="pageCurrentChangeHandle">
+        </el-pagination>
+        <!-- 弹窗, 新增 / 修改 -->
+        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      </el-card>
     </div>
-  </el-card>
 </template>
 
 <script>
@@ -109,7 +66,9 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        rotatorsId: ''
+        idCard: '',
+        residentName: '',
+        telephone: ''
       }
     }
   },