diff --git a/src/main/webapp/pages/modular/system/user/user.html b/src/main/webapp/pages/modular/system/user/user.html
index ba455193..fdf85adb 100644
--- a/src/main/webapp/pages/modular/system/user/user.html
+++ b/src/main/webapp/pages/modular/system/user/user.html
@@ -1,50 +1,99 @@
-@layout("/layout/_tree_container.html",{plugins:["jquery-layout"],js:["/assets/modular/system/user/user.js"]}){
+﻿@layout("/layout/_container.html",{js:["/assets/modular/system/user/user.js"]}){
+<style>
+    /* 左树 */
+    #organizationTreeBar {
+        padding: 10px 15px;
+        border: 1px solid #e6e6e6;
+        background-color: #f2f2f2;
+    }
 
-<div class="layui-body-header">
-    <span class="layui-body-header-title">用户管理</span>
-</div>
+    #organizationTree {
+        border: 1px solid #e6e6e6;
+        border-top: none;
+        padding: 10px 5px;
+        overflow: auto;
+        height: -webkit-calc(100vh - 125px);
+        height: -moz-calc(100vh - 125px);
+        height: calc(100vh - 125px);
+    }
 
-<div id="myContiner" style="height: 100%">
-    <div class="ui-layout-west">
-        <div class="box box-main">
-            <div class="ui-layout-content">
-                <div id="deptTree"></div>
+    .layui-tree-entry .layui-tree-txt {
+        padding: 0 5px;
+        border: 1px transparent solid;
+        text-decoration: none !important;
+    }
+
+    .layui-tree-entry.ew-tree-click .layui-tree-txt {
+        background-color: #fff3e0;
+        border: 1px #FFE6B0 solid;
+    }
+
+    /* 右表搜索表单 */
+    #organizationUserTbSearchForm .layui-form-label {
+        box-sizing: border-box !important;
+        width: 90px !important;
+    }
+
+    #organizationUserTbSearchForm .layui-input-block {
+        margin-left: 90px !important;
+    }
+</style>
+</head>
+<body>
+<!-- 正文开始 -->
+<div class="layui-fluid" style="padding-bottom: 0;">
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md2">
+            <div class="layui-card">
+                <div class="layui-card-body" style="padding: 10px;">
+                    <!-- 树工具栏 -->
+                    <div class="layui-form toolbar" id="organizationTreeBar">
+                        <!--
+                        <button id="organizationAddBtn" class="layui-btn layui-btn-sm icon-btn">
+                            <i class="layui-icon">&#xe654;</i>添加
+                        </button>&nbsp;
+                        -->
+                    </div>
+                    <!-- 左树 -->
+                    <div id="organizationTree"></div>
+                </div>
             </div>
         </div>
-    </div>
-    <div class="ui-layout-center">
-        <div class="layui-fluid">
-            <div class="layui-row">
-                <div class="layui-col-md12">
-                    <div class="layui-card">
-                        <div class="layui-card-body">
-                            <div class="layui-form toolbar">
-
-                                <input id="defaultPassword" class="layui-input" type="hidden" value="${constants.getDefaultPassWord()}"/>
-                                <div class="layui-form-item">
-                                    <div class="layui-inline">
-                                        <input id="account" class="layui-input" type="text" placeholder="账号"/>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <input id="realName" class="layui-input" type="text" placeholder="姓名"/>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <button id="btnSearch" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                        <button id="btnAdd" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
-                                        <button id="btnExp" class="layui-btn icon-btn"><i class="layui-icon">&#xe67d;</i>导出</button>
-                                    </div>
+        <div class="layui-col-md10">
+            <div class="layui-card">
+                <div class="layui-card-body" style="padding: 10px;">
+                    <!-- 表格工具栏2 -->
+                    <form class="layui-form toolbar">
+                        <div class="layui-form-item">
+                            <div class="layui-inline">
+                                <label class="layui-form-label">账号:</label>
+                                <div class="layui-input-inline">
+                                    <input name="account" class="layui-input" type="text" placeholder="账号"/>
                                 </div>
                             </div>
-                            <table class="layui-table" id="userTable" lay-filter="userTable"></table>
+                            <div class="layui-inline">
+                                <label class="layui-form-label">姓名:</label>
+                                <div class="layui-input-inline">
+                                    <input name="realName" class="layui-input" type="text" placeholder="姓名"/>
+                                </div>
+                            </div>
+                            <div class="layui-inline">&emsp;
+                                <button class="layui-btn icon-btn" lay-filter="userTbSearch" lay-submit><i class="layui-icon">&#xe615;</i>搜索</button>
+                                <button id="userAddBtn" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
+                                <button id="btnExp" class="layui-btn icon-btn"><i class="layui-icon">&#xe67d;</i>导出</button>
+                            </div>
                         </div>
-                    </div>
+                    </form>
+                    <!-- 数据表格 -->
+                    <table id="userTable" lay-filter="userTable"></table>
                 </div>
             </div>
         </div>
     </div>
 </div>
-
-<script type="text/html" id="tableBar">
+<input id="defaultPassword" class="layui-input" type="hidden" value="${constants.getDefaultPassWord()}"/>
+<!-- 表格操作列 -->
+<script type="text/html" id="userTbBar">
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
     <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="roleAssign">分配角色</a>
@@ -54,4 +103,5 @@
 <script type="text/html" id="statusTpl">
     <input type="checkbox" lay-filter="status" value="{{d.userId}}" lay-skin="switch" lay-text="正常|锁定" {{d.statusFlag=='1'?'checked':''}}/>
 </script>
-@}
+
+@}
\ No newline at end of file
diff --git a/src/main/webapp/pages/modular/system/user/user_add.html b/src/main/webapp/pages/modular/system/user/user_add.html
index 66949a73..12b8a8bc 100644
--- a/src/main/webapp/pages/modular/system/user/user_add.html
+++ b/src/main/webapp/pages/modular/system/user/user_add.html
@@ -1,4 +1,4 @@
-@layout("/layout/_container.html",{js:["/assets/modular/system/user/user_add.js"],css:["/assets/expand/module/formSelects/formSelects-v4.css"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/user/user_add.js"]}){
 
 <form class="layui-form" id="userForm" lay-filter="userForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
diff --git a/src/main/webapp/pages/modular/system/user/user_edit.html b/src/main/webapp/pages/modular/system/user/user_edit.html
index 021d6070..2a6bd5e7 100644
--- a/src/main/webapp/pages/modular/system/user/user_edit.html
+++ b/src/main/webapp/pages/modular/system/user/user_edit.html
@@ -1,4 +1,4 @@
-@layout("/layout/_form.html",{js:["/assets/modular/system/user/user_edit.js"],css:["/assets/expand/module/formSelects/formSelects-v4.css"]}){
+@layout("/layout/_form.html",{js:["/assets/modular/system/user/user_edit.js"]}){
 
 <form class="layui-form" id="userForm" lay-filter="userForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
