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

作业现场模块增加json.Parameter22 = this.props.data.ORG_ID_HV;

Browse Source
This commit is contained in:
何美荣 2025-12-22 16:45:33 +08:00
parent 4419026764
commit f685435a77
16 changed files with 691 additions and 682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/CustomPages/FO/FO003ShowPrint.js
View File

@ -1,5 +1,5 @@
import { message } from "antd/lib/index";
import { Button, Popconfirm, Row, Col, Form, Input, Select, Table, Modal} from 'antd';
import { Button, Popconfirm, Row, Col, Form, Input, Select, Table, Modal } from 'antd';
import React from 'react';
import { initFilter, extendRule, extendInclude, showFiles, GetFileModel } from "../../../utils/common";
import ReactToPrint from "react-to-print";
@ -66,6 +66,7 @@ class FO003ShowPrint extends React.Component {
loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
extendInclude(json, 'Nav_Team');
extendInclude(json, 'Nav_Class');

1
src/components/CustomPages/FO/FO005ShowPrint.js
View File

@ -53,6 +53,7 @@ class FO005ShowPrint extends React.Component {
}
loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
extendInclude(json, 'Nav_Users.Nav_User');
extendInclude(json, 'Nav_Team');

1
src/components/CustomPages/FO/FO008ShowPrint.js
View File

@ -60,6 +60,7 @@ class FO008ShowPrint extends React.Component {
loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
extendInclude(json, 'Nav_User');
extendInclude(json, 'Nav_Department');

1
src/components/CustomPages/FO/FO015ShowPrint.js
View File

@ -60,6 +60,7 @@ class FO015ShowPrint extends React.Component {
loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
// extendInclude(json, 'Nav_Meeting');
// extendInclude(json, 'Nav_CreateUser');

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

@ -58,6 +58,7 @@ class FO017ShowPrint extends React.Component {
loadData = () => {
let that = this;
let json = initFilter(that.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, that.props.data.id);
extendIgnoreDataRule(json)
// extendInclude(json, 'Nav_CrucialLicensePerson');

40
src/components/CustomPages/FO/FO019ShowPrint.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button,Descriptions, Modal,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,showFiles,GetFileModel, 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";
@ -54,12 +54,13 @@ class FO019ShowPrint extends React.Component {
}
BtnClose = () => {
if (typeof this.props.data.onCancel != "undefined"&&typeof this.props.data.onCancel == 'function')
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);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
extendIgnoreDataRule(json)
// extendRule(json, 'ID', 1, dataId);
@ -79,14 +80,13 @@ class FO019ShowPrint extends React.Component {
url: 'FO/FOTechDisclosureFrom/GetEdit',
onComplete: (ret) => {
if (ret) {
if(this.props.data && this.props.data.loadDataDeal)
{
if (this.props.data && this.props.data.loadDataDeal) {
this.props.data.loadDataDeal(1);
}
this.setState({ data: ret })
if (this.props.data.tableKey=="2" ||this.props.data.tableKey==undefined) {
if (this.props.data.tableKey == "2" || this.props.data.tableKey == undefined) {
this.setState({ BtnAgreeDisplay: 'none' })
}else{
} else {
this.setState({ BtnAgreeDisplay: 'inline' })
}
}
@ -106,11 +106,11 @@ class FO019ShowPrint extends React.Component {
return <div>
<div style={{ padding: '10px' }}>
<ReactToPrint
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }}>打印</Button>}
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.FORM_STATUS === 2 ? "inline" : "none" }}>打印</Button>}
content={() => this.componentRef}
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
<Button style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button style={{ marginLeft: '8px', display: data && data.FORM_STATUS === 2 ? "inline" : "none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >确认</Button>
</div>
@ -127,17 +127,17 @@ class FO019ShowPrint extends React.Component {
<td colSpan={2} rowSpan={1} className={styles.fontBold}>编号</td>
<td colSpan={3} rowSpan={1}>{data.CODE}</td>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>作业名称</td>
<td colSpan={3} rowSpan={1}>{data.Nav_OperationStep?data.Nav_OperationStep?.NAME:''}</td>
<td colSpan={3} rowSpan={1}>{data.Nav_OperationStep ? data.Nav_OperationStep?.NAME : ''}</td>
</tr>
<tr>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>作业地点</td>
<td colSpan={3} rowSpan={1}>{data.JOB_LOCATION}</td>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>交底时间</td>
<td colSpan={3} rowSpan={1}>{data.DISCLOSURE_DATE?data.DISCLOSURE_DATE:null}</td>
<td colSpan={3} rowSpan={1}>{data.DISCLOSURE_DATE ? data.DISCLOSURE_DATE : null}</td>
</tr>
<tr>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>交底人</td>
<td colSpan={3} rowSpan={1}>{data.Nav_DisclosurePerson?data.Nav_DisclosurePerson?.NAME:''}</td>
<td colSpan={3} rowSpan={1}>{data.Nav_DisclosurePerson ? data.Nav_DisclosurePerson?.NAME : ''}</td>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>被交底人</td>
<td colSpan={3} rowSpan={1}>{
data.IS_OUTSOURCE == false && data.Nav_Person && data.Nav_Person.map((item, i) => {
@ -182,9 +182,9 @@ class FO019ShowPrint extends React.Component {
<tr>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>交底人签字</td>
<td colSpan={8} rowSpan={1}>{
(data.Nav_DisclosurePerson && data.Nav_DisclosurePerson.FILE_PATH)?
<img style={{ margin: "0 0 0 15px",width:'150px' }} alt={data.Nav_DisclosurePerson?.NAME} src={config.picServerHost + data.Nav_DisclosurePerson.FILE_PATH} />
:data.Nav_DisclosurePerson?.NAME
(data.Nav_DisclosurePerson && data.Nav_DisclosurePerson.FILE_PATH) ?
<img style={{ margin: "0 0 0 15px", width: '150px' }} alt={data.Nav_DisclosurePerson?.NAME} src={config.picServerHost + data.Nav_DisclosurePerson.FILE_PATH} />
: data.Nav_DisclosurePerson?.NAME
// data.Nav_DisclosurePerson && data.Nav_DisclosurePerson.map((item, i) => {
// if (item.FORM_STATUS >= 1) {
// if (item.Nav_User != null && item.Nav_User.FILE_PATH!= null)
@ -201,9 +201,9 @@ class FO019ShowPrint extends React.Component {
data.IS_OUTSOURCE == false && data.Nav_Person && data.Nav_Person.map((item, i) => {
if (item.DEAL_STATUS == 1) {
if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
return <img style={{ margin: "0 0 0 15px",width:'150px' }} alt={item.Nav_User?.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
return <img style={{ margin: "0 0 0 15px", width: '150px' }} alt={item.Nav_User?.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
else
return <img style={{ margin: "0 0 0 15px",width:'150px' }} title={item.Nav_User?.NAME} />
return <img style={{ margin: "0 0 0 15px", width: '150px' }} title={item.Nav_User?.NAME} />
}
})
}
@ -211,16 +211,16 @@ class FO019ShowPrint extends React.Component {
data.IS_OUTSOURCE == true && data.Nav_Person && data.Nav_Person.map((item, i) => {
if (item.DEAL_STATUS == 1) {
if (item.Nav_RelatedUser != null && item.Nav_RelatedUser.Nav_Signs[0] != null)
return <img style={{ margin: "0 0 0 15px",width:'150px' }} alt={item.Nav_RelatedUser?.NAME} src={config.picServerHost + item.Nav_RelatedUser.Nav_Signs[0].Nav_ImgFile.FILE_PATH} />
return <img style={{ margin: "0 0 0 15px", width: '150px' }} alt={item.Nav_RelatedUser?.NAME} src={config.picServerHost + item.Nav_RelatedUser.Nav_Signs[0].Nav_ImgFile.FILE_PATH} />
else
return <img style={{ margin: "0 0 0 15px",width:'150px' }} title={item.Nav_RelatedUser?.NAME} />
return <img style={{ margin: "0 0 0 15px", width: '150px' }} title={item.Nav_RelatedUser?.NAME} />
}
})
}
</td>
</tr>
</tbody>
</table>:null
</table> : null
}
</div>
{

6
src/components/CustomPages/FO/FO021ShowPrint.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
import React from 'react';
import { initFilter, extendRule, extendInclude,extendIgnoreDataRule , setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel } from "../../../utils/common";
import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel } from "../../../utils/common";
import ReactToPrint from "react-to-print";
import styles from '../HI/StepForm.css';
import config from "../../../config";
@ -60,6 +60,7 @@ class FO021ShowPrint extends React.Component {
loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
// extendInclude(json, 'Nav_JobName.Nav_MonitorUser');
// extendInclude(json, 'Nav_JobNameOut.Nav_MonitorUser');
@ -355,8 +356,7 @@ class FO021ShowPrint extends React.Component {
else
return <img style={{ margin: "0 0 0 8px", width: '150px' }} title={item.Nav_User.NAME} />
}
else if (item.DEAL_STATUS == 0)
{
else if (item.DEAL_STATUS == 0) {
if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
return <label style={{ color: 'red' }} title='未签到'> {item.Nav_User.NAME}</label>
else

5
src/components/CustomPages/FO/FO022ShowPrint.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
import React from 'react';
import { initFilter, extendRule, extendInclude,extendIgnoreDataRule , setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel } from "../../../utils/common";
import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel } from "../../../utils/common";
import ReactToPrint from "react-to-print";
import styles from '../HI/StepForm.css';
import config from "../../../config";
@ -76,6 +76,7 @@ class FO022ShowPrint extends React.Component {
loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
// extendInclude(json, 'Nav_JobName.Nav_MonitorUser');
// extendInclude(json, 'Nav_JobNameOut.Nav_MonitorUser');
@ -127,7 +128,7 @@ class FO022ShowPrint extends React.Component {
/>
<Button style={{ marginLeft: '8px', display: data && data.FORM_STATUS === 2 ? "inline" : "none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >验收</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay,color:'orange' }} onClick={() => this.onTableBtnAgree()} icon="check" >驳回</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay, color: 'orange' }} onClick={() => this.onTableBtnAgree()} icon="check" >驳回</Button>
</div>

1
src/components/CustomPages/FO/FO025ShowPrint.js
View File

@ -58,6 +58,7 @@ class FO025ShowPrint extends React.Component {
loadData = () => {
let that = this;
let json = initFilter(that.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, that.props.data.id);
extendIgnoreDataRule(json)
// extendInclude(json, 'Nav_CrucialLicensePerson');

26
src/components/CustomPages/FO/FO035ShowPrint.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button,Descriptions, Modal,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, showFiles,GetFileModel,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";
@ -54,12 +54,13 @@ class FO035ShowPrint extends React.Component {
}
BtnClose = () => {
if (typeof this.props.data.onCancel != "undefined"&&typeof this.props.data.onCancel == 'function')
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);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
extendIgnoreDataRule(json)
this.props.dispatch({
@ -68,14 +69,13 @@ class FO035ShowPrint extends React.Component {
url: 'FO/FOTechDisclosureFromTech/GetEdit',
onComplete: (ret) => {
if (ret) {
if(this.props.data && this.props.data.loadDataDeal)
{
if (this.props.data && this.props.data.loadDataDeal) {
this.props.data.loadDataDeal(1);
}
this.setState({ data: ret })
if (this.props.data.tableKey=="2" ||this.props.data.tableKey==undefined) {
if (this.props.data.tableKey == "2" || this.props.data.tableKey == undefined) {
this.setState({ BtnAgreeDisplay: 'none' })
}else{
} else {
this.setState({ BtnAgreeDisplay: 'inline' })
}
}
@ -95,11 +95,11 @@ class FO035ShowPrint extends React.Component {
return <div>
<div style={{ padding: '10px' }}>
<ReactToPrint
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }}>打印</Button>}
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.FORM_STATUS === 2 ? "inline" : "none" }}>打印</Button>}
content={() => this.componentRef}
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
<Button style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button style={{ marginLeft: '8px', display: data && data.FORM_STATUS === 2 ? "inline" : "none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >确认</Button>
</div>
@ -135,8 +135,8 @@ class FO035ShowPrint extends React.Component {
<Descriptions.Item label="交底内容">{data.DisclosureContent}</Descriptions.Item>
<Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
<Descriptions.Item label="交底人签字">{
(data.Nav_User && data.Nav_User.FILE_PATH)?
showUserSign(data.Nav_User, config.picServerHost):null
(data.Nav_User && data.Nav_User.FILE_PATH) ?
showUserSign(data.Nav_User, config.picServerHost) : null
// <img style={{ margin: "0 0 0 15px",width:'150px' }} alt={data.Nav_User?.NAME} src={config.picServerHost + data.Nav_User.FILE_PATH} />
// :data.Nav_User?.NAME
}</Descriptions.Item>
@ -145,9 +145,9 @@ class FO035ShowPrint extends React.Component {
if (item.DEAL_STATUS == 1) {
// showUserSign(item.Nav_User, config.picServerHost)
if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
return <img style={{ margin: "0 0 0 15px",width:'150px' }} alt={item.Nav_User?.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
return <img style={{ margin: "0 0 0 15px", width: '150px' }} alt={item.Nav_User?.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
else
return <img style={{ margin: "0 0 0 15px",width:'150px' }} title={item.Nav_User?.NAME} />
return <img style={{ margin: "0 0 0 15px", width: '150px' }} title={item.Nav_User?.NAME} />
}
})
}</Descriptions.Item>

26
src/components/CustomPages/FO/FO037ShowPrint.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button,Descriptions,Modal, 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, showFiles,GetFileModel,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";
@ -54,12 +54,13 @@ class FO037ShowPrint extends React.Component {
}
BtnClose = () => {
if (typeof this.props.data.onCancel != "undefined"&&typeof this.props.data.onCancel == 'function')
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);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
extendIgnoreDataRule(json)
this.props.dispatch({
@ -68,14 +69,13 @@ class FO037ShowPrint extends React.Component {
url: 'FO/FOTechDisclosureFromSafe/GetEdit',
onComplete: (ret) => {
if (ret) {
if(this.props.data && this.props.data.loadDataDeal)
{
if (this.props.data && this.props.data.loadDataDeal) {
this.props.data.loadDataDeal(1);
}
this.setState({ data: ret })
if (this.props.data.tableKey=="2" ||this.props.data.tableKey==undefined) {
if (this.props.data.tableKey == "2" || this.props.data.tableKey == undefined) {
this.setState({ BtnAgreeDisplay: 'none' })
}else{
} else {
this.setState({ BtnAgreeDisplay: 'inline' })
}
}
@ -96,11 +96,11 @@ class FO037ShowPrint extends React.Component {
return <div>
<div style={{ padding: '10px' }}>
<ReactToPrint
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }}>打印</Button>}
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.FORM_STATUS === 2 ? "inline" : "none" }}>打印</Button>}
content={() => this.componentRef}
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
<Button style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button style={{ marginLeft: '8px', display: data && data.FORM_STATUS === 2 ? "inline" : "none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >确认</Button>
</div>
@ -136,8 +136,8 @@ class FO037ShowPrint extends React.Component {
<Descriptions.Item label="交底内容">{data.DisclosureContent}</Descriptions.Item>
<Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
<Descriptions.Item label="交底人签字">{
(data.Nav_User && data.Nav_User.FILE_PATH)?
showUserSign(data.Nav_User, config.picServerHost):null
(data.Nav_User && data.Nav_User.FILE_PATH) ?
showUserSign(data.Nav_User, config.picServerHost) : null
// <img style={{ margin: "0 0 0 15px",width:'150px' }} alt={data.Nav_User?.NAME} src={config.picServerHost + data.Nav_User.FILE_PATH} />
// :data.Nav_User?.NAME
}</Descriptions.Item>
@ -146,9 +146,9 @@ class FO037ShowPrint extends React.Component {
if (item.DEAL_STATUS == 1) {
// showUserSign(item.Nav_User, config.picServerHost)
if (item.Nav_User != null && item.Nav_User.FILE_PATH != null)
return <img style={{ margin: "0 0 0 15px",width:'150px' }} alt={item.Nav_User?.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
return <img style={{ margin: "0 0 0 15px", width: '150px' }} alt={item.Nav_User?.NAME} src={config.picServerHost + item.Nav_User.FILE_PATH} />
else
return <img style={{ margin: "0 0 0 15px",width:'150px' }} title={item.Nav_User?.NAME} />
return <img style={{ margin: "0 0 0 15px", width: '150px' }} title={item.Nav_User?.NAME} />
}
})
}</Descriptions.Item>

30
src/components/CustomPages/FO/FO041ShowPrint.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
import React from 'react';
import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter,showFiles, GetFileModel,showUserSign } from "../../../utils/common";
import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign } from "../../../utils/common";
import ReactToPrint from "react-to-print";
import styles from '../HI/StepForm.css';
import config from "../../../config";
@ -53,12 +53,13 @@ class FO041ShowPrint extends React.Component {
}
BtnClose = () => {
if (typeof this.props.data.onCancel != "undefined"&&typeof this.props.data.onCancel == 'function')
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);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
extendIgnoreDataRule(json)
this.props.dispatch({
@ -67,14 +68,13 @@ class FO041ShowPrint extends React.Component {
url: 'FO/FOLeaderWellRecord/GetEdit',
onComplete: (ret) => {
if (ret) {
if(this.props.data && this.props.data.loadDataDeal)
{
if (this.props.data && this.props.data.loadDataDeal) {
this.props.data.loadDataDeal(1);
}
this.setState({ data: ret })
if (this.props.data.tableKey=="2" ||this.props.data.tableKey==undefined) {
if (this.props.data.tableKey == "2" || this.props.data.tableKey == undefined) {
this.setState({ BtnAgreeDisplay: 'none' })
}else{
} else {
this.setState({ BtnAgreeDisplay: 'inline' })
}
}
@ -95,11 +95,11 @@ class FO041ShowPrint extends React.Component {
return <div>
<div style={{ padding: '10px' }}>
<ReactToPrint
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.STATUS === 15?"inline":"none" }}>打印</Button>}
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 15 ? "inline" : "none" }}>打印</Button>}
content={() => this.componentRef}
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
<Button style={{ marginLeft: '8px',display: data && data.STATUS === 15?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button style={{ marginLeft: '8px', display: data && data.STATUS === 15 ? "inline" : "none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >确认</Button>
</div>
@ -109,7 +109,7 @@ class FO041ShowPrint extends React.Component {
<h1 style={{ textAlign: 'center', margin: '15px' }}>领导带班下井记录</h1>
{
data?
data ?
<div>
<Descriptions size="middle" bordered className={styles.description}>
<Descriptions.Item label="公司">{data.Nav_Company?.NAME}</Descriptions.Item>
@ -144,7 +144,7 @@ class FO041ShowPrint extends React.Component {
}</Descriptions.Item>
</Descriptions>
<Descriptions size="middle" bordered className={styles.description}>
<Descriptions size="middle" bordered className={styles.description}>
<Descriptions.Item label="交班人签字">{
data.Nav_Users && data.Nav_Users.map((item, i) => {
if (item.DEAL_STATUS == 1) {
@ -164,7 +164,7 @@ class FO041ShowPrint extends React.Component {
<Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
</Descriptions>
{
data && data.Nav_Details?
data && data.Nav_Details ?
<table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
<tbody>
@ -196,7 +196,7 @@ class FO041ShowPrint extends React.Component {
<td>
{
item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => {
return item2?.Nav_Area?.NAME +';'
return item2?.Nav_Area?.NAME + ';'
})
}
</td>
@ -216,7 +216,7 @@ class FO041ShowPrint extends React.Component {
{item.Nav_User?.NAME}
</td>
<td>
{item.USER_DEAL_STATUS == 1?showUserSign(item.Nav_User, config.picServerHost):null}
{item.USER_DEAL_STATUS == 1 ? showUserSign(item.Nav_User, config.picServerHost) : null}
</td>
<td>
{item.ITEM}
@ -228,7 +228,7 @@ class FO041ShowPrint extends React.Component {
</table> : null
}
</div>:null
</div> : null
}
</div>
</div>

58
src/components/CustomPages/FO/FO043ShowPrint.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
import React from 'react';
import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter,showFiles, GetFileModel,showUserSign } from "../../../utils/common";
import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign } from "../../../utils/common";
import ReactToPrint from "react-to-print";
import styles from '../HI/StepForm.css';
import config from "../../../config";
@ -54,12 +54,13 @@ class FO043ShowPrint extends React.Component {
}
BtnClose = () => {
if (typeof this.props.data.onCancel != "undefined"&&typeof this.props.data.onCancel == 'function')
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);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
extendIgnoreDataRule(json)
this.props.dispatch({
@ -68,14 +69,13 @@ class FO043ShowPrint extends React.Component {
url: 'FO/FOFireJob/GetEdit',
onComplete: (ret) => {
if (ret) {
if(this.props.data && this.props.data.loadDataDeal)
{
if (this.props.data && this.props.data.loadDataDeal) {
this.props.data.loadDataDeal(1);
}
this.setState({ data: ret })
if (this.props.data.tableKey=="2" ||this.props.data.tableKey==undefined) {
if (this.props.data.tableKey == "2" || this.props.data.tableKey == undefined) {
this.setState({ BtnAgreeDisplay: 'none' })
}else{
} else {
this.setState({ BtnAgreeDisplay: 'inline' })
}
this.onClickApprove(false);
@ -107,11 +107,11 @@ class FO043ShowPrint extends React.Component {
<div style={{ padding: '10px' }}>
<Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
<ReactToPrint
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.STATUS === 30?"inline":"none" }}>打印</Button>}
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
content={() => this.componentRef}
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
<Button style={{ marginLeft: '8px',display: data && data.STATUS === 30?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >审阅</Button>
</div>
@ -144,7 +144,7 @@ class FO043ShowPrint extends React.Component {
{/* <Descriptions.Item label="作业监护人">{data.Nav_MonitorUser?.NAME}</Descriptions.Item> */}
<Descriptions.Item label="动火计划开始时间">{data.JOB_DATE}</Descriptions.Item>
<Descriptions.Item label="动火计划结束时间">{data.JOB_END_DATE}</Descriptions.Item>
<Descriptions.Item label="存在的风险">{ data.Nav_Risks && data.Nav_Risks.map((item, i) => {
<Descriptions.Item label="存在的风险">{data.Nav_Risks && data.Nav_Risks.map((item, i) => {
return item.RISK_NAME + ' '
})}</Descriptions.Item>
<Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
@ -152,7 +152,7 @@ class FO043ShowPrint extends React.Component {
{
data && data.Nav_Users?
data && data.Nav_Users ?
<table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
<tbody>
@ -194,7 +194,7 @@ class FO043ShowPrint extends React.Component {
</table> : null
}
{
data && data.Nav_Details?
data && data.Nav_Details ?
<table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
<tbody>
@ -202,8 +202,8 @@ class FO043ShowPrint extends React.Component {
<td width="100px" className={styles.fontBold}>序号</td>
<td className={styles.fontBold}>作业阶段</td>
<td className={styles.fontBold}>作业流程及安全措施</td>
<td style={{display:data.STATUS == 30?'table-cell':'none'}}className={styles.fontBold}>是否确认</td>
<td style={{display:data.STATUS == 30?'table-cell':'none'}}className={styles.fontBold}>附件</td>
<td style={{ display: data.STATUS == 30 ? 'table-cell' : 'none' }} className={styles.fontBold}>是否确认</td>
<td style={{ display: data.STATUS == 30 ? 'table-cell' : 'none' }} className={styles.fontBold}>附件</td>
</tr>
{
data.Nav_Details && data.Nav_Details.map((item, i) => {
@ -217,11 +217,11 @@ class FO043ShowPrint extends React.Component {
<td>
{item.CONTENT}
</td>
<td style={{display:data.STATUS == 30?'table-cell':'none'}}>
<td style={{ display: data.STATUS == 30 ? 'table-cell' : 'none' }}>
{item.IS_CONFIRM_NEW ? "是" : "否"}
{/* {enums.FOYesOrNoEnum.enums[item.IS_CONFIRM]} */}
</td>
<td style={{display:data.STATUS == 30?'table-cell':'none'}}>
<td style={{ display: data.STATUS == 30 ? 'table-cell' : 'none' }}>
{showFiles(item.Nav_DetailFiles, config.picServerHost, this)}
</td>
@ -231,7 +231,7 @@ class FO043ShowPrint extends React.Component {
</tbody>
</table> : null
}
<Descriptions size="middle" bordered className={styles.description} style={{display:data.STATUS == 30?'block':'none'}}>
<Descriptions size="middle" bordered className={styles.description} style={{ display: data.STATUS == 30 ? 'block' : 'none' }}>
<Descriptions.Item label="动火作业现场条件验收情况">{data.COMPLETED_CONDITION}</Descriptions.Item>
<Descriptions.Item label="是否可以动火">{enums.FOYesOrNoEnum.enums[data.IS_FIRE]}</Descriptions.Item>
<Descriptions.Item label="动火实际开始时间">{data.ACT_DATE}</Descriptions.Item>
@ -239,27 +239,27 @@ class FO043ShowPrint extends React.Component {
<Descriptions.Item label="矿调度室人员">{data.Nav_DispatchUser?.NAME}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签名">{
data.USER_DEAL_STATUS == 1?
data.USER_DEAL_STATUS == 1 ?
showUserSign(data.Nav_FireUser, config.picServerHost)
:null
: null
}</Descriptions.Item>
<Descriptions.Item label="安全管理人员签名">{
data.SAFE_DEAL_STATUS == 1?
data.SAFE_DEAL_STATUS == 1 ?
showUserSign(data.Nav_SafeUser, config.picServerHost)
:null
: null
}</Descriptions.Item>
<Descriptions.Item label="矿调度人员签名">{
data.DISPATCH_DEAL_STATUS == 1?
data.DISPATCH_DEAL_STATUS == 1 ?
showUserSign(data.Nav_DispatchUser, config.picServerHost)
:null
: null
}</Descriptions.Item>
</Descriptions>
<Descriptions size="middle" bordered className={styles.description} style={{display:data.FIRE_STATUS > 15?'block':'none'}}>
<Descriptions size="middle" bordered className={styles.description} style={{ display: data.FIRE_STATUS > 15 ? 'block' : 'none' }}>
<Descriptions.Item label="动火作业完工验收情况">{
data.COMPLETED_CONTENT
}</Descriptions.Item>
@ -276,14 +276,14 @@ class FO043ShowPrint extends React.Component {
showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签字">{
data.USER_DEAL_FINISH_STATUS == 1?
data.USER_DEAL_FINISH_STATUS == 1 ?
showUserSign(data.Nav_FireUser, config.picServerHost)
:null
: null
}</Descriptions.Item>
<Descriptions.Item label="安全生产管理人员签字">{
data.SAFE_DEAL_FINISH_STATUS == 1?
data.SAFE_DEAL_FINISH_STATUS == 1 ?
showUserSign(data.Nav_SafeUser, config.picServerHost)
:null
: null
}</Descriptions.Item>
</Descriptions>
@ -296,4 +296,4 @@ class FO043ShowPrint extends React.Component {
}
}
export default connect(({ login,app }) => ({ login,app }))(FO043ShowPrint)
export default connect(({ login, app }) => ({ login, app }))(FO043ShowPrint)

58
src/components/CustomPages/FO/FO045ShowPrint.js
View File

@ -1,7 +1,7 @@
import { message } from "antd/lib/index";
import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
import React from 'react';
import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter,showFiles, GetFileModel,showUserSign } from "../../../utils/common";
import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign } from "../../../utils/common";
import ReactToPrint from "react-to-print";
import styles from '../HI/StepForm.css';
import config from "../../../config";
@ -54,12 +54,13 @@ class FO045ShowPrint extends React.Component {
}
BtnClose = () => {
if (typeof this.props.data.onCancel != "undefined"&&typeof this.props.data.onCancel == 'function')
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);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
extendIgnoreDataRule(json)
this.props.dispatch({
@ -68,14 +69,13 @@ class FO045ShowPrint extends React.Component {
url: 'FO/FOFireJobWb/GetEdit',
onComplete: (ret) => {
if (ret) {
if(this.props.data && this.props.data.loadDataDeal)
{
if (this.props.data && this.props.data.loadDataDeal) {
this.props.data.loadDataDeal(1);
}
this.setState({ data: ret })
if (this.props.data.tableKey=="2" ||this.props.data.tableKey==undefined) {
if (this.props.data.tableKey == "2" || this.props.data.tableKey == undefined) {
this.setState({ BtnAgreeDisplay: 'none' })
}else{
} else {
this.setState({ BtnAgreeDisplay: 'inline' })
}
this.onClickApprove(false);
@ -107,11 +107,11 @@ class FO045ShowPrint extends React.Component {
<div style={{ padding: '10px' }}>
<Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
<ReactToPrint
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.STATUS === 30?"inline":"none" }}>打印</Button>}
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
content={() => this.componentRef}
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
<Button style={{ marginLeft: '8px',display: data && data.STATUS === 30?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >审阅</Button>
</div>
@ -146,7 +146,7 @@ class FO045ShowPrint extends React.Component {
<Descriptions.Item label="作业监护人">{data.Nav_MonitorUser?.NAME}</Descriptions.Item>
<Descriptions.Item label="动火计划开始时间">{data.JOB_DATE}</Descriptions.Item>
<Descriptions.Item label="动火计划结束时间">{data.JOB_END_DATE}</Descriptions.Item>
<Descriptions.Item label="存在的风险">{ data.Nav_Risks && data.Nav_Risks.map((item, i) => {
<Descriptions.Item label="存在的风险">{data.Nav_Risks && data.Nav_Risks.map((item, i) => {
return item.RISK_NAME + ' '
})}</Descriptions.Item>
<Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
@ -154,7 +154,7 @@ class FO045ShowPrint extends React.Component {
{
data && data.Nav_Users?
data && data.Nav_Users ?
<table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
<tbody>
@ -196,7 +196,7 @@ class FO045ShowPrint extends React.Component {
</table> : null
}
{
data && data.Nav_Details?
data && data.Nav_Details ?
<table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
<tbody>
@ -204,8 +204,8 @@ class FO045ShowPrint extends React.Component {
<td width="100px" className={styles.fontBold}>序号</td>
<td className={styles.fontBold}>作业阶段</td>
<td className={styles.fontBold}>作业流程及安全措施</td>
<td style={{display:data.STATUS == 30?'table-cell':'none'}}className={styles.fontBold}>是否确认</td>
<td style={{display:data.STATUS == 30?'table-cell':'none'}}className={styles.fontBold}>附件</td>
<td style={{ display: data.STATUS == 30 ? 'table-cell' : 'none' }} className={styles.fontBold}>是否确认</td>
<td style={{ display: data.STATUS == 30 ? 'table-cell' : 'none' }} className={styles.fontBold}>附件</td>
</tr>
{
data.Nav_Details && data.Nav_Details.map((item, i) => {
@ -219,11 +219,11 @@ class FO045ShowPrint extends React.Component {
<td>
{item.CONTENT}
</td>
<td style={{display:data.STATUS == 30?'table-cell':'none'}}>
<td style={{ display: data.STATUS == 30 ? 'table-cell' : 'none' }}>
{item.IS_CONFIRM_NEW ? "是" : "否"}
{/* {enums.FOYesOrNoEnum.enums[item.IS_CONFIRM]} */}
</td>
<td style={{display:data.STATUS == 30?'table-cell':'none'}}>
<td style={{ display: data.STATUS == 30 ? 'table-cell' : 'none' }}>
{showFiles(item.Nav_DetailFiles, config.picServerHost, this)}
</td>
@ -233,33 +233,33 @@ class FO045ShowPrint extends React.Component {
</tbody>
</table> : null
}
<Descriptions size="middle" bordered className={styles.description}style={{display:data.STATUS == 30?'block':'none'}}>
<Descriptions size="middle" bordered className={styles.description} style={{ display: data.STATUS == 30 ? 'block' : 'none' }}>
<Descriptions.Item label="动火作业现场条件验收情况">{data.COMPLETED_CONDITION}</Descriptions.Item>
<Descriptions.Item label="是否可以动火">{enums.FOYesOrNoEnum.enums[data.IS_FIRE]}</Descriptions.Item>
<Descriptions.Item label="动火实际开始时间">{data.ACT_DATE}</Descriptions.Item>
<Descriptions.Item label="现场条件验收附件"> {showFiles(data.Nav_FireFiles, config.picServerHost, this)}</Descriptions.Item>
<Descriptions.Item label="矿调度室人员">{data.Nav_DispatchUser?.NAME}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签名">{
data.USER_DEAL_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
data.USER_DEAL_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile ?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_FireUser[0].Nav_ImgFile.FILE_PATH} />
:null
: null
}</Descriptions.Item>
<Descriptions.Item label="安全管理人员签名">{
data.SAFE_DEAL_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
data.SAFE_DEAL_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile ?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_SafeUser[0].Nav_ImgFile.FILE_PATH} />
:null
: null
}</Descriptions.Item>
<Descriptions.Item label="矿调度人员签名">{
data.DISPATCH_DEAL_STATUS == 1?
data.DISPATCH_DEAL_STATUS == 1 ?
showUserSign(data.Nav_DispatchUser, config.picServerHost)
:null
: null
}</Descriptions.Item>
</Descriptions>
<Descriptions size="middle" bordered className={styles.description} style={{display:data.FIRE_STATUS >= 10?'block':'none'}}>
<Descriptions size="middle" bordered className={styles.description} style={{ display: data.FIRE_STATUS >= 10 ? 'block' : 'none' }}>
<Descriptions.Item label="动火作业完工验收情况">{
data.COMPLETED_CONTENT
}</Descriptions.Item>
@ -276,14 +276,14 @@ class FO045ShowPrint extends React.Component {
showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签字">{
data.USER_DEAL_FINISH_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
data.USER_DEAL_FINISH_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile ?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_FireUser[0].Nav_ImgFile.FILE_PATH} />
:null
: null
}</Descriptions.Item>
<Descriptions.Item label="安全生产管理人员签字">{
data.SAFE_DEAL_FINISH_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
data.SAFE_DEAL_FINISH_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile ?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_SafeUser[0].Nav_ImgFile.FILE_PATH} />
:null
: null
}</Descriptions.Item>
</Descriptions>
@ -295,4 +295,4 @@ class FO045ShowPrint extends React.Component {
}
}
export default connect(({ login,app }) => ({ login,app }))(FO045ShowPrint)
export default connect(({ login, app }) => ({ login, app }))(FO045ShowPrint)

1
src/components/CustomPages/FO/FOChangeShfitRecord.js
View File

@ -63,6 +63,7 @@ class FOChangeShfitRecord extends React.Component {
loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, dataId);
extendInclude(json, 'Nav_Class');
extendInclude(json, 'Nav_Team');

1
src/components/CustomPages/FO/FoTeamActivityShowPrint.js
View File

@ -99,6 +99,7 @@ class FoTeamActivityShowPrint extends React.Component {
var orgId = this.props.login ? this.props.login.OrgId : ''; //登录后有存储登录信息
let json = initFilter(orgId);
json.Parameter22 = this.props.data.ORG_ID_HV;
extendRule(json, 'ID', 1, id); //ID=‘’，字段，等于，条件值， 1代表=，2代表不等于，3小于，4小于等于，5大于，6大于等于，7以开始的Like,8以结束的Like，9包含
extendInclude(json, 'Nav_Taem');
extendInclude(json, 'Nav_User');