From f702038fb249ffc61c351cb8d6fde386a9bc9246 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Wed, 24 Apr 2024 10:00:25 +0800
Subject: [PATCH] =?UTF-8?q?BS006=E9=9C=80=E8=A6=81=E5=90=8C=E6=AD=A5=20CM?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=20SMS=20=E5=AD=97=E6=AE=B5=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomPages/BS/BS006View.js      | 2 +-
 src/components/CustomPages/CM/CM002ShowPrint.js | 8 ++++----
 src/components/CustomPages/CM/CM034ShowPrint.js | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/CustomPages/BS/BS006View.js b/src/components/CustomPages/BS/BS006View.js
index 8b95689..b37b4a8 100644
--- a/src/components/CustomPages/BS/BS006View.js
+++ b/src/components/CustomPages/BS/BS006View.js
@@ -121,7 +121,7 @@ class BS006View extends React.Component {
                     data ? <div >
                         <Descriptions title="" size="middle" bordered>
                             <Descriptions.Item label="编码">{data.CODE}</Descriptions.Item>
-                            <Descriptions.Item label="隐患上报名称">{data.NAME}</Descriptions.Item>
+                            <Descriptions.Item label="隐患来源">{data.NAME}</Descriptions.Item>
                             <Descriptions.Item label="检查任务">{data.Nav_Check != null ? data.Nav_Check.NAME : ""}</Descriptions.Item>
                             <Descriptions.Item label="检查类型">{data.Nav_CheckType != null ? data.Nav_CheckType.NAME : ""}</Descriptions.Item>
                             <Descriptions.Item label="检查层级">{data.Nav_CheckTypeLevel != null ? data.Nav_CheckTypeLevel.Nav_Enums.NAME : ""}</Descriptions.Item>
diff --git a/src/components/CustomPages/CM/CM002ShowPrint.js b/src/components/CustomPages/CM/CM002ShowPrint.js
index ef95ddf..aad711d 100644
--- a/src/components/CustomPages/CM/CM002ShowPrint.js
+++ b/src/components/CustomPages/CM/CM002ShowPrint.js
@@ -56,7 +56,7 @@ class CM002ShowPrint extends React.Component {
         extendInclude(json, 'Nav_Department')
         extendInclude(json, 'Nav_listPlanDetail.Nav_Department')
         extendInclude(json, 'Nav_listPlanDetail.Nav_User')
-        extendInclude(json, 'Nav_listPlanDetail.Nav_ListStandard.Nav_StandardCreate')
+        // extendInclude(json, 'Nav_listPlanDetail.Nav_ListStandard.Nav_StandardCreate')
         extendIgnoreDataRule(json)
         this.props.dispatch({
             type: 'app/getDataByPost',
@@ -119,7 +119,7 @@ class CM002ShowPrint extends React.Component {
                                 <tr className={styles.PrintFormLightTh}>
                                     <td>应急演练时间</td>
                                     <td>应急演练名称</td>
-                                    <td>关联应急预案</td>
+                                    {/* <td>关联应急预案</td> */}
                                     <td>组织演练部门</td>
                                     <td>责任人</td>
                                     <td>演练方案触发时间</td>
@@ -128,11 +128,11 @@ class CM002ShowPrint extends React.Component {
                                     return <tr>
                                         <td>{item.DRLL_DATE?.substring(0, 7)} </td>
                                         <td>{item.NAME} </td>
-                                        <td>{
+                                        {/* <td>{
                                             item.Nav_ListStandard?.map((itmc, j) => {
                                                 return (j > 0 ? "，" : "") + itmc.Nav_StandardCreate.NAME
                                             })
-                                        } </td>
+                                        } </td> */}
                                         <td>{item.Nav_Department?.NAME} </td>
                                         <td>{item.Nav_User?.NAME} </td>
                                         <td>{item.TRIGGER_TIME?.split(' ')[0]} </td>
diff --git a/src/components/CustomPages/CM/CM034ShowPrint.js b/src/components/CustomPages/CM/CM034ShowPrint.js
index 618b5bf..afdb90c 100644
--- a/src/components/CustomPages/CM/CM034ShowPrint.js
+++ b/src/components/CustomPages/CM/CM034ShowPrint.js
@@ -61,6 +61,7 @@ class CM034ShowPrint extends React.Component {
         extendInclude(json, 'Nav_ListDepartment.Nav_Department')
         extendInclude(json, 'Nav_FilesSummary.Nav_ImgFile.Nav_File')
         extendInclude(json, 'Nav_FilesRecord.Nav_ImgFile.Nav_File')
+        extendInclude(json, 'Nav_FilesStander.Nav_ImgFile.Nav_File')
         extendInclude(json, 'Nav_Approve.Nav_ApproveDetails.Nav_ApproveUser.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
         this.props.dispatch({
             type: 'app/getDataByPost',
@@ -131,6 +132,7 @@ class CM034ShowPrint extends React.Component {
                             })}</Descriptions.Item>
                             <Descriptions.Item label="演练总结报告">{showFiles(data.Nav_FilesSummary, config.picServerHost)}</Descriptions.Item>
                             <Descriptions.Item label="演练活动记录">{showFiles(data.Nav_FilesRecord, config.picServerHost)}</Descriptions.Item>
+                            <Descriptions.Item span={3} label="应急预案">{showFiles(data.Nav_FilesStander, config.picServerHost)}</Descriptions.Item>
                             {
                                 data.STATUS >= 10 ?
                                     <Descriptions.Item label="审核意见" span={3}>{