diff --git a/src/main/resources/templates/agent.html b/src/main/resources/templates/agent.html
index 1eafb393848d3e98753adee46e541113feacb2d4..74338391ea5b54f18cd3a4fcbcf591a9e5ed59ab 100644
--- a/src/main/resources/templates/agent.html
+++ b/src/main/resources/templates/agent.html
@@ -98,6 +98,7 @@
             var resizefunc = [];
         </script>
 
+
         <!-- jQuery  -->
         <script src="bootstrap/js/jquery.min.js"></script>
         <script src="bootstrap/js/bootstrap.min.js"></script>
@@ -141,7 +142,7 @@
                         {field: 'department.dname', title: '所属部门'},
                         {field: 'empno', title: '操作',
                             formatter: function(value, row, index){
-                                return '<a>详情</a>&nbsp;&nbsp;<i class="md md-mode-edit"><a>编辑</a>&nbsp;&nbsp;<a>删除</a>';
+                                return '<a>详情</a>&nbsp;&nbsp;<a><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#update_emp_model">编辑</button></a>&nbsp;&nbsp;<a>删除</a>';
                             }
                         }
                     ],
@@ -156,6 +157,6 @@
                 });
             });
         </script>
-
+        <div th:replace="~{fragment :: #update_emp_model}"></div>
     </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragment.html b/src/main/resources/templates/fragment.html
index 8c65061ef7153ce0e5654ec0a66b75b18b69103d..5a451e8a2cb2044923efd8ba6ba6013bdb0c1ede 100644
--- a/src/main/resources/templates/fragment.html
+++ b/src/main/resources/templates/fragment.html
@@ -212,12 +212,12 @@
   </div>
 </div>
 <!--编辑员工信息模态框-->
-<div id="update_emp_model" class="modal fade"  tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div id="update_emp_model" class="modal fade"  tabindex="-1" role="dialog" aria-labelledby="empModalLabel">
   <div class="modal-dialog" role="document">
     <div class="modal-content" >
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel">修改员工信息</h4>
+        <h4 class="modal-title" id="empModalLabel">修改员工信息</h4>
       </div>
       <div class="modal-body">
         <form id="updateEmpFrom" th:action="@{/templates/agent}" method="post">
@@ -225,11 +225,11 @@
           <label class="control-label" for="emp_id">id</label>
           <div class="controls">
             <input class="input-xlarge disabled" id="emp_id" type="text" name="empno"  disabled>
-            <input  type="hidden" id="post_id" name="id">
+            <input  type="hidden" id="emps_id" name="id">
           </div>
           <div class="form-group">
             <label for="emp_name">员工姓名</label>
-            <input type="text" name="name" class="form-control" id="emp_name" placeholder="员工姓名">
+            <input type="text" name="ename" class="form-control" id="emp_name" placeholder="员工姓名">
           </div>
           <div class="form-group">
             <label for="emp_job">职位名称</label>
@@ -256,5 +256,132 @@
     </div>
   </div>
 </div>
