Merge remote-tracking branch 'origin/master'

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 @@
     <col width=131 style='mso-width-source:userset;width:157.25pt'>
     <col width=219 style='mso-width-source:userset;width:164.25pt'>
     <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r0'>
-        <td colspan=7 height=53 class=x24 width=1024 style='border-right:1px solid windowtext;border-bottom:none;height:40pt;'>[[${sysuser.dept.deptName}]]资产统计信息表</td>
+        <td colspan=7 height=53 class=x24 width=1024 style='border:none;height:40pt;'>[[${sysuser.dept.deptName}]]资产统计信息表</td>
     </tr>
     <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r1'>
-        <td colspan=2 height=53 class=x27 style='border-bottom:1px solid windowtext;height:40pt;'>单位：[[${sysuser.dept.deptName}]]</td>
-        <td class=x29></td>
-        <td class=x30></td>
-        <td class=x30></td>
-        <td class=x31><span style='float:right' id="dqdate">日期：</span></td>
-        <td class=x32></td>
+        <td colspan=2 height=53 class=x27 style='border-bottom:1px solid windowtext;border-top:none;border-left:none;height:40pt;'>单位：[[${sysuser.dept.deptName}]]</td>
+        <td class=x29 style="border-top: none;"></td>
+        <td class=x30 style="border-top: none;"></td>
+        <td class=x30 style="border-top: none;"></td>
+        <td class=x31 style="border-top: none;"><span style='float:right' id="dqdate">日期：</span></td>
+        <td class=x32 style="border-top: none;"></td>
     </tr>
     <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r2'>
         <td height=53 class=x21 style='height:40pt;'>所属市州</td>

ruoyi-admin/src/main/resources/templates/system/user/userexamine/examineprint.html

@@ -1014,7 +1014,7 @@
 <table border=0 cellpadding=0 cellspacing=0 width=706 style='border-collapse:
  collapse;table-layout:fixed;width:529pt;margin: 0 auto;'>
     <col width=94 style='mso-width-source:userset;width:70.5pt'>
-    <col width=95 style='mso-width-source:userset;width:71.25pt'>
+    <col width=95 style='mso-width-source:userset;width:81.25pt'>
     <col width=106 style='mso-width-source:userset;width:79.5pt'>
     <col width=77 style='mso-width-source:userset;width:57.75pt'>
     <col width=99 style='mso-width-source:userset;width:74.25pt'>
@@ -1115,12 +1115,16 @@
     function printPage() {
         window.print();
     }
+    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' ? '男' : '女'