diff --git a/src/components/CustomPages/FM/FM202ShowPrint.js b/src/components/CustomPages/FM/FM202ShowPrint.js index 7635ec3..eecf52d 100644 --- a/src/components/CustomPages/FM/FM202ShowPrint.js +++ b/src/components/CustomPages/FM/FM202ShowPrint.js @@ -1,6 +1,6 @@ import { Button, Descriptions, Modal, Row, Col, Form, Input, Select, Table } from 'antd'; import React from 'react'; -import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, GetFileModel, showFiles, approveView } from "../../../utils/common"; +import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, GetFileModel, showFiles } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import stylesStep from '../HI/StepForm.css'; import config from "../../../config"; @@ -75,7 +75,7 @@ class FM202ShowPrint extends React.Component { } else { that.setState({ BtnAgreeDisplay: 'inline' }) } - approveView(this, false); + this.onClickApprove(false); //归档才显示打印和导出按钮 // if(ret.PRE_MEETING_STATUS==5){ // this.setState({ isFinished: 'inline' }) @@ -93,13 +93,22 @@ class FM202ShowPrint extends React.Component { XLSX.writeFile(wb, "随手拍列表.xlsx") } + onClickApprove = (appVisible) => { + const newtmpData = { + data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' }, + formCode: "PF123", + } + this.setState({ + tmpData: newtmpData, + }); + } render() { const { data } = this.state; const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; // let aaa = Math.random(); return
- {/* + {/* } content={() => this.componentRef} diff --git a/src/components/CustomPages/FO/FO017ShowPrint.js b/src/components/CustomPages/FO/FO017ShowPrint.js index bea29c8..d07d7de 100644 --- a/src/components/CustomPages/FO/FO017ShowPrint.js +++ b/src/components/CustomPages/FO/FO017ShowPrint.js @@ -1,6 +1,6 @@ import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd'; import React from 'react'; -import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common"; +import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import styles from '../HI/StepForm.css'; import config from "../../../config"; @@ -81,7 +81,7 @@ class FO017ShowPrint extends React.Component { } else { that.setState({ BtnAgreeDisplay: 'inline' }) } - approveView(this, false); + this.onClickApprove(false); } } @@ -94,12 +94,21 @@ class FO017ShowPrint extends React.Component { const wb = XLSX.utils.table_to_book(Table); XLSX.writeFile(wb, "关键作业/许可作业工作票.xlsx") } + onClickApprove = (appVisible) => { + const newtmpData = { + data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' }, + formCode: "PF123", + } + this.setState({ + tmpData: newtmpData, + }); + } render() { const { data, } = this.state; const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; return
- + } content={() => this.componentRef}