复测问题修复

src/components/CustomPages/SK/SK016ShowPrint.js

@@ -46,6 +46,7 @@ class SK016ShowPrint extends React.Component {
         // extendRule(json, 'TASK_ID', 1, taskID);
         extendInclude(json, 'Nav_ApplyUser');
         extendInclude(json, 'Nav_ApplyDepartment');
+        extendInclude(json, 'Nav_ProductionUnit');
         extendInclude(json, 'Nav_RiskArea');
         extendInclude(json, 'Nav_ReportFiles');
         extendInclude(json, 'Nav_ReportFiles.Nav_ImgFile');

src/components/CustomPages/SK/SK018ShowPrint.js

@@ -63,6 +63,7 @@ class SK018ShowPrint extends React.Component {
         extendInclude(json, 'Nav_Report');
         extendInclude(json, 'Nav_ApplyUser');
         extendInclude(json, 'Nav_ApplyDepartment');
+        extendInclude(json, 'Nav_ProductionUnit');
         extendInclude(json, 'Nav_RiskArea');
         extendInclude(json, 'Nav_Photos');
         extendInclude(json, 'Nav_Photos.Nav_ImgFile');

src/components/CustomPages/SK/SK080ShowPrint.js

@@ -105,7 +105,14 @@ class SK080ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改记录单编号">{data.Nav_RectifyRecord?data.Nav_RectifyRecord?.CODE:''}</Descriptions.Item>
-                                
+                                <Descriptions.Item label="生产单元">{data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_ProductionUnit?data.Nav_RectifyRecord.Nav_ProductionUnit.NAME:''}</Descriptions.Item>
+                                <Descriptions.Item label="隐患地点">{data.Nav_RectifyRecord?data.Nav_RectifyRecord.HIDDEN_PLACE:''}</Descriptions.Item>
+                                <Descriptions.Item label="整改前照片">{
+                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotoas ? data.Nav_RectifyRecord.Nav_RectifyPhotoas:null, config.picServerHost, this)
+                                }</Descriptions.Item>
+                                <Descriptions.Item label="整改前照片">{
+                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotobs ? data.Nav_RectifyRecord.Nav_RectifyPhotobs:null, config.picServerHost, this)
+                                }</Descriptions.Item>
                                 <Descriptions.Item label="重大事故隐患名称">{data.HIDDEN_DESCRIPTION}</Descriptions.Item>
                                 <Descriptions.Item label="重大事故隐患形成原因分析">{data.HIDDEN_REASON}</Descriptions.Item>
                                 <Descriptions.Item label="实地复查负责人">{data.Nav_ChargeUser ? data.Nav_ChargeUser.NAME : ''}</Descriptions.Item>
@@ -117,7 +124,7 @@ class SK080ShowPrint extends React.Component {
                                     })
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="复查情况描述">{data.REVIEW_DESCRIPTION}</Descriptions.Item>
-                                <Descriptions.Item label="附件">{
+                                <Descriptions.Item label="复查照片">{
                                     showFileImg(data?.Nav_Files, config.picServerHost, this)
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="复查结论">{enums.SKReviewResultEnum.enums[data.REVIEW_RESULT]}</Descriptions.Item>