From d286226ce06d8ba0dfe4b6e9f5ed7e5030560348 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Mon, 20 May 2024 09:27:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B6=89=E5=AF=86=E8=B5=84=E4=BA=A7?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/property/propertynum/print.html | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
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}]] |
+ |
+ |
+ |
+ 日期： |
+ |
| 所属市州 |
From b2153ef83eca96f61beddb7fabd9a40c37a25cd4 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Mon, 20 May 2024 11:04:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B6=89=E5=AF=86=E4=BA=BA=E5=91=98?=
=?UTF-8?q?=E7=A6=BB=E8=81=8C=E8=A1=A8=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/user/userexamine/examineprint.html | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
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' ? '男' : '女'