From cfa7fd0ffc6c9c4e8abbd4163e6dc856711314a1 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: Mon, 13 Jul 2026 11:37:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=85=B7=E4=BD=93=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=EF=BC=8C=E6=95=B4=E6=94=B9=E6=8E=AA=E6=96=BD=E5=85=B7?=
 =?UTF-8?q?=E4=BD=93=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomPages/SK/SK010ShowPrint.js |  6 ++++++
 src/components/CustomPages/SK/SK012ShowPrint.js |  6 ++++++
 src/components/CustomPages/SK/SK014ShowPrint.js | 14 +++++++++++++-
 src/components/CustomPages/SK/SK018ShowPrint.js |  4 +++-
 src/components/CustomPages/SK/SK020ShowPrint.js | 17 +++++++++++++++--
 src/components/CustomPages/SK/SK022ShowPrint.js |  8 +++++---
 6 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/src/components/CustomPages/SK/SK010ShowPrint.js b/src/components/CustomPages/SK/SK010ShowPrint.js
index 9cc591c..d1592f6 100644
--- a/src/components/CustomPages/SK/SK010ShowPrint.js
+++ b/src/components/CustomPages/SK/SK010ShowPrint.js
@@ -148,6 +148,7 @@ class SK010ShowPrint extends React.Component {
                         <td className={stylesStep.fontBold}>检查人员</td>
                         <td width='10%' className={stylesStep.fontBold}>检查情况</td>
                         <td className={stylesStep.fontBold}>隐患描述</td>
+                        <td className={stylesStep.fontBold}>隐患具体描述</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患等级</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患地点</td>
                         <td className={stylesStep.fontBold}>隐患原因</td>
@@ -208,6 +209,11 @@ class SK010ShowPrint extends React.Component {
                                         item.Nav_Question?.DESCREPTION
                                     }
                                 </td>
+                                <td>
+                                    {
+                                        item.HIDDEN_DESCRIPTION
+                                    }
+                                </td>
                                 <td>
                                     {
                                         enums.SKHiddenLevel.enums[item.HIDDEN_LEVEL]
diff --git a/src/components/CustomPages/SK/SK012ShowPrint.js b/src/components/CustomPages/SK/SK012ShowPrint.js
index 817d4b7..2d3ffe8 100644
--- a/src/components/CustomPages/SK/SK012ShowPrint.js
+++ b/src/components/CustomPages/SK/SK012ShowPrint.js
@@ -169,6 +169,7 @@ class SK012ShowPrint extends React.Component {
                         <td className={stylesStep.fontBold}>检查人员</td>
                         <td width='10%' className={stylesStep.fontBold}>检查情况</td>
                         <td className={stylesStep.fontBold}>隐患描述</td>
+                        <td className={stylesStep.fontBold}>隐患具体描述</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患等级</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患地点</td>
                         <td className={stylesStep.fontBold}>隐患原因</td>
@@ -229,6 +230,11 @@ class SK012ShowPrint extends React.Component {
                                         item.Nav_Question?.DESCREPTION
                                     }
                                 </td>
+                                <td>
+                                    {
+                                        item.HIDDEN_DESCRIPTION
+                                    }
+                                </td>
                                 <td>
                                     {
                                         enums.SKHiddenLevel.enums[item.HIDDEN_LEVEL]
diff --git a/src/components/CustomPages/SK/SK014ShowPrint.js b/src/components/CustomPages/SK/SK014ShowPrint.js
index ffb0330..8b688e7 100644
--- a/src/components/CustomPages/SK/SK014ShowPrint.js
+++ b/src/components/CustomPages/SK/SK014ShowPrint.js
@@ -144,12 +144,14 @@ class SK014ShowPrint extends React.Component {
                         <td width='10%' className={stylesStep.fontBold}>检查区域</td>
                         <td className={stylesStep.fontBold}>检查内容</td>
                         <td className={stylesStep.fontBold}>隐患描述</td>
+                        <td className={stylesStep.fontBold}>隐患具体描述</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患等级</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患地点</td>
                         <td className={stylesStep.fontBold}>隐患原因</td>
                         <td width='10%' className={stylesStep.fontBold}>整改责任人</td>
                         <td width='10%' className={stylesStep.fontBold}>整改期限</td>
-                        <td className={stylesStep.fontBold}>备注</td>
+                        <td className={stylesStep.fontBold}>整改措施</td>
+                        <td className={stylesStep.fontBold}>整改措施具体描述</td>
                         <td className={stylesStep.fontBold}>隐患照片</td>
                     </tr>
                     {
@@ -174,6 +176,11 @@ class SK014ShowPrint extends React.Component {
                                         item.Nav_Question?.DESCREPTION
                                     }
                                 </td>
+                                <td>
+                                    {
+                                        item.HIDDEN_DESCRIPTION
+                                    }
+                                </td>
                                 <td>
                                     {
                                         enums.SKHiddenLevel.enums[item.HIDDEN_LEVEL]
@@ -208,6 +215,11 @@ class SK014ShowPrint extends React.Component {
                                         moment(item.RECITIFY_TIME).format('YYYY-MM-DD')
                                     }
                                 </td>
+                                <td>
+                                    {
+                                       item.Nav_Question?.DEMAND
+                                    }
+                                </td>
                                 <td>
                                     {
                                         item.REMARK
diff --git a/src/components/CustomPages/SK/SK018ShowPrint.js b/src/components/CustomPages/SK/SK018ShowPrint.js
index c6b15ea..a78ae63 100644
--- a/src/components/CustomPages/SK/SK018ShowPrint.js
+++ b/src/components/CustomPages/SK/SK018ShowPrint.js
@@ -156,8 +156,10 @@ class SK018ShowPrint extends React.Component {
                                 }</Descriptions.Item> */}
                                 {/* <Descriptions.Item label="判定标准">{data.CHECKSTANDARD}</Descriptions.Item> */}
                                 <Descriptions.Item label="系统隐患描述">{data.Nav_Question?.DESCREPTION}</Descriptions.Item>
+                                <Descriptions.Item label="隐患具体描述">{data.HIDDEN_DESCRIPTION_DETAIL}</Descriptions.Item>
                                 <Descriptions.Item label="隐患等级">{enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]}</Descriptions.Item>
-                                <Descriptions.Item label="整改措施">{data.RECTIFICATION_MEASURES}</Descriptions.Item>
+                                <Descriptions.Item label="整改措施">{data.Nav_Question?.DEMAND}</Descriptions.Item>
+                                <Descriptions.Item label="整改措施具体描述">{data.RECTIFICATION_MEASURES}</Descriptions.Item>
                                 <Descriptions.Item label="隐患原因">{
                                     data?.Nav_Reasons && data?.Nav_Reasons.map((item2, i) => {
 
diff --git a/src/components/CustomPages/SK/SK020ShowPrint.js b/src/components/CustomPages/SK/SK020ShowPrint.js
index 347007b..0e02321 100644
--- a/src/components/CustomPages/SK/SK020ShowPrint.js
+++ b/src/components/CustomPages/SK/SK020ShowPrint.js
@@ -144,15 +144,18 @@ class SK020ShowPrint extends React.Component {
                         <td width='10%' className={stylesStep.fontBold}>检查区域</td>
                         {/* <td className={stylesStep.fontBold}>检查内容</td> */}
                         <td className={stylesStep.fontBold}>隐患描述</td>
+                        <td className={stylesStep.fontBold}>隐患具体描述</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患等级</td>
                         <td width='10%' className={stylesStep.fontBold}>隐患地点</td>
                         <td className={stylesStep.fontBold}>隐患原因</td>
-                        <td width='10%' className={stylesStep.fontBold}>整改措施</td>
+                        <td className={stylesStep.fontBold}>整改措施</td>
+                        <td className={stylesStep.fontBold}>整改措施具体描述</td>
                         <td width='10%' className={stylesStep.fontBold}>整改期限</td>
                         <td width='10%' className={stylesStep.fontBold}>整改落实人</td>
                         <td width='10%' className={stylesStep.fontBold}>验收人</td>
                         <td className={stylesStep.fontBold}>备注</td>
                         <td className={stylesStep.fontBold}>隐患照片</td>
+                     
                     </tr>
                     {
                         data?.Nav_RectifyDetails && data.Nav_RectifyDetails?.map((item, i) => {
@@ -172,7 +175,12 @@ class SK020ShowPrint extends React.Component {
                                             </td> */}
                                 <td>
                                     {
-                                        item.Nav_Question?.DESCREPTION ? item.Nav_Question.DESCREPTION : item.HIDDEN_DESCRIPTION
+                                        item.Nav_Question?.DESCREPTION
+                                    }
+                                </td>
+                                <td>
+                                    {
+                                        item.HIDDEN_DESCRIPTION
                                     }
                                 </td>
                                 <td>
@@ -195,6 +203,11 @@ class SK020ShowPrint extends React.Component {
                                         })
                                     }
                                 </td>
+                                <td>
+                                    {
+                                        item.Nav_Question?.DEMAND
+                                    }
+                                </td>
                                 <td>
                                     {
                                         item.RECTIFICATION_MEASURES
diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js
index b36637c..65045f5 100644
--- a/src/components/CustomPages/SK/SK022ShowPrint.js
+++ b/src/components/CustomPages/SK/SK022ShowPrint.js
@@ -139,9 +139,11 @@ class SK022ShowPrint extends React.Component {
                                         // return <tr><label> {item2.Nav_User?.NAME}</label></tr>
                                     })
                                 }</Descriptions.Item>
-                                <Descriptions.Item label="隐患描述">{data.Nav_Question?.DESCREPTION ? data.Nav_Question.DESCREPTION : data.HIDDEN_DESCRIPTION}</Descriptions.Item>
+                                <Descriptions.Item label="隐患描述">{data.Nav_Question?.DESCREPTION}</Descriptions.Item>
+                                <Descriptions.Item label="隐患具体描述">{data.HIDDEN_DESCRIPTION}</Descriptions.Item>
                                 <Descriptions.Item label="隐患等级">{enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]}</Descriptions.Item>
-                                <Descriptions.Item label="整改措施">{data.RECTIFICATION_MEASURES}</Descriptions.Item>
+                                <Descriptions.Item label="整改措施">{data.Nav_Question?.DEMAND}</Descriptions.Item>
+                                <Descriptions.Item label="整改措施具体描述">{data.RECTIFICATION_MEASURES}</Descriptions.Item>
                                 <Descriptions.Item label="整改期限">{moment(data.RECITIFY_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="整改部门">{data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改责任人">{data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}</Descriptions.Item>
@@ -176,7 +178,7 @@ class SK022ShowPrint extends React.Component {
                                         showUserSign(data.Nav_AcceptUser, config.picServerHost)
                                         : data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
                                 }</Descriptions.Item>
-                                  <Descriptions.Item label="备注">{data.REMARK}</Descriptions.Item>
+                                  {/* <Descriptions.Item label="备注">{data.REMARK}</Descriptions.Item> */}
                             </Descriptions>
                         </div> : null
                 }