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 f6dfb5d..cb1bf49 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/add.html @@ -22,9 +22,9 @@
- +
- +
@@ -38,7 +38,7 @@
- +
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 1e133ef..653a248 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html @@ -22,7 +22,7 @@
- +
@@ -37,7 +37,7 @@
- +
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 a7eb002..6a35be0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/leave.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/leave.html @@ -1,7 +1,7 @@ - +
@@ -15,11 +15,11 @@
  • - - + +
  • - +
    • @@ -36,7 +36,7 @@
    - +
    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 c2804e9..84005ec 100644 --- a/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html +++ b/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html @@ -4,7 +4,7 @@ xmlns="http://www.w3.org/TR/REC-html40"> - + @@ -609,7 +609,7 @@ collapse;table-layout:fixed;width:499pt;margin: 0 auto;'> - 人员离职登记表 + 人员离职离岗登记表 申请日期： @@ -623,7 +623,7 @@ [[${user.startdate}]] - 离职原因 + 离职离岗原因 [[${leaveuser.leavereason}]] @@ -669,7 +669,7 @@ return year + '-' + month + '-' + day } document.querySelector('#entryDate').innerHTML =conversionDate(new Date(document.querySelector('#entryDate').innerHTML)) - document.querySelector('.liquidate').innerHTML ='离职日期：' + conversionDate(new Date(document.querySelector('.liquidate').innerHTML)) + document.querySelector('.liquidate').innerHTML ='离职离岗日期：' + conversionDate(new Date(document.querySelector('.liquidate').innerHTML)) //领导意见 var examinestateDatas = [[${@dict.getType('sys_examine_state')}]]; var examinestateToFind = document.querySelector('#examinestate').innerHTML;