From f685435a7795c1ac02af71532f717c39308bdb76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Mon, 22 Dec 2025 16:45:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=8E=B0=E5=9C=BA=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=A2=9E=E5=8A=A0json.Parameter22=20=3D=20this.props.?= =?UTF-8?q?data.ORG=5FID=5FHV;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/FO/FO003ShowPrint.js | 3 +- .../CustomPages/FO/FO005ShowPrint.js | 1 + .../CustomPages/FO/FO008ShowPrint.js | 1 + .../CustomPages/FO/FO015ShowPrint.js | 3 +- .../CustomPages/FO/FO017ShowPrint.js | 5 +- .../CustomPages/FO/FO019ShowPrint.js | 214 +++++------ .../CustomPages/FO/FO021ShowPrint.js | 8 +- .../CustomPages/FO/FO022ShowPrint.js | 7 +- .../CustomPages/FO/FO025ShowPrint.js | 3 +- .../CustomPages/FO/FO035ShowPrint.js | 60 +-- .../CustomPages/FO/FO037ShowPrint.js | 108 +++--- .../CustomPages/FO/FO041ShowPrint.js | 260 ++++++------- .../CustomPages/FO/FO043ShowPrint.js | 350 +++++++++--------- .../CustomPages/FO/FO045ShowPrint.js | 348 ++++++++--------- .../CustomPages/FO/FOChangeShfitRecord.js | 1 + .../CustomPages/FO/FoTeamActivityShowPrint.js | 1 + 16 files changed, 691 insertions(+), 682 deletions(-) diff --git a/src/components/CustomPages/FO/FO003ShowPrint.js b/src/components/CustomPages/FO/FO003ShowPrint.js index 33041c9..7cf20e0 100644 --- a/src/components/CustomPages/FO/FO003ShowPrint.js +++ b/src/components/CustomPages/FO/FO003ShowPrint.js @@ -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'); diff --git a/src/components/CustomPages/FO/FO005ShowPrint.js b/src/components/CustomPages/FO/FO005ShowPrint.js index 4a1b19d..da6c72c 100644 --- a/src/components/CustomPages/FO/FO005ShowPrint.js +++ b/src/components/CustomPages/FO/FO005ShowPrint.js @@ -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'); diff --git a/src/components/CustomPages/FO/FO008ShowPrint.js b/src/components/CustomPages/FO/FO008ShowPrint.js index 9b33e00..d197b18 100644 --- a/src/components/CustomPages/FO/FO008ShowPrint.js +++ b/src/components/CustomPages/FO/FO008ShowPrint.js @@ -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'); diff --git a/src/components/CustomPages/FO/FO015ShowPrint.js b/src/components/CustomPages/FO/FO015ShowPrint.js index 1838e97..5806930 100644 --- a/src/components/CustomPages/FO/FO015ShowPrint.js +++ b/src/components/CustomPages/FO/FO015ShowPrint.js @@ -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'); @@ -93,7 +94,7 @@ class FO015ShowPrint extends React.Component { this.setState({ BtnAgreeDisplay: 'inline' }) } } - + } }); } diff --git a/src/components/CustomPages/FO/FO017ShowPrint.js b/src/components/CustomPages/FO/FO017ShowPrint.js index 08f5ca6..d07d7de 100644 --- a/src/components/CustomPages/FO/FO017ShowPrint.js +++ b/src/components/CustomPages/FO/FO017ShowPrint.js @@ -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'); @@ -82,7 +83,7 @@ class FO017ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } @@ -175,7 +176,7 @@ class FO017ShowPrint extends React.Component { }) } - + : null } diff --git a/src/components/CustomPages/FO/FO019ShowPrint.js b/src/components/CustomPages/FO/FO019ShowPrint.js index f80a43d..0b77a2a 100644 --- a/src/components/CustomPages/FO/FO019ShowPrint.js +++ b/src/components/CustomPages/FO/FO019ShowPrint.js @@ -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
} + trigger={() => } content={() => this.componentRef} pageStyle=".printDIV { padding:0 40px;} img{width :120px}" /> - +
@@ -120,107 +120,107 @@ class FO019ShowPrint extends React.Component {

安全技术交底表

{ - data ? - - - - - - - - - - - - - - - - - - - + + +
编号{data.CODE}作业名称{data.Nav_OperationStep?data.Nav_OperationStep?.NAME:''}
作业地点{data.JOB_LOCATION}交底时间{data.DISCLOSURE_DATE?data.DISCLOSURE_DATE:null}
交底人{data.Nav_DisclosurePerson?data.Nav_DisclosurePerson?.NAME:''}被交底人{ - data.IS_OUTSOURCE == false && data.Nav_Person && data.Nav_Person.map((item, i) => { - if (i == (data.Nav_Person.length - 1)) { - if (item.DEAL_STATUS == 0) - return - else - return item.Nav_User?.NAME - } else { - if (item.DEAL_STATUS == 0) - return - else - return item.Nav_User?.NAME + ' ' + data ? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - -
编号{data.CODE}作业名称{data.Nav_OperationStep ? data.Nav_OperationStep?.NAME : ''}
作业地点{data.JOB_LOCATION}交底时间{data.DISCLOSURE_DATE ? data.DISCLOSURE_DATE : null}
交底人{data.Nav_DisclosurePerson ? data.Nav_DisclosurePerson?.NAME : ''}被交底人{ + data.IS_OUTSOURCE == false && data.Nav_Person && data.Nav_Person.map((item, i) => { + if (i == (data.Nav_Person.length - 1)) { + if (item.DEAL_STATUS == 0) + return + else + return item.Nav_User?.NAME + } else { + if (item.DEAL_STATUS == 0) + return + else + return item.Nav_User?.NAME + ' ' + } + }) } - }) - } - { - data.IS_OUTSOURCE == true && data.Nav_Person && data.Nav_Person.map((item, i) => { - if (i == (data.Nav_Person.length - 1)) { - if (item.DEAL_STATUS == 0) - return - else - return item.Nav_RelatedUser?.NAME - } else { - if (item.DEAL_STATUS == 0) - return - else - return item.Nav_RelatedUser?.NAME + ' ' + { + data.IS_OUTSOURCE == true && data.Nav_Person && data.Nav_Person.map((item, i) => { + if (i == (data.Nav_Person.length - 1)) { + if (item.DEAL_STATUS == 0) + return + else + return item.Nav_RelatedUser?.NAME + } else { + if (item.DEAL_STATUS == 0) + return + else + return item.Nav_RelatedUser?.NAME + ' ' + } + }) + } +
交底内容{data.DisclosureContent}
附件{showFiles(data.Nav_Files, config.picServerHost, this)}
交底人签字{ + (data.Nav_DisclosurePerson && data.Nav_DisclosurePerson.FILE_PATH) ? + {data.Nav_DisclosurePerson?.NAME} + : 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) + // return {item.Nav_User.NAME} + // else + // return + // } + // }) + }
被交底人签字{ + 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 {item.Nav_User?.NAME} + else + return + } + }) } - }) - } -
交底内容{data.DisclosureContent}
附件{showFiles(data.Nav_Files, config.picServerHost, this)}
交底人签字{ - (data.Nav_DisclosurePerson && data.Nav_DisclosurePerson.FILE_PATH)? - {data.Nav_DisclosurePerson?.NAME} - :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) - // return {item.Nav_User.NAME} - // else - // return - // } - // }) - }
被交底人签字{ - 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 {item.Nav_User?.NAME} - else - return + { + 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 {item.Nav_RelatedUser?.NAME} + else + return + } + }) } - }) - } - { - 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 {item.Nav_RelatedUser?.NAME} - else - return - } - }) - } -
:null +
: null }
{ diff --git a/src/components/CustomPages/FO/FO021ShowPrint.js b/src/components/CustomPages/FO/FO021ShowPrint.js index 1c5dd69..7ca1292 100644 --- a/src/components/CustomPages/FO/FO021ShowPrint.js +++ b/src/components/CustomPages/FO/FO021ShowPrint.js @@ -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,13 +356,12 @@ class FO021ShowPrint extends React.Component { else return } - else if (item.DEAL_STATUS == 0) - { + else if (item.DEAL_STATUS == 0) { if (item.Nav_User != null && item.Nav_User.FILE_PATH != null) return else return item.Nav_User.NAME - } + } })} diff --git a/src/components/CustomPages/FO/FO022ShowPrint.js b/src/components/CustomPages/FO/FO022ShowPrint.js index ce3d5f5..0066b9b 100644 --- a/src/components/CustomPages/FO/FO022ShowPrint.js +++ b/src/components/CustomPages/FO/FO022ShowPrint.js @@ -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'); @@ -104,7 +105,7 @@ class FO022ShowPrint extends React.Component { this.setState({ BtnAgreeDisplay: 'inline' }) } } - + } }); } @@ -127,7 +128,7 @@ class FO022ShowPrint extends React.Component { /> - + diff --git a/src/components/CustomPages/FO/FO025ShowPrint.js b/src/components/CustomPages/FO/FO025ShowPrint.js index 56d9c8a..7d9c017 100644 --- a/src/components/CustomPages/FO/FO025ShowPrint.js +++ b/src/components/CustomPages/FO/FO025ShowPrint.js @@ -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'); @@ -82,7 +83,7 @@ class FO025ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } diff --git a/src/components/CustomPages/FO/FO035ShowPrint.js b/src/components/CustomPages/FO/FO035ShowPrint.js index 316d27f..e7281b2 100644 --- a/src/components/CustomPages/FO/FO035ShowPrint.js +++ b/src/components/CustomPages/FO/FO035ShowPrint.js @@ -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
} + trigger={() => } content={() => this.componentRef} pageStyle=".printDIV { padding:0 40px;} img{width :120px}" /> - +
@@ -109,8 +109,8 @@ class FO035ShowPrint extends React.Component {

技术交底表

{ - data ? -
+ data ? +
{data.CODE} {/* {data.NAME} */} @@ -118,36 +118,36 @@ class FO035ShowPrint extends React.Component { {data.JOB_LOCATION} {data.Nav_User ? data.Nav_User.NAME : ''} { - data.Nav_Person && data.Nav_Person.map((item, i) => { - if (i == (data.Nav_Person.length - 1)) { - if (item.DEAL_STATUS == 0) - return - else - return item.Nav_User?.NAME - } else { - if (item.DEAL_STATUS == 0) - return - else - return item.Nav_User?.NAME + ' ' - } - }) - } + data.Nav_Person && data.Nav_Person.map((item, i) => { + if (i == (data.Nav_Person.length - 1)) { + if (item.DEAL_STATUS == 0) + return + else + return item.Nav_User?.NAME + } else { + if (item.DEAL_STATUS == 0) + return + else + return item.Nav_User?.NAME + ' ' + } + }) + } {data.DisclosureContent} {showFiles(data.Nav_Files, config.picServerHost, this)} { - (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 // {data.Nav_User?.NAME} // :data.Nav_User?.NAME } { - data.Nav_Person && data.Nav_Person.map((item, i) => { + data.Nav_Person && data.Nav_Person.map((item, i) => { if (item.DEAL_STATUS == 1) { // showUserSign(item.Nav_User, config.picServerHost) if (item.Nav_User != null && item.Nav_User.FILE_PATH != null) - return {item.Nav_User?.NAME} + return {item.Nav_User?.NAME} else - return + return } }) } diff --git a/src/components/CustomPages/FO/FO037ShowPrint.js b/src/components/CustomPages/FO/FO037ShowPrint.js index ec794b0..5d8aa50 100644 --- a/src/components/CustomPages/FO/FO037ShowPrint.js +++ b/src/components/CustomPages/FO/FO037ShowPrint.js @@ -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,18 +69,17 @@ 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
} + trigger={() => } content={() => this.componentRef} pageStyle=".printDIV { padding:0 40px;} img{width :120px}" /> - +
@@ -110,50 +110,50 @@ class FO037ShowPrint extends React.Component {

安全交底表

{ - data ? -
- - {data.CODE} - {/* {data.NAME} */} - {data.DISCLOSURE_DATE} - {data.JOB_LOCATION} - {data.Nav_User ? data.Nav_User.NAME : ''} - { - data.Nav_Person && data.Nav_Person.map((item, i) => { - if (i == (data.Nav_Person.length - 1)) { - if (item.DEAL_STATUS == 0) - return - else - return item.Nav_User?.NAME - } else { - if (item.DEAL_STATUS == 0) - return - else - return item.Nav_User?.NAME + ' ' - } - }) - } - {data.DisclosureContent} - {showFiles(data.Nav_Files, config.picServerHost, this)} - { - (data.Nav_User && data.Nav_User.FILE_PATH)? - showUserSign(data.Nav_User, config.picServerHost):null - // {data.Nav_User?.NAME} - // :data.Nav_User?.NAME - } - { - data.Nav_Person && data.Nav_Person.map((item, i) => { - if (item.DEAL_STATUS == 1) { - // showUserSign(item.Nav_User, config.picServerHost) - if (item.Nav_User != null && item.Nav_User.FILE_PATH != null) - return {item.Nav_User?.NAME} - else - return - } - }) - } - -
: null + data ? +
+ + {data.CODE} + {/* {data.NAME} */} + {data.DISCLOSURE_DATE} + {data.JOB_LOCATION} + {data.Nav_User ? data.Nav_User.NAME : ''} + { + data.Nav_Person && data.Nav_Person.map((item, i) => { + if (i == (data.Nav_Person.length - 1)) { + if (item.DEAL_STATUS == 0) + return + else + return item.Nav_User?.NAME + } else { + if (item.DEAL_STATUS == 0) + return + else + return item.Nav_User?.NAME + ' ' + } + }) + } + {data.DisclosureContent} + {showFiles(data.Nav_Files, config.picServerHost, this)} + { + (data.Nav_User && data.Nav_User.FILE_PATH) ? + showUserSign(data.Nav_User, config.picServerHost) : null + // {data.Nav_User?.NAME} + // :data.Nav_User?.NAME + } + { + data.Nav_Person && data.Nav_Person.map((item, i) => { + if (item.DEAL_STATUS == 1) { + // showUserSign(item.Nav_User, config.picServerHost) + if (item.Nav_User != null && item.Nav_User.FILE_PATH != null) + return {item.Nav_User?.NAME} + else + return + } + }) + } + +
: null }
{ diff --git a/src/components/CustomPages/FO/FO041ShowPrint.js b/src/components/CustomPages/FO/FO041ShowPrint.js index 95acd08..fd7124c 100644 --- a/src/components/CustomPages/FO/FO041ShowPrint.js +++ b/src/components/CustomPages/FO/FO041ShowPrint.js @@ -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,18 +68,17 @@ 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
} + trigger={() => } content={() => this.componentRef} pageStyle=".printDIV { padding:0 40px;} img{width :120px}" /> - +
@@ -108,129 +108,129 @@ class FO041ShowPrint extends React.Component {
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id} className="printDIV">

领导带班下井记录

- { - data? -
- - {data.Nav_Company?.NAME} - {data.Nav_ProductionUnit?.NAME} - {data.CREATE_TIME} - - {data.Nav_ApplyDepartment?.NAME} - {data.Nav_ApplyUser?.NAME} - { - data.Nav_Users && data.Nav_Users.map((item, i) => { - return item.Nav_User?.NAME + ' ' - }) - } - {data.JOB_START_DATE} - {data.JOB_END_DATE} - {data.Nav_Class?.NAME} - - + { + data ? +
+ + {data.Nav_Company?.NAME} + {data.Nav_ProductionUnit?.NAME} + {data.CREATE_TIME} - - {data.PLACE} - { - data.Nav_Users && data.Nav_Users.map((item, i) => { - return item.Nav_User?.NAME + ' ' - }) - } - { - data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => { - return item.Nav_AfterUser?.NAME + ' ' - }) - - } - - - - { - data.Nav_Users && data.Nav_Users.map((item, i) => { - if (item.DEAL_STATUS == 1) { - return {item.Nav_User?.NAME} - } - }) - - } - - { - data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => { - if (item.AFTER_USER_DEAL_STATUS == 1) { - return {item.Nav_AfterUser?.NAME} - } - }) - } - {showFiles(data.Nav_Files, config.picServerHost, this)} - - { - data && data.Nav_Details? - - - - - - - - - - - - - - - - - { - data.Nav_Details && data.Nav_Details.map((item, i) => { - return - - - - - - - - - - - + } + {data.JOB_START_DATE} + {data.JOB_END_DATE} + {data.Nav_Class?.NAME} + + + + + {data.PLACE} + { + data.Nav_Users && data.Nav_Users.map((item, i) => { + return item.Nav_User?.NAME + ' ' + }) + } + { + data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => { + return item.Nav_AfterUser?.NAME + ' ' + }) + + } + + + + { + data.Nav_Users && data.Nav_Users.map((item, i) => { + if (item.DEAL_STATUS == 1) { + return {item.Nav_User?.NAME} + } + }) + + } + + { + data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => { + if (item.AFTER_USER_DEAL_STATUS == 1) { + return {item.Nav_AfterUser?.NAME} + } + }) + } + {showFiles(data.Nav_Files, config.picServerHost, this)} + + { + data && data.Nav_Details ? +
序号开始时间结束时间巡视区域现场情况描述发现问题处置措施附件现场责任人现场责任人签名交接事项
- {i + 1} - - {item.START_DATE} - - {item.END_DATE} - - { - item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => { - return item2?.Nav_Area?.NAME +';' + {data.Nav_ApplyDepartment?.NAME} + {data.Nav_ApplyUser?.NAME} + { + data.Nav_Users && data.Nav_Users.map((item, i) => { + return item.Nav_User?.NAME + ' ' }) - } - - {item.DESCRIPTION} - - {item.QUESTION} - - {item.MEASURE} - - {showFiles(item.Nav_DetailFiles, config.picServerHost, this)} - - {item.Nav_User?.NAME} - - {item.USER_DEAL_STATUS == 1?showUserSign(item.Nav_User, config.picServerHost):null} - - {item.ITEM} -
+ + + + + + + + + + + + + + - }) - } - -
序号开始时间结束时间巡视区域现场情况描述发现问题处置措施附件现场责任人现场责任人签名交接事项
: null - } - -
:null - } -
+ { + data.Nav_Details && data.Nav_Details.map((item, i) => { + return + + {i + 1} + + + {item.START_DATE} + + + {item.END_DATE} + + + { + item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => { + return item2?.Nav_Area?.NAME + ';' + }) + } + + + {item.DESCRIPTION} + + + {item.QUESTION} + + + {item.MEASURE} + + + {showFiles(item.Nav_DetailFiles, config.picServerHost, this)} + + + {item.Nav_User?.NAME} + + + {item.USER_DEAL_STATUS == 1 ? showUserSign(item.Nav_User, config.picServerHost) : null} + + + {item.ITEM} + + + }) + } + + : null + } + +
: null + } +
} diff --git a/src/components/CustomPages/FO/FO043ShowPrint.js b/src/components/CustomPages/FO/FO043ShowPrint.js index 45992f5..b3d21c3 100644 --- a/src/components/CustomPages/FO/FO043ShowPrint.js +++ b/src/components/CustomPages/FO/FO043ShowPrint.js @@ -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,19 +69,18 @@ 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); } - + } }); } @@ -105,13 +105,13 @@ class FO043ShowPrint extends React.Component { const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; return
- + } + trigger={() => } content={() => this.componentRef} pageStyle=".printDIV { padding:0 40px;} img{width :120px}" /> - +
@@ -121,179 +121,179 @@ class FO043ShowPrint extends React.Component {

动火作业工作票

{ - data ? -
- - {data.Nav_Company?.NAME} - {data.Nav_ProductionUnit?.NAME} - {data.CREATE_TIME} - - {data.Nav_ApplyDepartment?.NAME} - {data.Nav_ApplyUser?.NAME} - {data.CODE} - {data.Nav_OperationStep?.NAME} - {enums.HMOperationTaskAuditEnum.enums[data.AUDIT_LEVEL]} - {enums.SKEvaluateLevelEnum.enums[data.EVALUATE_LEVEL]} - {data.Nav_FireDepartment?.NAME} - {data.Nav_FireUser?.NAME} - {data.Nav_SafeUser?.NAME} - {data.Nav_Area?.NAME} - {data.JOB_CONTENT} - {data.Nav_Type?.NAME} - {data.JOB_CONTENT} - {/* {data.Nav_MonitorUser?.NAME} */} - {data.JOB_DATE} - {data.JOB_END_DATE} - { data.Nav_Risks && data.Nav_Risks.map((item, i) => { - return item.RISK_NAME + ' ' - })} - {showFiles(data.Nav_Files, config.picServerHost, this)} - - - - { - data && data.Nav_Users? - - + data ? +
+ + {data.Nav_Company?.NAME} + {data.Nav_ProductionUnit?.NAME} + {data.CREATE_TIME} -
- - - - - - {/* */} - - { - data.Nav_Users && data.Nav_Users.map((item, i) => { - return - - - - - - {/* - - - - - - - { - data.Nav_Details && data.Nav_Details.map((item, i) => { - return - - - - - - - - }) - } - -
序号作业人员类别姓名证书编号附件签名
- {i + 1} - - {item.Nav_UserType?.NAME} - - {item.Nav_User?.NAME} - - {item.CERTIFICATE_CODE} - - {showFiles(item.Nav_UserFiles, config.picServerHost, this)} - + {data.Nav_ApplyDepartment?.NAME} + {data.Nav_ApplyUser?.NAME} + {data.CODE} + {data.Nav_OperationStep?.NAME} + {enums.HMOperationTaskAuditEnum.enums[data.AUDIT_LEVEL]} + {enums.SKEvaluateLevelEnum.enums[data.EVALUATE_LEVEL]} + {data.Nav_FireDepartment?.NAME} + {data.Nav_FireUser?.NAME} + {data.Nav_SafeUser?.NAME} + {data.Nav_Area?.NAME} + {data.JOB_CONTENT} + {data.Nav_Type?.NAME} + {data.JOB_CONTENT} + {/* {data.Nav_MonitorUser?.NAME} */} + {data.JOB_DATE} + {data.JOB_END_DATE} + {data.Nav_Risks && data.Nav_Risks.map((item, i) => { + return item.RISK_NAME + ' ' + })} + {showFiles(data.Nav_Files, config.picServerHost, this)} + + + + { + data && data.Nav_Users ? + + + + + + + + + + {/* */} + + { + data.Nav_Users && data.Nav_Users.map((item, i) => { + return + + + + + + {/* */} - - }) - } - -
序号作业人员类别姓名证书编号附件签名
+ {i + 1} + + {item.Nav_UserType?.NAME} + + {item.Nav_User?.NAME} + + {item.CERTIFICATE_CODE} + + {showFiles(item.Nav_UserFiles, config.picServerHost, this)} + { item.DEAL_STATUS == 1? showUserSign(item.Nav_User, config.picServerHost):null }
: null - } - { - data && data.Nav_Details? - - + + }) + } + +
: null + } + { + data && data.Nav_Details ? + + + + + + + + + + + { + data.Nav_Details && data.Nav_Details.map((item, i) => { + return + + + + + + + + }) + } + +
序号作业阶段作业流程及安全措施是否确认附件
+ {i + 1} + + {enums.FOJobStepEnum.enums[item.JOB_STEP]} + + {item.CONTENT} + + {item.IS_CONFIRM_NEW ? "是" : "否"} + {/* {enums.FOYesOrNoEnum.enums[item.IS_CONFIRM]} */} + + {showFiles(item.Nav_DetailFiles, config.picServerHost, this)} +
: null + } + + {data.COMPLETED_CONDITION} + {enums.FOYesOrNoEnum.enums[data.IS_FIRE]} + {data.ACT_DATE} + {showFiles(data.Nav_FireFiles, config.picServerHost, this)} + {data.Nav_DispatchUser?.NAME} + { + + data.USER_DEAL_STATUS == 1 ? + showUserSign(data.Nav_FireUser, config.picServerHost) + : null + + } + { + + data.SAFE_DEAL_STATUS == 1 ? + showUserSign(data.Nav_SafeUser, config.picServerHost) + : null + + } + { + + data.DISPATCH_DEAL_STATUS == 1 ? + showUserSign(data.Nav_DispatchUser, config.picServerHost) + : null + + } + + 15 ? 'block' : 'none' }}> + { + data.COMPLETED_CONTENT + } + { + enums.FOYesOrNoEnum.enums[data.IS_LEAVE] + } + { + data.ACT_END_DATE + } + { + data.LEAVE_DATE + } + { + showFiles(data.Nav_MonitorFiles, config.picServerHost, this) + } + { + data.USER_DEAL_FINISH_STATUS == 1 ? + showUserSign(data.Nav_FireUser, config.picServerHost) + : null + } + { + data.SAFE_DEAL_FINISH_STATUS == 1 ? + showUserSign(data.Nav_SafeUser, config.picServerHost) + : null + } + + + + : null -
序号作业阶段作业流程及安全措施是否确认附件
- {i + 1} - - {enums.FOJobStepEnum.enums[item.JOB_STEP]} - - {item.CONTENT} - - {item.IS_CONFIRM_NEW ? "是" : "否"} - {/* {enums.FOYesOrNoEnum.enums[item.IS_CONFIRM]} */} - - {showFiles(item.Nav_DetailFiles, config.picServerHost, this)} -
: null - } - - {data.COMPLETED_CONDITION} - {enums.FOYesOrNoEnum.enums[data.IS_FIRE]} - {data.ACT_DATE} - {showFiles(data.Nav_FireFiles, config.picServerHost, this)} - {data.Nav_DispatchUser?.NAME} - { - - data.USER_DEAL_STATUS == 1? - showUserSign(data.Nav_FireUser, config.picServerHost) - :null - - } - { - - data.SAFE_DEAL_STATUS == 1? - showUserSign(data.Nav_SafeUser, config.picServerHost) - :null - - } - { - - data.DISPATCH_DEAL_STATUS == 1? - showUserSign(data.Nav_DispatchUser, config.picServerHost) - :null - - } - - 15?'block':'none'}}> - { - data.COMPLETED_CONTENT - } - { - enums.FOYesOrNoEnum.enums[data.IS_LEAVE] - } - { - data.ACT_END_DATE - } - { - data.LEAVE_DATE - } - { - showFiles(data.Nav_MonitorFiles, config.picServerHost, this) - } - { - data.USER_DEAL_FINISH_STATUS == 1? - showUserSign(data.Nav_FireUser, config.picServerHost) - :null - } - { - data.SAFE_DEAL_FINISH_STATUS == 1? - showUserSign(data.Nav_SafeUser, config.picServerHost) - :null - } - - - -
: null - }
} } -export default connect(({ login,app }) => ({ login,app }))(FO043ShowPrint) \ No newline at end of file +export default connect(({ login, app }) => ({ login, app }))(FO043ShowPrint) \ No newline at end of file diff --git a/src/components/CustomPages/FO/FO045ShowPrint.js b/src/components/CustomPages/FO/FO045ShowPrint.js index 8dce8ba..8525822 100644 --- a/src/components/CustomPages/FO/FO045ShowPrint.js +++ b/src/components/CustomPages/FO/FO045ShowPrint.js @@ -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,19 +69,18 @@ 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); } - + } }); } @@ -105,13 +105,13 @@ class FO045ShowPrint extends React.Component { const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; return
- + } + trigger={() => } content={() => this.componentRef} pageStyle=".printDIV { padding:0 40px;} img{width :120px}" /> - +
@@ -121,178 +121,178 @@ class FO045ShowPrint extends React.Component {

动火作业工作票(外包)

{ - data ? -
- - {data.Nav_Company?.NAME} - {data.Nav_ProductionUnit?.NAME} - {data.CREATE_TIME} - - {data.Nav_ApplyDepartment?.NAME} - {data.Nav_ApplyUser?.NAME} - {data.CODE} - {data.Nav_OperationStep?.NAME} - {enums.HMOperationTaskAuditEnum.enums[data.AUDIT_LEVEL]} - {enums.SKEvaluateLevelEnum.enums[data.EVALUATE_LEVEL]} - {data.Nav_Related?.NAME} - {data.USER_NAME} - {data.USER_PHONE} - {data.SAFE_USER_NAME} - {data.SAFE_USER_PHONE} - {data.Nav_Area?.NAME} - {data.JOB_CONTENT} - {data.Nav_Type?.NAME} - {data.JOB_CONTENT} - {data.Nav_MonitorUser?.NAME} - {data.JOB_DATE} - {data.JOB_END_DATE} - { data.Nav_Risks && data.Nav_Risks.map((item, i) => { - return item.RISK_NAME + ' ' - })} - {showFiles(data.Nav_Files, config.picServerHost, this)} - - - - { - data && data.Nav_Users? - - + data ? +
+ + {data.Nav_Company?.NAME} + {data.Nav_ProductionUnit?.NAME} + {data.CREATE_TIME} -
- - - - - - {/* */} - - { - data.Nav_Users && data.Nav_Users.map((item, i) => { - return - - - - - - {/* + + + + + + + { + data.Nav_Details && data.Nav_Details.map((item, i) => { + return + + + + + + + + }) + } + +
序号作业人员类别姓名证书编号附件签名
- {i + 1} - - {item.Nav_UserType?.NAME} - - {item.Nav_User?.NAME} - - {item.CERTIFICATE_CODE} - - {showFiles(item.Nav_UserFiles, config.picServerHost, this)} - + {data.Nav_ApplyDepartment?.NAME} + {data.Nav_ApplyUser?.NAME} + {data.CODE} + {data.Nav_OperationStep?.NAME} + {enums.HMOperationTaskAuditEnum.enums[data.AUDIT_LEVEL]} + {enums.SKEvaluateLevelEnum.enums[data.EVALUATE_LEVEL]} + {data.Nav_Related?.NAME} + {data.USER_NAME} + {data.USER_PHONE} + {data.SAFE_USER_NAME} + {data.SAFE_USER_PHONE} + {data.Nav_Area?.NAME} + {data.JOB_CONTENT} + {data.Nav_Type?.NAME} + {data.JOB_CONTENT} + {data.Nav_MonitorUser?.NAME} + {data.JOB_DATE} + {data.JOB_END_DATE} + {data.Nav_Risks && data.Nav_Risks.map((item, i) => { + return item.RISK_NAME + ' ' + })} + {showFiles(data.Nav_Files, config.picServerHost, this)} + + + + { + data && data.Nav_Users ? + + + + + + + + + + {/* */} + + { + data.Nav_Users && data.Nav_Users.map((item, i) => { + return + + + + + + {/* */} - - }) - } - -
序号作业人员类别姓名证书编号附件签名
+ {i + 1} + + {item.Nav_UserType?.NAME} + + {item.Nav_User?.NAME} + + {item.CERTIFICATE_CODE} + + {showFiles(item.Nav_UserFiles, config.picServerHost, this)} + { item.DEAL_STATUS == 1? showUserSign(item.Nav_User, config.picServerHost):null }
: null - } - { - data && data.Nav_Details? - - + + }) + } + +
: null + } + { + data && data.Nav_Details ? + + - - - - - - - - { - data.Nav_Details && data.Nav_Details.map((item, i) => { - return - - - - - - - - }) - } - -
序号作业阶段作业流程及安全措施是否确认附件
- {i + 1} - - {enums.FOJobStepEnum.enums[item.JOB_STEP]} - - {item.CONTENT} - - {item.IS_CONFIRM_NEW ? "是" : "否"} - {/* {enums.FOYesOrNoEnum.enums[item.IS_CONFIRM]} */} - - {showFiles(item.Nav_DetailFiles, config.picServerHost, this)} -
: null - } - - {data.COMPLETED_CONDITION} - {enums.FOYesOrNoEnum.enums[data.IS_FIRE]} - {data.ACT_DATE} - {showFiles(data.Nav_FireFiles, config.picServerHost, this)} - {data.Nav_DispatchUser?.NAME} - { - data.USER_DEAL_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile? - - :null - } - { - - data.SAFE_DEAL_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile? - - :null - - } - { - - data.DISPATCH_DEAL_STATUS == 1? - showUserSign(data.Nav_DispatchUser, config.picServerHost) - :null - - } - - = 10?'block':'none'}}> - { - data.COMPLETED_CONTENT - } - { - enums.FOYesOrNoEnum.enums[data.IS_LEAVE] - } - { - data.ACT_END_DATE - } - { - data.LEAVE_DATE - } - { - showFiles(data.Nav_MonitorFiles, config.picServerHost, this) - } - { - data.USER_DEAL_FINISH_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile? - - :null - } - { - data.SAFE_DEAL_FINISH_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile? - - :null - } - - - - : null +
序号作业阶段作业流程及安全措施是否确认附件
+ {i + 1} + + {enums.FOJobStepEnum.enums[item.JOB_STEP]} + + {item.CONTENT} + + {item.IS_CONFIRM_NEW ? "是" : "否"} + {/* {enums.FOYesOrNoEnum.enums[item.IS_CONFIRM]} */} + + {showFiles(item.Nav_DetailFiles, config.picServerHost, this)} +
: null + } + + {data.COMPLETED_CONDITION} + {enums.FOYesOrNoEnum.enums[data.IS_FIRE]} + {data.ACT_DATE} + {showFiles(data.Nav_FireFiles, config.picServerHost, this)} + {data.Nav_DispatchUser?.NAME} + { + data.USER_DEAL_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile ? + + : null + } + { + + data.SAFE_DEAL_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile ? + + : null + + } + { + + data.DISPATCH_DEAL_STATUS == 1 ? + showUserSign(data.Nav_DispatchUser, config.picServerHost) + : null + + } + + = 10 ? 'block' : 'none' }}> + { + data.COMPLETED_CONTENT + } + { + enums.FOYesOrNoEnum.enums[data.IS_LEAVE] + } + { + data.ACT_END_DATE + } + { + data.LEAVE_DATE + } + { + showFiles(data.Nav_MonitorFiles, config.picServerHost, this) + } + { + data.USER_DEAL_FINISH_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile ? + + : null + } + { + data.SAFE_DEAL_FINISH_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile ? + + : null + } + + + +
: null }
} } -export default connect(({ login,app }) => ({ login,app }))(FO045ShowPrint) \ No newline at end of file +export default connect(({ login, app }) => ({ login, app }))(FO045ShowPrint) \ No newline at end of file diff --git a/src/components/CustomPages/FO/FOChangeShfitRecord.js b/src/components/CustomPages/FO/FOChangeShfitRecord.js index aa0ee54..ecc1e1d 100644 --- a/src/components/CustomPages/FO/FOChangeShfitRecord.js +++ b/src/components/CustomPages/FO/FOChangeShfitRecord.js @@ -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'); diff --git a/src/components/CustomPages/FO/FoTeamActivityShowPrint.js b/src/components/CustomPages/FO/FoTeamActivityShowPrint.js index d511402..f1878bb 100644 --- a/src/components/CustomPages/FO/FoTeamActivityShowPrint.js +++ b/src/components/CustomPages/FO/FoTeamActivityShowPrint.js @@ -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');