wyw/mh_jy_safe_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:cc688c19107f1790364ca03295eb35ee6cb9c8a8
Branches Tags
wyw:master
wyw:dev_csw1
..
compare: wyw:5fbf2b7b71cdb39720f179f3ab063e162809a19c
Branches Tags
wyw:master
wyw:dev_csw1

No commits in common. "cc688c19107f1790364ca03295eb35ee6cb9c8a8" and "5fbf2b7b71cdb39720f179f3ab063e162809a19c" have entirely different histories.
cc688c1910 ... 5fbf2b7b71

2 changed files with 6 additions and 24 deletions
Show Stats Expand all files Collapse all files

15
src/components/CustomPages/FM/FM202ShowPrint.js
View File

@ -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 } from "../../../utils/common";
import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, GetFileModel, showFiles, approveView } 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' })
}
this.onClickApprove(false);
approveView(this, false);
//归档才显示打印和导出按钮
// if(ret.PRE_MEETING_STATUS==5){
// this.setState({ isFinished: 'inline' })
@ -93,22 +93,13 @@ 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 <div>
<div style={{ padding: '10px' }}>
{/* <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
{/* <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
<ReactToPrint
trigger={() => <Button style={{ marginLeft: '8px', display: data && data.IS_PUBLISH === 5 ? "inline" : "none" }} type={'default'} icon={'printer'} >打印</Button>}
content={() => this.componentRef}

15
src/components/CustomPages/FO/FO017ShowPrint.js
View File

@ -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 } from "../../../utils/common";
import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
}
this.onClickApprove(false);
approveView(this, false);
}
}
@ -94,21 +94,12 @@ 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 <div>
<div style={{ padding: '10px' }}>
<Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
<Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
<ReactToPrint
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px' }}>打印</Button>}
content={() => this.componentRef}