diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 44beb6b..20c1408 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -3,96 +3,77 @@
     <el-row>
       <!--左半部分-->
       <el-col :span="5">
-        <div style="width:90%;">
+        <div class="deptScroll" style="width:90%;">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>组织机构</span>
             </div>
-            <el-tree
-              v-loading = "treeLoading"
-              ref="tree2"
-              :data="deptTree"
-              :props="defaultProps"
-              :default-expand-all="expandAllNode"
-              :expand-on-click-node="expandNodeClick"
-              class="filter-tree"
-              @node-click = "handleNodeClick"
-            />
+            <el-scrollbar ref="deptScroll">
+              <el-tree
+                v-loading = "treeLoading"
+                ref="tree2"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                class="filter-tree"
+                @node-click = "handleNodeClick"
+              />
+            </el-scrollbar>
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
       <el-col :span="19">
         <!--筛选条件-->
-        <div class="search-div">
-          <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-            <el-row>
-              <el-form-item class="selectForm-container-item" prop="keywords">
-                <el-input v-model.trim="listQuery.keywords" placeholder="账号/姓名/手机号" clearable/>
-              </el-form-item>
-              <el-form-item class="selectForm-container-item" width="370">
-                <el-date-picker
-                  v-model="registerTime"
-                  type="daterange"
-                  format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd"
-                  range-separator="至"
-                  start-placeholder="注册开始日期"
-                  end-placeholder="注册结束日期"/>
-              </el-form-item>
-              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-            </el-row>
-            <el-row>
-              <el-button v-if="hasPerm('/mgr/add')" class="filter-item" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
-              <el-button v-if="hasPerm('/mgr/update')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
-              <el-button v-if="hasPerm('/mgr/delete')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
-              <el-button v-if="hasPerm('/mgr/reset')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
-              <el-button v-if="hasPerm('/mgr/roleAssign')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
-              <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">冻结</el-button>-->
-              <!--<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">解冻</el-button>-->
-            </el-row>
-          </el-form>
-        </div>
+        <search-area ref="searchArea" size="small" @search="search">
+          <search-item>
+            <el-input v-model.trim="listQuery.keywords" size="small" placeholder="账号/姓名/手机号" clearable/>
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="registerTime"
+              type="daterange"
+              format="yyyy-MM-dd"
+              size="small"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="注册开始日期"
+              end-placeholder="注册结束日期"/>
+          </search-item>
+          <template slot="btns">
+            <div style="margin-bottom: 10px;">
+              <el-button v-if="hasPerm('/mgr/add')" size="small" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
+              <el-button v-if="hasPerm('/mgr/update')" size="small" type="primary" icon="el-icon-edit" @click="edit">修改</el-button>
+              <el-button v-if="hasPerm('/mgr/delete')" size="small" type="primary" icon="el-icon-delete" @click="del">删除</el-button>
+              <el-button v-if="hasPerm('/mgr/reset')" size="small" type="primary" icon="el-icon-key" @click="resetPwd">重置密码</el-button>
+              <el-button v-if="hasPerm('/mgr/roleAssign')" size="small" type="primary" icon="el-icon-magic-stick" @click="roleAssign">角色分配</el-button>
+            </div>
+          </template>
+        </search-area>
         <!--查询结果Table显示-->
-        <el-table v-loading="listLoading" :data="list" class="table" border stripe>
-          <!--<el-table-column-->
-          <!--type="index"-->
-          <!--width="55"/>-->
-          <el-table-column label="选择" width="70" header-align="center" align="center">
-            <template slot-scope="scope">
-              <el-radio v-model="radio" :label="scope.$index" class="radio">&nbsp;</el-radio>
-            </template>
-          </el-table-column>
-          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row[column.value] }}
-            </template>
-          </el-table-column>
-          <!--冻结状态-->
-          <el-table-column label="状态" width="80" align="center" >
-            <template slot-scope="scope">
-              <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" align="center" width="60">
-            <template slot-scope="scope">
-              <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.page"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"/>
-        </div>
+        <normal-table ref="normalTable" class="table" :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading" size="small" @change="changePage">
+          <template slot="preColumns">
+            <el-table-column label="选择" width="70" header-align="center" align="center">
+              <template slot-scope="scope">
+                <el-radio v-model="radio" :label="scope.$index" class="radio">&nbsp;</el-radio>
+              </template>
+            </el-table-column>
+          </template>
+          <template slot="columns">
+            <!--冻结状态-->
+            <el-table-column label="状态" width="80" align="center" >
+              <template slot-scope="scope">
+                <el-tag :type="tagNames[scope.row.statusName]" size="medium">{{ scope.row.statusName }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="hasPerm('/mgr/freeze')" label="操作" align="center" width="70">
+              <template slot-scope="scope">
+                <el-button v-if="hasPerm('/mgr/freeze')" :type="btnStatus[scope.row.statusName]" size="mini" @click="freeze(scope.row)">{{ btnNames[scope.row.statusName] }}</el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </el-col>
     </el-row>
     <!--编辑用户的对话框-->
@@ -124,7 +105,7 @@
         beginTime: '',
         endTime: '',
         deptid: '',
-        page: 1,
+        offset: 1,
         limit: 20,
         sort: 'id'
       },
@@ -153,8 +134,7 @@
         },
         {
           text: '真实姓名',
-          value: 'name',
-          width: 50
+          value: 'name'
         },
         {
           text: '角色',
@@ -351,14 +331,14 @@
       this.listQuery.deptid = data.id
       this.fetchData()
     },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
     },
     // 在嵌套列表list中删除指定元素
@@ -404,4 +384,18 @@
   .el-range-separator{
     width: 7% !important;
   }
+  .el-scrollbar{
+    min-height: calc(100vh - 260px);
+    max-height: calc(100vh - 170px);
+  }
+  .table{
+    min-height: calc(100vh - 265px);
+  }
+</style>
+<style>
+  .deptScroll .el-scrollbar__wrap{
+    overflow-x: hidden;
+    background-color: #fff;
+    padding: 0px;
+  }
 </style>