diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/add.html b/ruoyi-admin/src/main/resources/templates/system/leave/add.html
index a5e5a35..fd110c1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/add.html
@@ -2,80 +2,53 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
     <th:block th:include="include :: header('新增人员离职')" />
+    <th:block th:include="include :: select2-css" />
     <th:block th:include="include :: datetimepicker-css" />
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-leave-add">
+        <form class="form-horizontal m" id="form-leave-add" th:object="${addleave}">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">提交人：</label>
+                <label class="col-sm-3 control-label is-required">提交人：</label>
                 <div class="col-sm-8">
-                    <input name="username" class="form-control" type="text">
+                    <input disabled name="username" class="form-control" th:field="*{userName}" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">城市：</label>
+                <label class="col-sm-3 control-label is-required">地区：</label>
                 <div class="col-sm-8">
-                    <input name="country" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">地区：</label>
-                <div class="col-sm-8">
-                    <input name="areaname" class="form-control" type="text">
+                    <input name="areaname" placeholder="请输入地区"  class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">离职原因：</label>
-                <div class="col-sm-8">
-                    <textarea name="leavereason" class="form-control"></textarea>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">单位：</label>
+                <label class="col-sm-3 control-label is-required">离职原因：</label>
                 <div class="col-sm-8">
-                    <input name="depart" class="form-control" type="text">
+                    <textarea name="leavereason" placeholder="请输入离职原因" class="form-control"></textarea>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">离职时间：</label>
+                <label class="col-sm-3 control-label is-required">单位：</label>
                 <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="leavedate" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <div class="input-group">
+                        <input name="depart" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择单位" class="form-control">
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
                     </div>
+
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">离职状态：</label>
-                <div class="col-sm-8">
-                    <input name="leavestate" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">审核人：</label>
-                <div class="col-sm-8">
-                    <input name="examinename" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">审核日期：</label>
+                <label class="col-sm-3 control-label is-required">离职时间：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
-                        <input name="examinedate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <input name="leavedate" class="form-control" placeholder="yyyy-MM-dd" type="text">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">审核意见：</label>
-                <div class="col-sm-8">
-                    <input name="examinestate" class="form-control" type="text">
-                </div>
-            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
+    <th:block th:include="include :: select2-js" />
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
         var prefix = ctx + "system/leave"
@@ -88,7 +61,25 @@
                 $.operate.save(prefix + "/add", $('#form-leave-add').serialize());
             }
         }
-
+        /* 用户管理-新增-选择部门树 */
+        function selectDeptTree() {
+            var treeId = $("#treeId").val();
+            var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+            var url = ctx + "system/user/selectDeptTree/" + deptId;
+            var options = {
+                title: '选择部门',
+                width: "380",
+                url: url,
+                callBack: doSubmit
+            };
+            $.modal.openOptions(options);
+        }
+        function doSubmit(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId").val(body.find('#treeId').val());
+            $("#treeName").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
         $("input[name='leavedate']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",
diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html
index 0cbcd02..b344a84 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html
@@ -11,13 +11,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">提交人：</label>
                 <div class="col-sm-8">
-                    <input name="username" th:field="*{username}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">城市：</label>
-                <div class="col-sm-8">
-                    <input name="country" th:field="*{country}" class="form-control" type="text">
+                    <input disabled name="username" th:field="*{username}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
@@ -35,7 +29,10 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">单位：</label>
                 <div class="col-sm-8">
-                    <input name="depart" th:field="*{depart}" class="form-control" type="text">
+                    <div class="input-group">
+                        <input name="depart" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择单位" class="form-control" th:field="*{depart}">
+                        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">    
@@ -47,33 +44,6 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">离职状态：</label>
-                <div class="col-sm-8">
-                    <input name="leavestate" th:field="*{leavestate}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">审核人：</label>
-                <div class="col-sm-8">
-                    <input name="examinename" th:field="*{examinename}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">审核日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="examinedate" th:value="${#dates.format(tdLeave.examinedate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">审核意见：</label>
-                <div class="col-sm-8">
-                    <input name="examinestate" th:field="*{examinestate}" class="form-control" type="text">
-                </div>
-            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -83,7 +53,25 @@
         $("#form-leave-edit").validate({
             focusCleanup: true
         });
-
+        /* 用户管理-新增-选择部门树 */
+        function selectDeptTree() {
+            var treeId = $("#treeId").val();
+            var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+            var url = ctx + "system/user/selectDeptTree/" + deptId;
+            var options = {
+                title: '选择部门',
+                width: "380",
+                url: url,
+                callBack: doSubmit
+            };
+            $.modal.openOptions(options);
+        }
+        function doSubmit(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId").val(body.find('#treeId').val());
+            $("#treeName").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/edit", $('#form-leave-edit').serialize());
diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/leave.html b/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
index 60b8dcc..2d623b3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
@@ -14,37 +14,23 @@
                                 <label>提交人：</label>
                                 <input type="text" name="username"/>
                             </li>
-                            <li>
-                                <label>城市：</label>
-                                <input type="text" name="country"/>
-                            </li>
-                            <li>
-                                <label>地区：</label>
-                                <input type="text" name="areaname"/>
-                            </li>
-                            <li>
-                                <label>单位：</label>
-                                <input type="text" name="depart"/>
-                            </li>
                             <li>
                                 <label>离职时间：</label>
                                 <input type="text" class="time-input" placeholder="请选择离职时间" name="leavedate"/>
                             </li>
                             <li>
                                 <label>离职状态：</label>
-                                <input type="text" name="leavestate"/>
-                            </li>
-                            <li>
-                                <label>审核人：</label>
-                                <input type="text" name="examinename"/>
-                            </li>
-                            <li>
-                                <label>审核日期：</label>
-                                <input type="text" class="time-input" placeholder="请选择审核日期" name="examinedate"/>
+                                <select name="leavestate" th:with="type=${@dict.getType('sys_user_leave')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
                             </li>
                             <li>
                                 <label>审核意见：</label>
-                                <input type="text" name="examinestate"/>
+                                <select name="examinestate" th:with="type=${@dict.getType('sys_examine_state')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -79,6 +65,8 @@
         var editFlag = [[${@permission.hasPermi('system:leave:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:leave:remove')}]];
         var examinestateDatas = [[${@dict.getType('sys_examine_state')}]];
+        var leavestateData = [[${@dict.getType('sys_user_leave')}]];
+        var workstateData = [[${@dict.getType('sys_examine_state')}]];
         var prefix = ctx + "system/leave";
 
         $(function() {
@@ -101,10 +89,6 @@
                     field: 'username',
                     title: '提交人'
                 },
-                {
-                    field: 'country',
-                    title: '城市'
-                },
                 {
                     field: 'areaname',
                     title: '地区'
@@ -123,11 +107,17 @@
                 },
                 {
                     field: 'workstate',
-                    title: '工作交接'
+                    title: '工作交接',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(workstateData, value);
+                    }
                 },
                 {
                     field: 'leavestate',
-                    title: '离职状态'
+                    title: '离职状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(leavestateData, value);
+                    }
                 },
                 {
                     field: 'examinename',
