diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdLeaveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdLeaveController.java index 4c426e0..8bb06a6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdLeaveController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdLeaveController.java @@ -156,6 +156,8 @@ public class TdLeaveController extends BaseController @GetMapping("/print/{userId}") public String paint(@PathVariable("userId") Long userId, ModelMap mmap) { + TdLeave leaveuser = tdLeaveService.selectTdLeaveById(userId); + mmap.put("leaveuser", leaveuser); mmap.put("user",userService.selectUserById(userId)); mmap.put("posts", postService.selectPostsByUserIds(userId)); SysUser sysUser= getSysUser(); 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 fd110c1..e157d65 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/add.html @@ -8,10 +8,11 @@
-
+ +
- +
@@ -58,7 +59,10 @@ function submitHandler() { if ($.validate.form()) { - $.operate.save(prefix + "/add", $('#form-leave-add').serialize()); + var data = $("#form-leave-add").serializeArray(); + var username = $("input[id='username']").val() + data.push({"name": "userName", "value": username}); + $.operate.save(prefix + "/add",data); } } /* 用户管理-新增-选择部门树 */ 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 b344a84..62f2635 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html @@ -8,10 +8,11 @@
+
- +
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 2d623b3..93e17c8 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/leave.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/leave.html @@ -12,7 +12,7 @@
  • - +
  • @@ -64,6 +64,7 @@ \ No newline at end of file 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 566549b..c7eaf3b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html @@ -1,10 +1,125 @@ - + - - Title + + + - + +
    + + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html b/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html index 566549b..3efbfeb 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html @@ -1,10 +1,732 @@ - - + + + + - - Title + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + +
    人员离职登记表
    [[${leaveuser.leavedate}]]
    姓名[[${leaveuser.username}]]单位[[${leaveuser.depart}]]入职日期[[${leaveuser.leavedate}]]
    离职原因[[${leaveuser.leavereason}]]
    领导意见[[${leaveuser.examinestate}]]
    工作交接[[${leaveuser.workstate}]]
    备注
    审批人[[${leaveuser.examinename}]]
    [[${leaveuser.leavedate}]]
    + + - \ No newline at end of file + +