From a8f27a37c0e5a26a8073e21731eeee82f54c84b0 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Mon, 24 Jun 2024 17:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=99=BB=E8=AE=B0=E3=80=81?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3=E4=B8=8A=E6=8A=A5=20=E3=80=81=E9=9A=90?=
 =?UTF-8?q?=E6=82=A3=E6=95=B4=E6=94=B9=20=20=20=E3=80=90=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomPages/BS/BS034ShowPrint.js   | 2 ++
 src/components/CustomPages/BS/BS034View.js        | 4 ++--
 src/components/CustomPages/BS/BS042ActualCheck.js | 2 ++
 src/components/CustomPages/BS/BS042ShowPrint.js   | 2 ++
 src/components/CustomPages/BS/BS044Check.js       | 1 +
 src/components/CustomPages/BS/BS074ShowPrint.js   | 2 ++
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/CustomPages/BS/BS034ShowPrint.js b/src/components/CustomPages/BS/BS034ShowPrint.js
index 183cd67..42f7245 100644
--- a/src/components/CustomPages/BS/BS034ShowPrint.js
+++ b/src/components/CustomPages/BS/BS034ShowPrint.js
@@ -186,6 +186,7 @@ class BS034ShowPrint extends React.Component {
                                 {/* <td>备注</td> */}
 
                                 <td>隐患地点</td>
+                                <td>备注</td>
                                 <td>附件</td>
                             </tr>
                             {data.Nav_ListSafeCheckDetail.map((item, i) => {
@@ -216,6 +217,7 @@ class BS034ShowPrint extends React.Component {
                                     {/* <td>{item.REMARK_RESULT}</td> */}
 
                                     <td>{item.ADDRESS}</td>
+                                    <td>{item.REMARK}</td>
                                     <td>{
                                         showFiles(item.Nav_Files, config.picServerHost)
                                     }</td>
diff --git a/src/components/CustomPages/BS/BS034View.js b/src/components/CustomPages/BS/BS034View.js
index 7163156..5e1b45c 100644
--- a/src/components/CustomPages/BS/BS034View.js
+++ b/src/components/CustomPages/BS/BS034View.js
@@ -239,7 +239,7 @@ class BS034View extends React.Component {
                                 <td>问题等级</td>
                                 <td style={{ maxWidth: "20%" }}>整改建议与措施</td>
                                 <td style={{ minWidth: "110px" }} >检查人员</td>
-                                {/* <td>备注</td> */}
+                                <td>备注</td>
                                 <td>附件</td>
                             </tr>
                             {data.Nav_ListSafeCheckDetail.map((item, i) => {
@@ -280,7 +280,7 @@ class BS034View extends React.Component {
                                         })
 
                                     }</td>
-                                    {/* <td>{item.REMARK_RESULT}</td> */}
+                                    <td>{item.REMARK}</td>
 
 
                                     <td>{
diff --git a/src/components/CustomPages/BS/BS042ActualCheck.js b/src/components/CustomPages/BS/BS042ActualCheck.js
index c42820b..07d2139 100644
--- a/src/components/CustomPages/BS/BS042ActualCheck.js
+++ b/src/components/CustomPages/BS/BS042ActualCheck.js
@@ -229,6 +229,7 @@ class BS042ActualCheck extends React.Component {
                                 <td style={{ minWidth: '80px' }}>隐患等级</td>
                                 <td>整改建议与措施</td>
                                 <td style={{ minWidth: '110px' }}>隐患地点</td>
+                                <td style={{ minWidth: '110px' }}>备注</td>
                                 <td style={{ minWidth: '100px' }}>整改期限</td>
                                 <td style={{ minWidth: '100px' }}>系统整改期限</td>
                                 <td style={{ minWidth: '110px' }}>整改实施单位</td>
@@ -246,6 +247,7 @@ class BS042ActualCheck extends React.Component {
                                     <td>{this.props.app.enums.BSQuestionLevelEnum.enums[item.QUESTION_LEVEL]}</td>
                                     <td>{item.DEMAND}</td>
                                     <td>{item.ADDRESS}</td>
+                                    <td>{item.REMARK}</td>
                                     <td>{new Date(item.LastDateUser).Format("yyyy-MM-dd")}</td>
                                     <td>{new Date(item.LastDateSystem).Format("yyyy-MM-dd")}</td>
                                     <td> {item.Nav_DepartmentDeal == null ? '' : item.Nav_DepartmentDeal.NAME}</td>
diff --git a/src/components/CustomPages/BS/BS042ShowPrint.js b/src/components/CustomPages/BS/BS042ShowPrint.js
index 0686a1c..5df5687 100644
--- a/src/components/CustomPages/BS/BS042ShowPrint.js
+++ b/src/components/CustomPages/BS/BS042ShowPrint.js
@@ -290,6 +290,7 @@ class BS042ShowPrint extends React.Component {
                                 <td style={{ minWidth: '80px' }}>隐患等级</td>
                                 <td>整改建议与措施</td>
                                 <td style={{ minWidth: '110px' }}>隐患地点</td>
+                                <td style={{ minWidth: '110px' }}>备注</td>
                                 <td style={{ minWidth: '100px' }}>整改期限</td>
                                 <td style={{ minWidth: '100px' }}>系统整改期限</td>
                                 <td style={{ minWidth: '110px' }}>整改实施单位</td>
@@ -308,6 +309,7 @@ class BS042ShowPrint extends React.Component {
                                     <td>{this.props.app.enums.BSQuestionLevelEnum.enums[item.QUESTION_LEVEL]}</td>
                                     <td>{item.DEMAND}</td>
                                     <td>{item.ADDRESS}</td>
+                                    <td>{item.REMARK}</td>
                                     <td>{new Date(item.LastDateUser).Format("yyyy-MM-dd")}</td>
                                     <td>{new Date(item.LastDateSystem).Format("yyyy-MM-dd")}</td>
                                     <td> {item.Nav_DepartmentDeal == null ? '' : item.Nav_DepartmentDeal.NAME}</td>
diff --git a/src/components/CustomPages/BS/BS044Check.js b/src/components/CustomPages/BS/BS044Check.js
index 015439b..d30b060 100644
--- a/src/components/CustomPages/BS/BS044Check.js
+++ b/src/components/CustomPages/BS/BS044Check.js
@@ -163,6 +163,7 @@ class BS044Check extends React.Component {
                             <Descriptions.Item label="整改建议与措施" >{data.Nav_SubmitContent.DEMAND}</Descriptions.Item>
                             <Descriptions.Item label="整改后情况描述">{data.DEALDESCRIBE}</Descriptions.Item>
                             <Descriptions.Item label="隐患地点">{data.Nav_SubmitContent.ADDRESS}</Descriptions.Item>
+                            <Descriptions.Item label="备注">{data.REMARK}</Descriptions.Item>
                             {/* <hr></hr> */}
                             <Descriptions.Item label="附件（整改前）">{
                                 data.Nav_Files && data.Nav_Files.map((item, i) => {
diff --git a/src/components/CustomPages/BS/BS074ShowPrint.js b/src/components/CustomPages/BS/BS074ShowPrint.js
index 48400f2..9962d2b 100644
--- a/src/components/CustomPages/BS/BS074ShowPrint.js
+++ b/src/components/CustomPages/BS/BS074ShowPrint.js
@@ -108,6 +108,7 @@ class BS074ShowPrint extends React.Component {
                                     <td>整改建议与措施</td>
                                     <td>检查区域</td>
                                     <td>隐患地点</td>
+                                    <td>备注</td>
                                     <td>整改期限</td>
                                     <td>整改实施单位</td>
                                     <td>整改责任人</td>
@@ -120,6 +121,7 @@ class BS074ShowPrint extends React.Component {
                                         <td>{item.DEMAND} </td>
                                         <td>{item.Nav_RiskArea.NAME} </td>
                                         <td>{item.ADDRESS} </td>
+                                        <td>{item.REMARK} </td>
                                         <td>{item.LastDateUser} </td>
                                         <td>{item.Nav_DepartmentDeal.NAME} </td>
                                         <td>{item.Nav_UserDeal.NAME} </td>