{
+ {
Nav_SafeCheck.Nav_ListCheckProjectCategory && Nav_SafeCheck.Nav_ListCheckProjectCategory.map((item, i) => {
// return
{item.Nav_CheckProjectCategory.NAME}
return (i > 0 ? "，" : "") + item.Nav_CheckProjectCategory.NAME
@@ -151,7 +165,7 @@ class BS070ShowPrint extends React.Component {
检查人员 |
检查项目 |
检查内容 |
- 检查依据 |
+ {/* 检查依据 | */}
{Nav_ListSafeCheckDetail.map((item, i) => {
return
@@ -169,14 +183,14 @@ class BS070ShowPrint extends React.Component {
| {item.Nav_CheckProject?.NAME} |
{item.CHECKCONTENT} |
- {item.CHECKPROOF} |
+ {/* {item.CHECKPROOF} | */}
})}
| 任务制定审核人 |
-
+ |
{
showApprove(Nav_ApproveApply?.Nav_ApproveDetails, this.props.app.enums.NodeApproveStatus.enums, config.picServerHost, 200)
}
@@ -187,7 +201,7 @@ class BS070ShowPrint extends React.Component {
Nav_SafeCheck.STATUSPLAN >= 20 ?
|
| 检查人员确认 |
-
+ |
{
showUsersSign(Nav_ListApplySign, config.picServerHost, 200, 70)
}
@@ -346,6 +360,8 @@ class BS070ShowPrint extends React.Component {
+
+
}
}
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 {
| 整改建议与措施 |
检查区域 |
隐患地点 |
+ 备注 |
整改期限 |
整改实施单位 |
整改责任人 |
@@ -120,6 +121,7 @@ class BS074ShowPrint extends React.Component {
{item.DEMAND} |
{item.Nav_RiskArea.NAME} |
{item.ADDRESS} |
+ {item.REMARK} |
{item.LastDateUser} |
{item.Nav_DepartmentDeal.NAME} |
{item.Nav_UserDeal.NAME} |
diff --git a/src/components/CustomPages/BS/BS076ShowOperateLog.js b/src/components/CustomPages/BS/BS076ShowOperateLog.js
new file mode 100644
index 0000000..9e95721
--- /dev/null
+++ b/src/components/CustomPages/BS/BS076ShowOperateLog.js
@@ -0,0 +1,84 @@
+import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
+import React from 'react';
+import { initFilter, extendRule, extendInclude, setDataFieldValue, showApprove, guid, initQueryFilter, ShowDateTime, ShowPrintClose, showFiles } from '../../../utils/common';
+import ReactToPrint from 'react-to-print';
+import { ExportToExcel } from '@woowalker/feui'
+import XLSX from 'xlsx';
+import { connect } from 'dva';
+import moment from 'moment';
+import { message } from 'antd/lib/index';
+import styles from '../../../components/CustomPages/HI/StepForm.css';
+import config from '../../../config.js';
+
+class BS076ShowOperateLog extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ data: null,
+ btndisplay: 'none',
+ isCheck: false, //是否待办 审批
+ }
+ }
+
+ componentDidMount() {
+ if (this.props.data?.id)
+ this.loadData(this.props.data?.id);
+ }
+
+ componentWillReceiveProps(NextProps) {
+ if (NextProps.data?.id && this.props.data?.id != NextProps.data?.id) {
+ this.loadData(NextProps.data?.id);
+ }
+ }
+
+
+ loadData = (ids) => {
+ var orgId = this.props.login ? this.props.login.OrgId : '';
+ let json = initFilter(orgId, ids);
+ this.props.dispatch({
+ type: 'app/getDataByPost',
+ payload: json,
+ url: 'BS/BSOperateLog/OrderEntities',
+ onComplete: (ret) => {
+ debugger
+ if (ret) {
+ this.setState({
+ data: ret,
+ })
+ }
+ }
+ });
+ }
+ render() {
+ const { data } = this.state;
+ const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
+ return
+
(this.componentRef = el)} style={{ padding: '20px', paddingTop: '20px' }} id={'tableId' + this.props.data.id}>
+
+
+
+ | 履职记录 |
+
+
+ | 操作人 |
+ 操作类型 |
+ 开始时间 |
+ 操作时间 |
+ 是否按时完成 |
+
+ {(data && data.length > 0) ? data.map((item, i) => {
+ return
+ | {item.USRTNAME} |
+ {enums.OPERATEPOINT_Enums.enums[item.OPERATEPOINT]} |
+ {item.CREATE_TIME} |
+ {item.OPERTETIME} |
+ {item.ISINTTIME != null ? (item.ISINTTIME ? '是' : '否') : ""} |
+
+ }) : | 查无记录 |
}
+
+
+
+