From 28b111d2f58ebb8b46cc7bb45d2c8ccd53ff3bd7 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Sat, 22 Jun 2024 10:57:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BA=BA=E5=91=98=E7=A6=BB=E8=81=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/system/leave/add.html    | 11 +++++++++--
 .../main/resources/templates/system/leave/edit.html   |  2 +-
 .../main/resources/templates/system/leave/leave.html  |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

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 b3e9e05..f6dfb5d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/add.html
@@ -28,10 +28,10 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">单位：</label>
+                <label class="col-sm-3 control-label is-required">所属单位：</label>
                 <div class="col-sm-8">
                     <div class="input-group">
-                        <input name="depart" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择单位" class="form-control">
+                        <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>
 
@@ -106,6 +106,13 @@
             minView: "month",
             autoclose: true
         });
+        $(function() {
+           var deptId =  [[${addleave.deptId}]];
+            var deptName =  [[${addleave.dept.deptName}]];
+            $("#treeId").val(deptId);
+            $("#treeName").val(deptName);
+
+        });
     </script>
 </body>
 </html>
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 a91bbda..1e133ef 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html
@@ -28,7 +28,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">单位：</label>
+                <label class="col-sm-3 control-label is-required">所属单位：</label>
                 <div class="col-sm-8">
                     <div class="input-group">
                         <input name="depart" required onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择单位" class="form-control" th:field="*{depart}">
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 3397a85..a7eb002 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
@@ -106,7 +106,7 @@
                 },
                 {
                     field: 'depart',
-                    title: '单位'
+                    title: '所属单位'
                 },
                 {
                     field: 'leavedate',