From 0fa041759887c0a3b42564bf0836553716ae706d Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Sat, 22 Jun 2024 10:36:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/leave/add.html | 11 ++++++++++
 .../templates/system/leave/edit.html          |  9 ++++++++
 .../templates/system/leave/leave.html         |  4 ++--
 .../templates/system/leave/leaveexamine.html  | 21 ++++++++++---------
 4 files changed, 33 insertions(+), 12 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 c38083c..b3e9e05 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/add.html
@@ -46,6 +46,17 @@
                     </div>
                 </div>
             </div>
+
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">工作交接：</label>
+                <div class="col-sm-8">
+                    <select name="workstate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_work')}">
+                        <option value="">---请选择---</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+
         </form>
     </div>
     <th:block th:include="include :: footer" />
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 f1e1e8f..a91bbda 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html
@@ -45,6 +45,15 @@
                     </div>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">工作交接：</label>
+                <div class="col-sm-8">
+                    <select name="workstate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_work')}">
+                        <option value="">---请选择---</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{workstate}"></option>
+                    </select>
+                </div>
+            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
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 5753039..3397a85 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
@@ -11,7 +11,7 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>提交人：</label>
+                                <label>人员姓名：</label>
                                 <input type="text" name="usernName"/>
                             </li>
                             <li>
@@ -94,7 +94,7 @@
                 },
                 {
                     field: 'userName',
-                    title: '提交人'
+                    title: '人员姓名'
                 },
                 {
                     field: 'areaname',
diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html b/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html
index 06054f8..45a2424 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html
@@ -22,33 +22,34 @@
             </div>
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">离职状态：</label>
+                    <label class="col-sm-4 control-label is-required">工作交接：</label>
                     <div class="col-sm-8">
-                        <select name="leavestate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_leave')}">
+                        <select name="workstate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_work')}">
                             <option value="">---请选择---</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{workstate}"></option>
                         </select>
                     </div>
                 </div>
             </div>
+
         </div>
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">脱密期：</label>
+                    <label class="col-sm-4 control-label is-required">离职状态：</label>
                     <div class="col-sm-8">
-                        <input name="country" required th:field="*{country}" class="form-control" type="text">
+                        <select name="leavestate" required class="form-control m-b"  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>
                     </div>
                 </div>
             </div>
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">工作交接：</label>
+                    <label class="col-sm-4 control-label is-required">脱密期：</label>
                     <div class="col-sm-8">
-                        <select name="workstate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_work')}">
-                            <option value="">---请选择---</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                        </select>
+                        <input name="country" required th:field="*{country}" class="form-control" type="text">
                     </div>
                 </div>
             </div>