this.showDetailModal("风险类别2")}>
{
+ {
'延期理由：' + data.Nav_ApplyDetail.REASON + ' 原整改期限：' + data.Nav_ApplyDetail.LastDate + (data.Nav_ApplyDetail.TEMPDEMAND != null ? (" 临时整改建议与措施：" + data.Nav_ApplyDetail.TEMPDEMAND) : '')
}
}
diff --git a/src/components/CustomPages/BS/BS064ShowPrint.js b/src/components/CustomPages/BS/BS064ShowPrint.js
index 9c547c2..5732279 100644
--- a/src/components/CustomPages/BS/BS064ShowPrint.js
+++ b/src/components/CustomPages/BS/BS064ShowPrint.js
@@ -1,4 +1,4 @@
-import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
+import { Button, Icon,Modal, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
import React from 'react';
import { initFilter, extendRule, extendIgnoreDataRule, extendInclude, setDataFieldValue, showApprove, guid, initQueryFilter } from "../../../utils/common";
import ReactToPrint from "react-to-print";
@@ -18,6 +18,13 @@ class BS064ShowPrint extends React.Component {
this.state = {
data: null,
BtnAgreeDisplay: 'none',
+ //弹窗参数
+ detailForm: {
+ isShow: false,
+ formCode:"BS044_SHOWPRINT",
+ title: "隐患整改单",
+ ID:''
+ },
};
};
@@ -62,6 +69,37 @@ class BS064ShowPrint extends React.Component {
XLSX.writeFile(wb, "隐患上报表.xlsx")
}
+
+ //显示详情弹窗
+ showDetailModal = (SUBMIT_CONTENT_ID) => {
+ const newtmpData = {
+ data: {
+ id: SUBMIT_CONTENT_ID,//必须动态参数 这个会影响页面去后台操作数据 '00000000-0000-0000-0000-000000000000' 或者 ''都不行
+ SUBMIT_CONTENT_ID: SUBMIT_CONTENT_ID,
+ },
+ formCode: "BS044_SHOWPRINT",
+ };
+ this.setState({ tmpData: newtmpData }, () => {
+ var detailForm = {
+ isShow: true,
+ title: "隐患整改单",
+ };
+ this.setState({
+ detailForm: detailForm,
+ });
+ });
+ };
+
+ //详情弹窗关闭（隐藏）
+ detailFormClose = () => {
+ var detailForm = {
+ isShow: false,
+ };
+ this.setState({
+ detailForm: detailForm,
+ });
+ };
+
render() {
const { data } = this.state;
return
+
}
diff --git a/src/components/CustomPages/HM/HM042ShowPrint.js b/src/components/CustomPages/HM/HM042ShowPrint.js
index 4b3c951..ec027b7 100644
--- a/src/components/CustomPages/HM/HM042ShowPrint.js
+++ b/src/components/CustomPages/HM/HM042ShowPrint.js
@@ -83,12 +83,15 @@ class HM042ShowPrint extends React.Component {
if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
this.props.data.onCancel();
}
+
loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId);
extendRule(json, 'ID', 1, dataId);
extendInclude(json, 'Nav_InitiatingDepartment');
extendInclude(json, 'Nav_ReleaseUser');
extendInclude(json, 'Nav_Details.Nav_ChargeUser');
+ extendInclude(json, 'Nav_Details.Nav_Areas.Nav_Area');
+ extendInclude(json, 'Nav_Details.Nav_Identifyings.Nav_Identifying');
extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
extendInclude(json, 'Nav_GroupLeader.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
extendInclude(json, 'Nav_DeputyGroupLeader.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
@@ -159,6 +162,43 @@ class HM042ShowPrint extends React.Component {
tmpData: newtmpData,
});
}
+ joinArea(data) {
+ let ret = [];
+ for (let it of data) {
+ if (it.Nav_Area && it.Nav_Area.NAME) {
+ ret.push(it.Nav_Area.NAME);
+ }
+ }
+ return ret.join('、');
+ }
+ joinIdentifying(data) {
+ let ret = [];
+ for (let it of data) {
+ if (it.Nav_Identifying && it.Nav_Identifying.NAME) {
+ ret.push(it.Nav_Identifying.NAME);
+ }
+ }
+ return ret.join('、');
+ }
+ renderLevel(level) {
+ let str = '';
+ if (level == undefined) {
+ return str;
+ }
+ if (level.indexOf('0') >= 0) {
+ str += '部门 ';
+ }
+ if (level.indexOf('1') >= 0) {
+ str += '车间 ';
+ }
+ if (level.indexOf('2') >= 0) {
+ str += '班组 ';
+ }
+ if (level.indexOf('3') >= 0) {
+ str += '公司 ';
+ }
+ return str;
+ }
render() {
const { data } = this.state;
return
-
- 风险类别
- this.showDetailModal("风险类别2")}>
-
作业任务
-
-
+
+
@@ -90,6 +128,7 @@ class BS064ShowPrint extends React.Component {
隐患地点
整改完成时间（归档时间）
整改人
+ 操作
{
data?.map((item, i) => {
@@ -102,12 +141,26 @@ class BS064ShowPrint extends React.Component {
{item.ADDRESS}
{item.FINISH_TIME}
{item.ACTURE_USERNAME}
+
+ this.showDetailModal(item.SUBMIT_CONTENT_ID)}>
+
+
+
+
@@ -217,6 +257,32 @@ class HM042ShowPrint extends React.Component {
{data.GROUP_LEADER_OPINION == 1 ? 
0 ? config.picServerHost + data.Nav_GroupLeader.Nav_UserSignFiles[0].Nav_ImgFile?.Nav_File.FILE_PATH : ''} /> : ""}
+
+
| 开始时间 | +结束时间 | +层级 | +辨识区域 | +类别 | +辨识对象 | +负责人 | +备注 | +
| {moment(item.START_TIME).format('YYYY-MM-DD')} | +{moment(item.END_TIME).format('YYYY-MM-DD')} | +{this.renderLevel(item.LEVEL)} | +{this.joinArea(item.Nav_Areas)} | +{this.joinIdentifying(item.Nav_Identifyings)} | +{this.props.app.enums.HMRiskTypeEnmu.enums[item.RISK_TYPE]} | +{item.Nav_ChargeUser?.NAME} | +{item.REMARK} | +