From cd6dee535673d72bb2eac1cef7116044dbbf648d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Thu, 26 Mar 2026 11:16:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=AD=BE=E5=90=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomPages/SK/SK014ShowPrint.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/CustomPages/SK/SK014ShowPrint.js b/src/components/CustomPages/SK/SK014ShowPrint.js
index e5a4239..fa3a205 100644
--- a/src/components/CustomPages/SK/SK014ShowPrint.js
+++ b/src/components/CustomPages/SK/SK014ShowPrint.js
@@ -232,8 +232,13 @@ class SK014ShowPrint extends React.Component {
                                 <Descriptions.Item label="整改责任人签名">{
                                     data.Nav_ReportDetails?.map((item, i) => {
                                         if (item && item.ISCHECK) {
-                                            showUserSign(item.Nav_RecitifyUser, config.picServerHost)
+                                          return <img style={{ margin: "0 0 0 8px", width: '150px' }} alt={item.Nav_RecitifyUser?.NAME} src={config.picServerHost + item.Nav_RecitifyUser?.FILE_PATH} />
+                                                    
+                                        }else
+                                        {
+                                            return <img style={{ margin: "0 0 0 8px", width: '150px' }} title={item.Nav_RecitifyUser?.NAME} />
                                         }
+                                        
                                     })
                                 }</Descriptions.Item>
                             </Descriptions>

From e214f08fea5fcfa88be401873f523623746ba407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Thu, 26 Mar 2026 17:39:00 +0800
Subject: [PATCH 2/3] 1

---
 src/components/CustomPages/PF/PFCommonApproveView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CustomPages/PF/PFCommonApproveView.js b/src/components/CustomPages/PF/PFCommonApproveView.js
index 3a77829..39ea5af 100644
--- a/src/components/CustomPages/PF/PFCommonApproveView.js
+++ b/src/components/CustomPages/PF/PFCommonApproveView.js
@@ -471,7 +471,7 @@ class PFCommonApproveView extends React.Component {
                         <tr>
                             <td colSpan={2} rowSpan={1} className={styles.fontBold}>审批详情</td>
                                 <td colSpan={8} rowSpan={1}>{
-                                    this.state.data[0].Nav_ApproveDetails && this.state.data[0].Nav_ApproveDetails.map((item, i) => {
+                                    this.state.data[0].Nav_ApproveDetails && this.state.data[0].Nav_ApproveDetails.sort(this.compare).map((item, i) => {
                                         if(item.NODE_APPROVE_STATUS == 20)
                                         {
                                             return <table style={{border:"0",width:'100%', textAlign: 'left'}}><tr><td style={{border:"0",color:"red"}}><b>{(item.NAME? item.NAME: "")}</b><br/>

From 3a49e8542519052db7a627779432b552637811e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Fri, 27 Mar 2026 10:03:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MainPage/ModifyPassword.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/MainPage/ModifyPassword.js b/src/components/MainPage/ModifyPassword.js
index 22d3c95..970c75f 100644
--- a/src/components/MainPage/ModifyPassword.js
+++ b/src/components/MainPage/ModifyPassword.js
@@ -57,9 +57,10 @@ class ModifyPassword extends Component {
     const { getFieldDecorator } = form
     const { visible } = this.state
     const isComplex = (rule, value, callBack) => {
-      let passwordReg =/^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,15}$/;
+      // let passwordReg =/^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,15}$/;
+      let passwordReg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d]{8,15}$/;
       if (!passwordReg.test(value)) {
-        callBack('请设置6-15位的密码,至少包含字母、数字')
+        callBack('请设置8-15位的密码,至少包含大写字母、小写字母、数字')
       } else {
         callBack()
       }