diff --git a/src/components/CustomPages/FO/FO019ShowPrint.js b/src/components/CustomPages/FO/FO019ShowPrint.js index 6668054..f80a43d 100644 --- a/src/components/CustomPages/FO/FO019ShowPrint.js +++ b/src/components/CustomPages/FO/FO019ShowPrint.js @@ -1,20 +1,25 @@ import { message } from "antd/lib/index"; -import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd'; +import { Button,Descriptions, Modal,Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd'; import React from 'react'; -import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter } from "../../../utils/common"; +import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid,showFiles,GetFileModel, initQueryFilter } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import styles from '../HI/StepForm.css'; import config from "../../../config"; import XLSX from 'xlsx'; import { connect } from 'dva'; import moment from 'moment'; +import FormPage from '../../FormPage' class FO019ShowPrint extends React.Component { constructor(props) { super(props); this.state = { data: null, enumData: null, - BtnAgreeDisplay: 'none' + BtnAgreeDisplay: 'none', + fileForm: { + title: "", + visible: false, + }, }; }; @@ -170,6 +175,10 @@ class FO019ShowPrint extends React.Component { 交底内容 {data.DisclosureContent} + + 附件 + {showFiles(data.Nav_Files, config.picServerHost, this)} + 交底人签字 { @@ -214,6 +223,9 @@ class FO019ShowPrint extends React.Component { :null } + { + GetFileModel(Modal, FormPage, this, this.state.fileForm.visible) + } } diff --git a/src/components/CustomPages/FO/FO035ShowPrint.js b/src/components/CustomPages/FO/FO035ShowPrint.js index 927031b..316d27f 100644 --- a/src/components/CustomPages/FO/FO035ShowPrint.js +++ b/src/components/CustomPages/FO/FO035ShowPrint.js @@ -1,20 +1,25 @@ import { message } from "antd/lib/index"; -import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd'; +import { Button,Descriptions, Modal,Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd'; import React from 'react'; -import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter,showUserSign } from "../../../utils/common"; +import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid, showFiles,GetFileModel,initQueryFilter,showUserSign } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import stylesStep from '../HI/StepForm.css'; import config from "../../../config"; import XLSX from 'xlsx'; import { connect } from 'dva'; import moment from 'moment'; +import FormPage from '../../FormPage' class FO035ShowPrint extends React.Component { constructor(props) { super(props); this.state = { data: null, enumData: null, - BtnAgreeDisplay: 'none' + BtnAgreeDisplay: 'none', + fileForm: { + title: "", + visible: false, + }, }; }; @@ -128,6 +133,7 @@ class FO035ShowPrint extends React.Component { }) } {data.DisclosureContent} + {showFiles(data.Nav_Files, config.picServerHost, this)} { (data.Nav_User && data.Nav_User.FILE_PATH)? showUserSign(data.Nav_User, config.picServerHost):null @@ -149,6 +155,9 @@ class FO035ShowPrint extends React.Component { : null } + { + GetFileModel(Modal, FormPage, this, this.state.fileForm.visible) + } } diff --git a/src/components/CustomPages/FO/FO037ShowPrint.js b/src/components/CustomPages/FO/FO037ShowPrint.js index c09e93b..ec794b0 100644 --- a/src/components/CustomPages/FO/FO037ShowPrint.js +++ b/src/components/CustomPages/FO/FO037ShowPrint.js @@ -1,20 +1,25 @@ import { message } from "antd/lib/index"; -import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd'; +import { Button,Descriptions,Modal, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd'; import React from 'react'; -import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter,showUserSign } from "../../../utils/common"; +import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, showFiles,GetFileModel,setDataFieldValue, guid, initQueryFilter,showUserSign } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import stylesStep from '../HI/StepForm.css'; import config from "../../../config"; import XLSX from 'xlsx'; import { connect } from 'dva'; import moment from 'moment'; +import FormPage from '../../FormPage' class FO037ShowPrint extends React.Component { constructor(props) { super(props); this.state = { data: null, enumData: null, - BtnAgreeDisplay: 'none' + BtnAgreeDisplay: 'none', + fileForm: { + title: "", + visible: false, + }, }; }; @@ -129,6 +134,7 @@ class FO037ShowPrint extends React.Component { }) } {data.DisclosureContent} + {showFiles(data.Nav_Files, config.picServerHost, this)} { (data.Nav_User && data.Nav_User.FILE_PATH)? showUserSign(data.Nav_User, config.picServerHost):null @@ -150,6 +156,9 @@ class FO037ShowPrint extends React.Component { : null } + { + GetFileModel(Modal, FormPage, this, this.state.fileForm.visible) + } }