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 e090b5d..a70cebf 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 @@ -157,7 +157,7 @@ public class TdLeaveController extends BaseController public String examine(@PathVariable("id") Long id,ModelMap mmap){ TdLeave leaveuser = tdLeaveService.selectTdLeaveById(id); mmap.put("leaveuser", leaveuser); - mmap.put("sysuser",getSysUser().getLoginName()); + mmap.put("sysuser",getSysUser()); return prefix + "/leaveexamine"; } 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 93e17c8..8c96c33 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/leave.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/leave.html @@ -67,7 +67,7 @@ var downloadFlag = [[${@permission.hasPermi('system:leave:examine')}]]; var examinestateDatas = [[${@dict.getType('sys_examine_state')}]]; var leavestateData = [[${@dict.getType('sys_user_leave')}]]; - var workstateData = [[${@dict.getType('sys_examine_state')}]]; + var workstateData = [[${@dict.getType('sys_user_work')}]]; var prefix = ctx + "system/leave"; $(function() { @@ -92,7 +92,7 @@ visible: false }, { - field: 'usernName', + field: 'userName', title: '提交人' }, { @@ -146,8 +146,8 @@ formatter: function(value, row, index) { var actions = []; actions.push('编辑 '); - actions.push('审核 '); - actions.push('打印 '); + actions.push('审核 '); + actions.push('打印 '); actions.push('删除'); return actions.join(''); } @@ -159,7 +159,7 @@ var url ='/system/leave/examine/' + id; $.modal.open("涉密人员离职审核", url); } - function auditingPrint(id){ + function auditingPrint(id,userId){ var url ='/system/leave/print/' + id; $.modal.openTab("打印", url); } 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 c7eaf3b..a52cd11 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html @@ -7,14 +7,16 @@
+
+
- +
@@ -35,7 +37,7 @@
- +
@@ -56,9 +58,9 @@
- - +
@@ -105,7 +107,12 @@ } function submitHandler() { if ($.validate.form()) { - $.operate.save(prefix + "/edit", $('#form-leave-edit').serialize()); + var data = $("#form-leave-edit").serializeArray(); + var examinedate = new Date().toLocaleDateString().replace(/\//g, '-'); + var examinename = document.querySelector('#examineusername').innerHTML; + data.push({"name": "examinedate", "value": examinedate}); + data.push({"name": "examinename", "value": examinename}); + $.operate.save(prefix + "/examine", data); } } 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 3efbfeb..7aefbe7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html @@ -612,15 +612,15 @@ 人员离职登记表 - [[${leaveuser.leavedate}]] + 申请日期： 姓名 - [[${leaveuser.username}]] + [[${leaveuser.userName}]] 单位 [[${leaveuser.depart}]] 入职日期 - [[${leaveuser.leavedate}]] + [[${user.startdate}]] 离职原因 @@ -668,17 +668,16 @@ var day = String(date.getDate()).padStart(2, '0'); // 日可能是个位数，需要补零 return year + '-' + month + '-' + day } - document.querySelector('#leavedate').innerHTML ='申请日期：' + conversionDate(new Date(document.querySelector('#leavedate').innerHTML)) document.querySelector('#entryDate').innerHTML =conversionDate(new Date(document.querySelector('#entryDate').innerHTML)) document.querySelector('.liquidate').innerHTML ='离职日期：' + conversionDate(new Date(document.querySelector('.liquidate').innerHTML)) //领导意见 - var examinestateDatas = [[${@dict.getType(' sys_user_opinions')}]]; + var examinestateDatas = [[${@dict.getType('sys_examine_state')}]]; var examinestateToFind = document.querySelector('#examinestate').innerHTML; const foundObject = examinestateDatas.find(obj => obj.dictValue === examinestateToFind); const result = foundObject ? foundObject.dictLabel : ""; document.querySelector('#examinestate').innerHTML = result //工作交接 - var workstateData = [[${@dict.getType('sys_examine_state')}]]; + var workstateData = [[${@dict.getType('sys_user_work')}]]; var workstateToFind = document.querySelector('#workstate').innerHTML; var workstateObject = workstateData.find(obj => obj.dictValue === workstateToFind); var workstateresult = workstateObject ? workstateObject.dictLabel : "";