+
+<!--详细用户信息模态框-->
+<div id="query_user_model" class="modal fade"  tabindex="-1" role="dialog" aria-labelledby="userModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content" >
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="quserModalLabel">用户信息</h4>
+      </div>
+      <div class="modal-body">
+        <form id="queryUserFrom" th:action="@{/templates/user}" method="post">
+          <input type="hidden" name="_method" value="PUT">
+          <label class="control-label" for="user_id">id</label>
+          <div class="controls">
+            <input class="input-xlarge disabled" id="query_user_id" type="text" name="id"  disabled>
+            <input  type="hidden" id="query_users_id" name="id">
+          </div>
+          <div class="form-group">
+            <label for="user_name">用户姓名</label>
+            <input type="text" name="username" class="form-control" id="quser_name" placeholder="用户姓名">
+          </div>
+          <div class="form-group">
+            <label for="user_password">密码</label>
+            <input type="text" name="password" class="form-control" id="quser_password" placeholder="密码">
+          </div>
+          <div class="form-group">
+            <label>性别:</label>
+            <label class="radio-inline">
+              <input type="radio" name="gender"  value="男"> 男
+            </label>
+            <label class="radio-inline">
+              <input type="radio" name="gender"  value="女"> 女
+            </label>
+          </div>
+          <div class="form-group">
+            <label for="user_age">年龄</label>
+            <input type="text" name="age" class="form-control" id="quser_age" placeholder="年龄">
+          </div>
+          <div class="form-group">
+            <label for="user_email">邮箱</label>
+            <input type="text" name="email" class="form-control" id="quser_email" placeholder="邮箱">
+          </div>
+          <div class="form-group">
+            <label for="user_telephone">联系方式</label>
+            <input type="text" name="telephone" class="form-control" id="quser_telephone" placeholder="联系方式">
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+      </div>
+    </div>
+  </div>
+</div>
+<!--编辑用户信息模态框-->
+<div id="update_user_model" class="modal fade"  tabindex="-1" role="dialog" aria-labelledby="userModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content" >
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="userModalLabel">修改员工信息</h4>
+      </div>
+      <div class="modal-body">
+        <form id="updateUserFrom" th:action="@{/templates/user}" method="post">
+          <input type="hidden" name="_method" value="PUT">
+          <label class="control-label" for="user_id">id</label>
+          <div class="controls">
+            <input class="input-xlarge disabled" id="user_id" type="text" name="id"  disabled>
+            <input  type="hidden" id="users_id" name="id">
+          </div>
+          <div class="form-group">
+            <label for="user_name">用户姓名</label>
+            <input type="text" name="username" class="form-control" id="user_name" placeholder="用户姓名">
+          </div>
+          <div class="form-group">
+            <label for="user_password">密码</label>
+            <input type="text" name="password" class="form-control" id="user_password" placeholder="密码">
+          </div>
+          <div class="form-group">
+            <label>性别:</label>
+            <label class="radio-inline">
+              <input type="radio" name="gender"  value="男"> 男
+            </label>
+            <label class="radio-inline">
+              <input type="radio" name="gender"  value="女"> 女
+            </label>
+          </div>
+          <div class="form-group">
+            <label for="user_age">年龄</label>
+            <input type="text" name="age" class="form-control" id="user_age" placeholder="年龄">
+          </div>
+          <div class="form-group">
+            <label for="user_email">邮箱</label>
+            <input type="text" name="email" class="form-control" id="user_email" placeholder="邮箱">
+          </div>
+          <div class="form-group">
+            <label for="user_telephone">联系方式</label>
+            <input type="text" name="telephone" class="form-control" id="user_telephone" placeholder="联系方式">
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+        <button type="button" id="updateUser" onclick="javascript:$('#updateUserFrom').submit()" class="btn btn-primary">修改</button>
+      </div>
+    </div>
+  </div>
+</div>
+<!--删除用户模态框-->
+<div id="delete_user_model" class="modal fade"  tabindex="-1" role="dialog" aria-labelledby="userModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content" >
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="duserModalLabel">删除用户信息</h4>
+        <div class="modal-body">
+          确定要删除该用户？？？？？
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">关闭
+          </button>
+          <button type="button" class="btn btn-primary">
+            提交更改
+          </button>
+        </div>
+  </div>
+</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/user.html b/src/main/resources/templates/user.html
index 9eb9091db94d2858e2028fa0d42466152a02da92..51d5537abf886cc73cfb5a7968a5f1a8c0843899 100644
--- a/src/main/resources/templates/user.html
+++ b/src/main/resources/templates/user.html
@@ -131,7 +131,9 @@
                 {field: 'state', title: '权限'},
                 {field: 'id', title: '操作',
                     formatter: function(value, row, index){
-                        return '<a>详情</a>&nbsp;&nbsp;<i class="md md-mode-edit"><a>编辑</a>&nbsp;&nbsp;<a>删除</a>';
+                        return '<a><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#query_user_model"><span class="glyphicon glyphicon-search"></span>详情</button></a>&nbsp;&nbsp;' +
+                            '<a><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#update_user_model"><span class="glyphicon glyphicon-pencil"></span>编辑</button></a>&nbsp;&nbsp;' +
+                            '<a><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#delete_user_model"><span class="glyphicon glyphicon-remove"></span>删除</button></a>';
                     }
                 }
             ],
@@ -146,6 +148,8 @@
         });
     });
 </script>
-
+<div th:replace="~{fragment :: #query_user_model}"></div>
+<div th:replace="~{fragment :: #update_user_model}"></div>
+<div th:replace="~{fragment :: #delete_user_model}"></div>
 </body>
 </html>
\ No newline at end of file