diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html index e7d0387..4f628a2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html @@ -674,7 +674,6 @@ font-style:normal; font-family:"等线","monospace"; border-top:1px solid windowtext; - border-right:1px solid windowtext; border-bottom:1px solid windowtext; border-left:none; mso-diagonal-down:none; @@ -722,15 +721,15 @@ - [[${sysuser.dept.deptName}]]资产统计信息表 + [[${sysuser.dept.deptName}]]资产统计信息表 - 单位:[[${sysuser.dept.deptName}]] - - - - 日期: - + 单位:[[${sysuser.dept.deptName}]] + + + + 日期: + 所属市州 diff --git a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examineprint.html b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examineprint.html index 0fea349..a240039 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examineprint.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examineprint.html @@ -1014,7 +1014,7 @@ - + @@ -1115,12 +1115,16 @@ function printPage() { window.print(); } - var date = new Date(document.querySelector('#birthday').innerHTML); - var year = date.getFullYear(); - var month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始,需要加 1 - var day = String(date.getDate()).padStart(2, '0'); // 日可能是个位数,需要补零 - var formattedDate = year + '-' + month + '-' + day; - document.querySelector('#birthday').innerHTML = formattedDate + if (document.querySelector('#birthday').innerHTML !== ''){ + var date = new Date(document.querySelector('#birthday').innerHTML); + var year = date.getFullYear(); + var month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始,需要加 1 + var day = String(date.getDate()).padStart(2, '0'); // 日可能是个位数,需要补零 + var formattedDate = year + '-' + month + '-' + day; + document.querySelector('#birthday').innerHTML = formattedDate + }else{ + document.querySelector('#birthday').innerHTML = '' + } document.querySelector('.date').innerHTML = '日期:' + new Date().toLocaleDateString().replace(/\//g, '-') document.querySelector('#politics').innerHTML = document.querySelector('#politics').innerHTML === '1' ? '党员' : document.querySelector('#politics').innerHTML === '2' ? '团员' : '群众'; document.querySelector('#sex').innerHTML = document.querySelector('#sex').innerHTML === '0' ? '男' : '女'