From 655a89144fd5165310cd8731c328b8f2de8b6fe0 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: Wed, 10 Dec 2025 17:07:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E6=94=B9=E8=AE=B0=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomPages/FO/FO043ShowPrint.js | 4 ++--
 src/components/CustomPages/SK/SK022ShowPrint.js | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/CustomPages/FO/FO043ShowPrint.js b/src/components/CustomPages/FO/FO043ShowPrint.js
index 942f5ee..5844415 100644
--- a/src/components/CustomPages/FO/FO043ShowPrint.js
+++ b/src/components/CustomPages/FO/FO043ShowPrint.js
@@ -141,7 +141,7 @@ class FO043ShowPrint extends React.Component {
                          <Descriptions.Item label="动火地点">{data.JOB_CONTENT}</Descriptions.Item>
                          <Descriptions.Item label="动火方式">{data.Nav_Type?.NAME}</Descriptions.Item>
                          <Descriptions.Item label="动火具体事项">{data.JOB_CONTENT}</Descriptions.Item>
-                         <Descriptions.Item label="作业监护人">{data.Nav_MonitorUser?.NAME}</Descriptions.Item>
+                         {/* <Descriptions.Item label="作业监护人">{data.Nav_MonitorUser?.NAME}</Descriptions.Item> */}
                          <Descriptions.Item label="动火计划开始时间">{data.JOB_DATE}</Descriptions.Item>
                          <Descriptions.Item label="动火计划结束时间">{data.JOB_END_DATE}</Descriptions.Item>
                          <Descriptions.Item label="存在的风险">{ data.Nav_Risks && data.Nav_Risks.map((item, i) => {
@@ -259,7 +259,7 @@ class FO043ShowPrint extends React.Component {
                         
                       }</Descriptions.Item>
                        </Descriptions>
-                         <Descriptions size="middle" bordered className={styles.description} style={{display:data.FIRE_STATUS >= 10?'block':'none'}}>
+                         <Descriptions size="middle" bordered className={styles.description} style={{display:data.FIRE_STATUS > 15?'block':'none'}}>
                          <Descriptions.Item label="动火作业完工验收情况">{
                             data.COMPLETED_CONTENT
                          }</Descriptions.Item>
diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js
index 5ad6582..39986a2 100644
--- a/src/components/CustomPages/SK/SK022ShowPrint.js
+++ b/src/components/CustomPages/SK/SK022ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles,showUserSign, GetFileModel } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles,showUserSign,showFileImg, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -163,10 +163,10 @@ class SK022ShowPrint extends React.Component {
                                 <Descriptions.Item label="整改资金(元)">{data.RECTIFICATION_MONEY}</Descriptions.Item>
                                 <Descriptions.Item label="整改完成时间">{data.COMPLETE_DATE?moment(data.COMPLETE_DATE).format('YYYY-MM-DD'):null}</Descriptions.Item>
                                 <Descriptions.Item label="整改前照片">{
-                                    showFiles(data?.Nav_RectifyPhotoas, config.picServerHost, this)
+                                    showFileImg(data?.Nav_RectifyPhotoas, config.picServerHost, this)
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="整改后照片">{
-                                    showFiles(data?.Nav_RectifyPhotobs, config.picServerHost, this)
+                                    showFileImg(data?.Nav_RectifyPhotobs, config.picServerHost, this)
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="预案或方案">{
                                     showFiles(data?.Nav_RectifyFiles, config.picServerHost, this)
@@ -175,13 +175,12 @@ class SK022ShowPrint extends React.Component {
                                 <Descriptions.Item style={{display:(data.STATUS ==20 ||data.STATUS==30)?"inline":"none"}} label="验收结论">{enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]}</Descriptions.Item>
                                 <Descriptions.Item style={{display:(data.STATUS ==20 ||data.STATUS==30)?"inline":"none"}} label="验收意见">{data.ACCEPT_OPINION}</Descriptions.Item>
                                 <Descriptions.Item label="整改责任人签名">{
-                                    data.STATUS == 20 &&
                                     data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
                                     showUserSign(data.Nav_RecitifyUser, config.picServerHost)
                                          : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="验收人签名">{
-                                    data.STATUS == 30 && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
+                                     (data.STATUS == 20 ||data.STATUS == 30)&& data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
                                     showUserSign(data.Nav_RecitifyUser, config.picServerHost)
                                         : data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
                                 }</Descriptions.Item>