From 58815d13836c88992ceaf89e6829707cca664e1c 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: Sat, 22 Nov 2025 22:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomPages/FO/FO043ShowPrint.js          |  6 ++--
 .../CustomPages/FO/FO045ShowPrint.js          | 28 +++++++++----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/components/CustomPages/FO/FO043ShowPrint.js b/src/components/CustomPages/FO/FO043ShowPrint.js
index 9d5dd39..8d30fe2 100644
--- a/src/components/CustomPages/FO/FO043ShowPrint.js
+++ b/src/components/CustomPages/FO/FO043ShowPrint.js
@@ -214,7 +214,7 @@ class FO043ShowPrint extends React.Component {
                                     <td className={styles.fontBold}>姓名</td>
                                     <td className={styles.fontBold}>证书编号</td>
                                     <td className={styles.fontBold}>附件</td>
-                                    <td className={styles.fontBold}>签名</td>
+                                    {/* <td className={styles.fontBold}>签名</td> */}
                                 </tr>
                                 {
                                     data.Nav_Users && data.Nav_Users.map((item, i) => {
@@ -234,11 +234,11 @@ class FO043ShowPrint extends React.Component {
                                             <td>
                                             {showFiles(item.Nav_UserFiles, config.picServerHost, this)}
                                             </td>
-                                            <td>
+                                            {/* <td>
                                             { item.DEAL_STATUS == 1? 
                                     showUserSign(item.Nav_User, config.picServerHost):null
                                                 }
-                                            </td>
+                                            </td> */}
                                         </tr>
                                     })
                                 }
diff --git a/src/components/CustomPages/FO/FO045ShowPrint.js b/src/components/CustomPages/FO/FO045ShowPrint.js
index 9a63218..389c079 100644
--- a/src/components/CustomPages/FO/FO045ShowPrint.js
+++ b/src/components/CustomPages/FO/FO045ShowPrint.js
@@ -134,7 +134,7 @@ class FO045ShowPrint extends React.Component {
                         <Descriptions.Item label="作业名称">{data.Nav_OperationStep?.NAME}</Descriptions.Item>
                         <Descriptions.Item label="审批层级">{enums.HMOperationTaskAuditEnum.enums[data.AUDIT_LEVEL]}</Descriptions.Item>
                         <Descriptions.Item label="作业风险等级">{enums.SKEvaluateLevelEnum.enums[data.EVALUATE_LEVEL]}</Descriptions.Item>
-                        <Descriptions.Item label="施工单位">{data.DPARTMENT_NAME}</Descriptions.Item>
+                        <Descriptions.Item label="施工单位">{data.Nav_Related?.NAME}</Descriptions.Item>
                         <Descriptions.Item label="施工单位负责人">{data.USER_NAME}</Descriptions.Item>
                         <Descriptions.Item label="负责人电话">{data.USER_PHONE}</Descriptions.Item>
                          <Descriptions.Item label="安全生产管理人员">{data.SAFE_USER_NAME}</Descriptions.Item>
@@ -157,16 +157,14 @@ class FO045ShowPrint extends React.Component {
                 <Descriptions.Item label="附件"> {showFiles(data.Nav_FireFiles, config.picServerHost, this)}</Descriptions.Item>
 
                          <Descriptions.Item label="动火部门负责人签名">{
-                             
-                                data.USER_DEAL_STATUS == 1?
-                                    showUserSign(data.Nav_FireUser, config.picServerHost)
-                                :null
-                           
+                              data.USER_DEAL_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
+                              <img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_FireUser[0].Nav_ImgFile.FILE_PATH} />
+                             :null
                          }</Descriptions.Item>
                         <Descriptions.Item label="安全管理人员签名">{
                              
-                             data.SAFE_DEAL_STATUS == 1?
-                                 showUserSign(data.Nav_SafeUser, config.picServerHost)
+                             data.SAFE_DEAL_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
+                              <img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_SafeUser[0].Nav_ImgFile.FILE_PATH} />
                              :null
                         
                       }</Descriptions.Item>
@@ -186,14 +184,14 @@ class FO045ShowPrint extends React.Component {
                            showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
                          }</Descriptions.Item>
                            <Descriptions.Item label="动火部门负责人签字">{
-                             data.USER_DEAL_FINISH_STATUS == 1?
-                             showUserSign(data.Nav_FireUser, config.picServerHost)
-                         :null
+                         data.USER_DEAL_FINISH_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
+                         <img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_FireUser[0].Nav_ImgFile.FILE_PATH} />
+                        :null
                          }</Descriptions.Item>
                            <Descriptions.Item label="安全生产管理人员签字">{
-                            data.SAFE_DEAL_FINISH_STATUS == 1?
-                            showUserSign(data.Nav_SafeUser, config.picServerHost)
-                        :null
+                            data.SAFE_DEAL_FINISH_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
+                            <img style={{ margin: "0 0 0 15px", width: '150px' }}  src={config.picServerHost + data.Nav_SafeUser[0].Nav_ImgFile.FILE_PATH} />
+                           :null
                          }</Descriptions.Item>
                        
                      </Descriptions>
@@ -221,7 +219,7 @@ class FO045ShowPrint extends React.Component {
                                                 {item.Nav_UserType?.NAME}
                                             </td>
                                             <td>
-                                                {item.USER_NAME}
+                                                {item.Nav_User?.NAME}
                                             </td>
                                             <td>
                                             {item.CERTIFICATE_CODE}