feat:通知

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" />

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" />

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',

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')}">
+                        <input name="country" required th:field="*{country}" class="form-control" type="text">
-                            <option value="">---请选择---</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                        </select>
                     </div>
                 </div>
             </div>