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'); diff --git a/src/components/CustomPages/HM/HM040ShowPrint.js b/src/components/CustomPages/HM/HM040ShowPrint.js index f1d35f6..f115eab 100644 --- a/src/components/CustomPages/HM/HM040ShowPrint.js +++ b/src/components/CustomPages/HM/HM040ShowPrint.js @@ -36,6 +36,7 @@ class HM040ShowPrint extends React.Component { loadData = (id) => { 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_OperationStep'); // extendInclude(json, 'Nav_EvaluateRisk.Nav_EvaluateRiskWorkduty.Nav_Post'); @@ -56,7 +57,7 @@ class HM040ShowPrint extends React.Component { //渲染页面 render() { const { data } = this.state; - const enums=this.props.app.enums; + const enums = this.props.app.enums; return
@@ -64,12 +65,12 @@ class HM040ShowPrint extends React.Component { {/* */} -
} content={() => this.componentRef} />
+
(this.componentRef = el)} style={{ padding: '20px', paddingTop: '20px' }} id={'tableId' + this.props.id}>

作业任务库

{ - data ?
+ data ?
{/* @@ -79,7 +80,7 @@ class HM040ShowPrint extends React.Component { {data.CODE} {/* {data.NAME} */} - {data.Nav_OperationStep ?data.Nav_OperationStep.NAME: ''} + {data.Nav_OperationStep ? data.Nav_OperationStep.NAME : ''} {/* { data.Nav_OperationLinkEvaluateRisk && data.Nav_OperationLinkEvaluateRisk.map((item, i) => { @@ -87,10 +88,10 @@ class HM040ShowPrint extends React.Component { }) } */} - { + { data.POST } - {/* { + {/* { data.Nav_OperationLinkEvaluateRisk.Nav_EvaluateRisk && data.Nav_OperationLinkEvaluateRisk.Nav_EvaluateRisk.Nav_EvaluateRiskWorkduty && data.Nav_OperationLinkEvaluateRisk.Nav_EvaluateRisk.Nav_EvaluateRiskWorkduty.map((item, i) => { console.log(item) if (i == (data.Nav_OperationLinkEvaluateRisk.Nav_EvaluateRisk.Nav_EvaluateRiskWorkduty.length - 1)) { @@ -105,22 +106,22 @@ class HM040ShowPrint extends React.Component { {data.Nav_WorkPermitType?.NAME} {enums.HMOperationTaskAuditEnum.enums[data.AUDIT_LEVEL]} - { + { data.Nav_SafeConfirms && data.Nav_SafeConfirms.map((item, i) => { - return + return }) } { - data.Nav_SafeMeasures && data.Nav_SafeMeasures.map((item, i) => { - return - }) - } + data.Nav_SafeMeasures && data.Nav_SafeMeasures.map((item, i) => { + return + }) + }{ - data.Nav_DealMeasures && data.Nav_DealMeasures.map((item, i) => { - return - }) - } + data.Nav_DealMeasures && data.Nav_DealMeasures.map((item, i) => { + return + }) + }{data.CREATE_TIME}{enums.STATUSEnum.enums[data.STATUS]} {/* {data.SafeConfirmsStr?.replaceAll("|","\r\n")} */} @@ -131,4 +132,4 @@ class HM040ShowPrint extends React.Component { } } -export default connect(({ login,app }) => ({ login,app }))(HM040ShowPrint) +export default connect(({ login, app }) => ({ login, app }))(HM040ShowPrint) diff --git a/src/components/CustomPages/HM/HM104ShowPrint.js b/src/components/CustomPages/HM/HM104ShowPrint.js index bfa0af4..f695360 100644 --- a/src/components/CustomPages/HM/HM104ShowPrint.js +++ b/src/components/CustomPages/HM/HM104ShowPrint.js @@ -60,6 +60,7 @@ class HM104ShowPrint extends React.Component { loadData = (dataId) => { let that = this; let json = initFilter(that.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); extendIgnoreDataRule(json) that.props.dispatch({ diff --git a/src/components/CustomPages/HM/HM107ShowPrint.js b/src/components/CustomPages/HM/HM107ShowPrint.js index 3ee36b9..ee06d99 100644 --- a/src/components/CustomPages/HM/HM107ShowPrint.js +++ b/src/components/CustomPages/HM/HM107ShowPrint.js @@ -59,6 +59,7 @@ class HM107ShowPrint 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); extendIgnoreDataRule(json) this.props.dispatch({ diff --git a/src/components/CustomPages/HM/HM109ShowPrint.js b/src/components/CustomPages/HM/HM109ShowPrint.js index 76db5e9..013a99d 100644 --- a/src/components/CustomPages/HM/HM109ShowPrint.js +++ b/src/components/CustomPages/HM/HM109ShowPrint.js @@ -59,6 +59,7 @@ class HM109ShowPrint 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); extendIgnoreDataRule(json) this.props.dispatch({ diff --git a/src/components/CustomPages/HM/HM111ShowPrint.js b/src/components/CustomPages/HM/HM111ShowPrint.js index d691d05..161826c 100644 --- a/src/components/CustomPages/HM/HM111ShowPrint.js +++ b/src/components/CustomPages/HM/HM111ShowPrint.js @@ -59,6 +59,7 @@ class HM111ShowPrint 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); extendIgnoreDataRule(json) this.props.dispatch({ diff --git a/src/components/CustomPages/HM/HM123ShowPrint.js b/src/components/CustomPages/HM/HM123ShowPrint.js index 0e5efa8..003be62 100644 --- a/src/components/CustomPages/HM/HM123ShowPrint.js +++ b/src/components/CustomPages/HM/HM123ShowPrint.js @@ -57,6 +57,7 @@ class HM123ShowPrint extends React.Component { loadData = (dataId) => { let that = this; let json = initFilter(that.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); extendIgnoreDataRule(json) that.props.dispatch({ diff --git a/src/components/CustomPages/SK/SK002ShowSummary.js b/src/components/CustomPages/SK/SK002ShowSummary.js index 3e31f20..8270944 100644 --- a/src/components/CustomPages/SK/SK002ShowSummary.js +++ b/src/components/CustomPages/SK/SK002ShowSummary.js @@ -1,6 +1,6 @@ -import { Button, Descriptions,Popconfirm, Row, Col, Form,Modal, Input, Select, Table } from 'antd'; +import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, 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, initQueryFilter } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import stylesStep from '../HI/StepForm.css'; import config from "../../../config"; @@ -20,15 +20,16 @@ class SK002ShowSummary extends React.Component { }; componentDidMount() { - this.loadData(); + this.loadData(); } 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 = () => { - let json = initFilter(this.props.login.OrgId,"","",1,1); + let json = initFilter(this.props.login.OrgId, "", "", 1, 1); + json.Parameter22 = this.props.data.ORG_ID_HV; extendInclude(json, 'Nav_Type'); extendInclude(json, 'Nav_Area'); extendInclude(json, 'Nav_Details'); @@ -37,23 +38,23 @@ class SK002ShowSummary extends React.Component { extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailBasics.Nav_Law'); extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailHiddens.Nav_Question'); // extendIgnoreDataRule(json) - this.props.dispatch({ - type: "app/getDataByPost", - url: "SK/BasicLibrary/OrderEntities", - payload: json, - onlyData: false, - onComplete: (ret) => { - if (ret && ret.Data) { - this.setState({ - data : ret.Data - }); - } - }, - }); + this.props.dispatch({ + type: "app/getDataByPost", + url: "SK/BasicLibrary/OrderEntities", + payload: json, + onlyData: false, + onComplete: (ret) => { + if (ret && ret.Data) { + this.setState({ + data: ret.Data + }); + } + }, + }); } onTableBtnExport() { - const enums=this.props.data.enums ? this.props.data.enums :this.props.app.enums ; + const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; let TableWrap = document.getElementById('tableId' + this.props.data.id); let Table = TableWrap.getElementsByTagName('table')[0]; const wb = XLSX.utils.table_to_book(Table); @@ -62,66 +63,66 @@ class SK002ShowSummary extends React.Component { render() { const { data } = this.state; - const enums=this.props.data.enums ? this.props.data.enums :this.props.app.enums ; + const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; // let aaa = Math.random(); return
- {/* */} + {/* */} } + trigger={() => } content={() => this.componentRef} />
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id}>

双重预防机制基础库

- - { - data ?
通知名称
- - - - - - - - {/* + + { + data ?
序号生产单元辨识区域风险名称风险描述风险类别风险评价L
+ + + + + + + + {/* */} - - - - - - {/* + + + + + + {/* */} - - - - - { - data && data.map((item,i)=>{ - return - - - - - - - {/* + + + + { + data && data.map((item, i) => { + return + + + + + + + {/* */} - - - - + + + - - {/* + + {/* */} - - - - - }) - } -
序号生产单元辨识区域风险名称风险描述风险类别风险评价L 风险评价E 风险评价C 分值D风险等级应急处置管控层级管控措施检查内容检查依据风险等级应急处置管控层级管控措施检查内容检查依据 判定标准隐患描述隐患等级整改措施
- {i+1} - - {item.Nav_ProductionUnit?.NAME} - - {item.Nav_Area?.NAME} - - {item.RISK_NAME} - - {item.RISK_DESCRIPTION} - - {item.Nav_Type?.NAME} - + 隐患描述隐患等级整改措施
+ {i + 1} + + {item.Nav_ProductionUnit?.NAME} + + {item.Nav_Area?.NAME} + + {item.RISK_NAME} + + {item.RISK_DESCRIPTION} + + {item.Nav_Type?.NAME} + {item.Nav_SCOREL? item.Nav_SCOREL?.SCORE : 0} @@ -133,49 +134,49 @@ class SK002ShowSummary extends React.Component { {item.EVALUATE_SCORE} - {enums.SKEvaluateLevelEnum.enums[item.EVALUATE_LEVEL]} - - {item.EMERGENCY} - - { item.DEPARTMENT_TYPE && item.DEPARTMENT_TYPE.split("_").map((item2, i) => { - if (item2) { - return - } - })} - - { item.MEASURE} - {/* { item.Nav_Details && item.Nav_Details?.map((item2, i) => { + + {enums.SKEvaluateLevelEnum.enums[item.EVALUATE_LEVEL]} + + {item.EMERGENCY} + + {item.DEPARTMENT_TYPE && item.DEPARTMENT_TYPE.split("_").map((item2, i) => { + if (item2) { + return + } + })} + + {item.MEASURE} + {/* { item.Nav_Details && item.Nav_Details?.map((item2, i) => { if (item2) { return } })} */} - - { item.CHECKCONTENTS} - + + {item.CHECKCONTENTS} + {item.CHECKBASICS } { item.CHECKSTANDARDS } - { item.HIDDENSCRIPTION } - - { item.HIDDENLEVEL } - - {item.RECIFYMEASURE } -
:null + + {item.HIDDENSCRIPTION} + + + {item.HIDDENLEVEL} + + + {item.RECIFYMEASURE} + + + }) + } + : null } {/* */}
@@ -184,4 +185,4 @@ class SK002ShowSummary extends React.Component { } -export default connect(({ login,app }) => ({ login,app }))(SK002ShowSummary) \ No newline at end of file +export default connect(({ login, app }) => ({ login, app }))(SK002ShowSummary) \ No newline at end of file diff --git a/src/components/CustomPages/SK/SK004CheckList.js b/src/components/CustomPages/SK/SK004CheckList.js index 34de582..2adaa69 100644 --- a/src/components/CustomPages/SK/SK004CheckList.js +++ b/src/components/CustomPages/SK/SK004CheckList.js @@ -1,6 +1,6 @@ -import { Button, Descriptions,Popconfirm, Row, Col, Form,Modal, Input, Select, Table } from 'antd'; -import React , { useState }from 'react'; -import { initFilter, extendRule, extendInclude, extendIgnoreDataRule,setDataFieldValue, guid, initQueryFilter } from "../../../utils/common"; +import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, Input, Select, Table } from 'antd'; +import React, { useState } from 'react'; +import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import stylesStep from '../HI/StepForm.css'; import config from "../../../config"; @@ -11,488 +11,485 @@ import { message } from "antd/lib/index"; import FormPage from '../../../components/FormPage' import DropDownPagination from '../../common/DropDownPaginationEx' class SK004CheckList extends React.Component { - constructor(props) { - super(props); - this.state = { - inputText:"", - inputText2:"", - inputText3:"", - checkType:{}, - data: {}, - dataList: [], - MineType:0, - CHECK_CYCLE:0, - CHECK_TYPE:0, - CHECK_CYCLE_ID:null, - BtnAgreeDisplay: 'none', - showDetail:false, - showDetailContent: false, - Details:[], - DetailContents:[], - columnContents : [ - { - title: '序号', - dataIndex: 'NUM', - key: "NUM", - render: (text, record, index) => { - return - } - }, - { - title: "风险名称", - dataIndex: "RISK_NAME", - key: "RISK_NAME", - }, - { - title: "检查区域", - dataIndex: "Nav_Area.NAME", - key: "Nav_Area.NAME", - }, - { - title: "检查内容", - dataIndex: "Nav_Contents.CHECKCONTENT", - key: "Nav_Contents.CHECKCONTENT", - }, - // { - // title: "检查依据", - // dataIndex: "Nav_DetailBasics", - // key: "Nav_DetailBasics", - // render: (text, record) => - // { - // return - // } - // }, - // { - // title: "判定标准", - // dataIndex: "CHECK_STANDARD", - // key: "CHECK_STANDARD", - // }, - - ], - columns : [ - { - title: '序号', - dataIndex: 'NUM', - key: "NUM", - render: (text, record, index) => { - return - } - }, - { - title: "检查部门", - dataIndex: "Nav_Department.NAME", - key: "Nav_Department.NAME", - }, - { - title: "检查岗位", - dataIndex: "POST_NAME", - key: "POST_NAME", - }, - { - title: '操作', - dataIndex: '', - key: '', - render: (text, record, index) => { - return
+ } } -export default connect(({ login,app }) => ({ login,app }))(SK004ShowPrint) \ No newline at end of file +export default connect(({ login, app }) => ({ login, app }))(SK004ShowPrint) \ No newline at end of file diff --git a/src/components/CustomPages/SK/SK004ShowSummary.js b/src/components/CustomPages/SK/SK004ShowSummary.js index f288d10..24b70d2 100644 --- a/src/components/CustomPages/SK/SK004ShowSummary.js +++ b/src/components/CustomPages/SK/SK004ShowSummary.js @@ -1,6 +1,6 @@ -import { Button, Descriptions,Popconfirm, Row, Col, Form,Modal, Input, Select, Table } from 'antd'; +import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, 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, initQueryFilter } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import stylesStep from '../HI/StepForm.css'; import config from "../../../config"; @@ -20,15 +20,16 @@ class SK004ShowSummary extends React.Component { }; componentDidMount() { - this.loadData(); + this.loadData(); } 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 = () => { - let json = initFilter(this.props.login.OrgId,"","",1,1); + let json = initFilter(this.props.login.OrgId, "", "", 1, 1); + json.Parameter22 = this.props.data.ORG_ID_HV; extendInclude(json, 'Nav_Type'); extendInclude(json, 'Nav_Area'); extendInclude(json, 'Nav_Details'); @@ -42,23 +43,23 @@ class SK004ShowSummary extends React.Component { extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailBasics.Nav_Law'); extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailHiddens.Nav_Question'); extendIgnoreDataRule(json) - this.props.dispatch({ - type: "app/getDataByPost", - url: "SK/SKEnterpriseLibrary/SKOrderEntities", - payload: json, - onlyData: false, - onComplete: (ret) => { - if (ret && ret.Data) { - this.setState({ - data : ret.Data - }); - } - }, - }); + this.props.dispatch({ + type: "app/getDataByPost", + url: "SK/SKEnterpriseLibrary/SKOrderEntities", + payload: json, + onlyData: false, + onComplete: (ret) => { + if (ret && ret.Data) { + this.setState({ + data: ret.Data + }); + } + }, + }); } onTableBtnExport() { - const enums=this.props.data.enums ? this.props.data.enums :this.props.app.enums ; + const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; let TableWrap = document.getElementById('tableId' + this.props.data.id); let Table = TableWrap.getElementsByTagName('table')[0]; const wb = XLSX.utils.table_to_book(Table); @@ -67,73 +68,73 @@ class SK004ShowSummary extends React.Component { render() { const { data } = this.state; - const enums=this.props.data.enums ? this.props.data.enums :this.props.app.enums ; + const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; // let aaa = Math.random(); return
- {/* */} + {/* */} } + trigger={() => } content={() => this.componentRef} />
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id}>

双重预防机制企业库

- - { - data ? - - - - - - - - {/* + + { + data ?
序号生产单元辨识区域风险名称风险描述风险类别风险评价L
+ + + + + + + + {/* */} - - - - - - - - - {/* */} - - {/* + + + + + + + + + {/* */} + + {/* */} - - - {/* + + + {/* */} - - - { - data && data.map((item,i)=>{ - return - - - - - - - {/* + { + data && data.map((item, i) => { + return + + + + + + + {/* */} - - - - - - + + + + + - - - - {/* + + + + {/* */} - - {/* + {/* */} - - {/* + {/* */} - - - }) - } -
序号生产单元辨识区域风险名称风险描述风险类别风险评价L 风险评价E 风险评价C 分值D风险等级管控层级管控部门管控责任人管控措施应急处置检查内容隐患描述隐患等级整改措施检查依据风险等级管控层级管控部门管控责任人管控措施应急处置检查内容隐患描述隐患等级整改措施检查依据 判定标准检查层级检查类型检查部门检查层级检查类型检查部门 检查岗位
- {i+1} - - {item.Nav_ProductionUnit?.NAME} - - {item.Nav_Area?.NAME} - - {item.RISK_NAME} - - {item.RISK_DESCRIPTION} - - {item.Nav_Type?.NAME} - + +
+ {i + 1} + + {item.Nav_ProductionUnit?.NAME} + + {item.Nav_Area?.NAME} + + {item.RISK_NAME} + + {item.RISK_DESCRIPTION} + + {item.Nav_Type?.NAME} + {item.EVALUATE_L} @@ -145,64 +146,64 @@ class SK004ShowSummary extends React.Component { {item.EVALUATE_SCORE} - {enums.SKEvaluateLevelEnum.enums[item.EVALUATE_LEVEL]} - - {item.CONTROLLEVEL} - - {item.CONTROLDEPT} - - {item.CONTROLUSER} - - { item.MEASURE} - {/* { item.Nav_Details && item.Nav_Details?.map((item2, i) => { + + {enums.SKEvaluateLevelEnum.enums[item.EVALUATE_LEVEL]} + + {item.CONTROLLEVEL} + + {item.CONTROLDEPT} + + {item.CONTROLUSER} + + {item.MEASURE} + {/* { item.Nav_Details && item.Nav_Details?.map((item2, i) => { if (item2) { return } })} */} - - {item.EMERGENCY} - - { item.CHECKCONTENTS} - - { item.HIDDENSCRIPTION } - + + {item.EMERGENCY} + + {item.CHECKCONTENTS} + + {item.HIDDENSCRIPTION} + { item.HIDDENLEVEL } - {item.RECIFYMEASURE } - + + {item.RECIFYMEASURE} + {item.CHECKBASICS } { item.CHECKSTANDARDS } - { item.CHECKLEVEL } - + + {item.CHECKLEVEL} + { item.CHECKDEPT } {item.CHECKPOST } - { item.CHECKTYPE } -
:null + + {item.CHECKTYPE} + + + }) + } + : null } {/* */}
@@ -211,4 +212,4 @@ class SK004ShowSummary extends React.Component { } -export default connect(({ login,app }) => ({ login,app }))(SK004ShowSummary) \ No newline at end of file +export default connect(({ login, app }) => ({ login, app }))(SK004ShowSummary) \ No newline at end of file diff --git a/src/components/CustomPages/SK/SK006ShowOperateLog.js b/src/components/CustomPages/SK/SK006ShowOperateLog.js index 2a6aa1e..10d1e82 100644 --- a/src/components/CustomPages/SK/SK006ShowOperateLog.js +++ b/src/components/CustomPages/SK/SK006ShowOperateLog.js @@ -63,6 +63,7 @@ class SK006ShowOperateLog extends React.Component { loadData = (id) => { var orgId = this.props.login ? this.props.login.OrgId : ''; let json = initFilter(orgId, id); + json.Parameter22 = this.props.data.ORG_ID_HV; this.props.dispatch({ type: 'app/getDataByPost', payload: json, @@ -192,12 +193,12 @@ class SK006ShowOperateLog extends React.Component { item1.STATUS === 0 ? '#A5A5A5' // STATUS=0 → 灰色背景 : item1.STATUS === 10 - ? '#FFC000' // STATUS=10 → 橙色背景 - : item1.STATUS === 20 - ? '#f56c6c' // STATUS=20 → 红色背景 - : item1.STATUS === 16 - ? '#ADCDEA' // STATUS=16 → 蓝色背景 - : '#70AD47', // STATUS=5，15 → 绿色背景 + ? '#FFC000' // STATUS=10 → 橙色背景 + : item1.STATUS === 20 + ? '#f56c6c' // STATUS=20 → 红色背景 + : item1.STATUS === 16 + ? '#ADCDEA' // STATUS=16 → 蓝色背景 + : '#70AD47', // STATUS=5，15 → 绿色背景 }} id="step20" > diff --git a/src/components/CustomPages/SK/SK006ShowPrint.js b/src/components/CustomPages/SK/SK006ShowPrint.js index f3373be..800dc48 100644 --- a/src/components/CustomPages/SK/SK006ShowPrint.js +++ b/src/components/CustomPages/SK/SK006ShowPrint.js @@ -59,6 +59,7 @@ class SK006ShowPrint extends React.Component { } loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); extendRule(json, 'TASK_ID', 1, taskID); extendIgnoreDataRule(json) @@ -79,12 +80,13 @@ class SK006ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } loadDataTask = (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); @@ -115,7 +117,7 @@ class SK006ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } diff --git a/src/components/CustomPages/SK/SK010CheckList.js b/src/components/CustomPages/SK/SK010CheckList.js index 41963ed..d419755 100644 --- a/src/components/CustomPages/SK/SK010CheckList.js +++ b/src/components/CustomPages/SK/SK010CheckList.js @@ -1,6 +1,6 @@ -import { Button, Descriptions,Popconfirm, Row, Col, Form,Modal, Input, Select, Table } from 'antd'; -import React , { useState }from 'react'; -import { initFilter, extendRule, extendInclude, extendIgnoreDataRule,setDataFieldValue, guid, initQueryFilter,ShowPrintClose } from "../../../utils/common"; +import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, Input, Select, Table } from 'antd'; +import React, { useState } from 'react'; +import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, ShowPrintClose } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import stylesStep from '../HI/StepForm.css'; import config from "../../../config"; @@ -10,345 +10,346 @@ import moment from 'moment'; import { message } from "antd/lib/index"; import FormPage from '../../../components/FormPage' class SK010CheckList extends React.Component { - constructor(props) { - super(props); - this.state = { - selectedRowKeys:[], - taskSelects: [], - dataList: [], - PRODUCTION_UNIT_ID:null, - CHECK_CYCLE:0, - CHECK_TYPE:0, - CHECK_CYCLE_ID:null, - BtnAgreeDisplay: 'none', - showDetail:false, - showDetailContent: false, - Details:[], - DetailContents:[], - columnContents : [ - { - title: '序号', - dataIndex: 'NUM', - key: "NUM", - render: (text, record, index) => { - return - } - }, - { - title: "检查区域", - dataIndex: "AREA_NAME", - key: "AREA_NAME", - }, - { - title: "检查内容", - dataIndex: "Nav_Contents.CHECKCONTENT", - key: "Nav_Contents.CHECKCONTENT", - }, - // { - // title: "检查依据", - // dataIndex: "Nav_DetailBasics", - // key: "Nav_DetailBasics", - // render: (text, record) => - // { - // return - // } - // }, - // { - // title: "判定标准", - // dataIndex: "CHECK_STANDARD", - // key: "CHECK_STANDARD", - // }, - - ], - columns : [ - { - title: '序号', - dataIndex: 'NUM', - key: "NUM", - render: (text, record, index) => { - return - } - }, - { - title: "检查部门", - dataIndex: "Nav_Department.NAME", - key: "Nav_Department.NAME", - }, - { - title: "检查岗位", - dataIndex: "POST_NAME", - key: "POST_NAME", - }, - { - title: '操作', - dataIndex: '', - key: '', - render: (text, record, index) => { - return -
- - - - -
- - {/*
+ ], + columndatas: [ + { + title: '序号', + dataIndex: 'NUM', + key: "NUM", + render: (text, record, index) => { + return + } + }, + { + title: "生产单元", + dataIndex: "MINE_NAME", + key: "MINE_NAME", + // render: (text, record, index) => { + // return + // } + }, + { + title: "检查层级", + dataIndex: "CHECK_TYPE", + key: "CHECK_TYPE", + render: (text, record, index) => { + return + } + }, + { + title: "检查类型", + dataIndex: "Nav_CheckType.NAME", + key: "Nav_CheckType.NAME", + }, + { + title: "检查周期", + dataIndex: "CHECK_CYCLE", + key: "CHECK_CYCLE", + render: (text, record, index) => { + return + } + }, + { + title: '操作', + dataIndex: '', + key: '', + render: (text, record, index) => { + return +
+
+ + + +
+ + {/*
} content={() => this.componentRef} />
*/} -
-

检查清单

- {this.state.dataList? -
- :[]} - - - } +
+

检查清单

+ {this.state.dataList ? +
+ : []} + + + } } -export default connect(({ login,app }) => ({ login,app }))(SK010CheckList) \ No newline at end of file +export default connect(({ login, app }) => ({ login, app }))(SK010CheckList) \ No newline at end of file diff --git a/src/components/CustomPages/SK/SK010ShowPrint.js b/src/components/CustomPages/SK/SK010ShowPrint.js index 967e834..4e2c7b1 100644 --- a/src/components/CustomPages/SK/SK010ShowPrint.js +++ b/src/components/CustomPages/SK/SK010ShowPrint.js @@ -60,6 +60,7 @@ class SK010ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); extendRule(json, 'TASK_ID', 1, taskID); extendIgnoreDataRule(json) @@ -91,7 +92,7 @@ class SK010ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } @@ -207,7 +208,7 @@ class SK010ShowPrint extends React.Component {
{ - item.CHECK_RESULT == null? "无隐患" :enums.SKCheckResultEnum.enums[item.CHECK_RESULT] + item.CHECK_RESULT == null ? "无隐患" : enums.SKCheckResultEnum.enums[item.CHECK_RESULT] } diff --git a/src/components/CustomPages/SK/SK012ShowPrint.js b/src/components/CustomPages/SK/SK012ShowPrint.js index 33e9444..755f8ae 100644 --- a/src/components/CustomPages/SK/SK012ShowPrint.js +++ b/src/components/CustomPages/SK/SK012ShowPrint.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, showFiles, GetFileModel,showUserSign } from "../../../utils/common"; +import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, showUserSign } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import config from "../../../config"; import XLSX from 'xlsx'; @@ -15,7 +15,7 @@ class SK012ShowPrint extends React.Component { this.state = { data: null, enumData: null, - detailUsers:[], + detailUsers: [], BtnAgreeDisplay: 'none', fileForm: { title: "", @@ -61,6 +61,7 @@ class SK012ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); extendRule(json, 'TASK_ID', 1, taskID); extendIgnoreDataRule(json) @@ -84,19 +85,17 @@ class SK012ShowPrint extends React.Component { if (this.props.data && this.props.data.loadDataDeal) { this.props.data.loadDataDeal(1); } - let users=[] - let uniqueUsers =[] - if(ret.Nav_CheckRecordDetails) - { + let users = [] + let uniqueUsers = [] + if (ret.Nav_CheckRecordDetails) { ret.Nav_CheckRecordDetails.forEach(item => { - item.Nav_CheckRecordDetailUsers.forEach(item2=>{ + item.Nav_CheckRecordDetailUsers.forEach(item2 => { users.push(item2) }) }) } - if(users) - { - uniqueUsers= users.reduce((acc, user) => { + if (users) { + uniqueUsers = users.reduce((acc, user) => { // 如果累积数组中还没有这个 user_id，则添加 if (!acc.some(item => item.USER_ID === user.USER_ID)) { acc.push(user); @@ -104,7 +103,7 @@ class SK012ShowPrint extends React.Component { return acc; }, []); } - this.setState({ data: ret,detailUsers:uniqueUsers }) + this.setState({ data: ret, detailUsers: uniqueUsers }) if (this.props.data.tableKey == "2" || this.props.data.tableKey == undefined) { this.setState({ BtnAgreeDisplay: 'none' }) } else { @@ -112,7 +111,7 @@ class SK012ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } @@ -228,7 +227,7 @@ class SK012ShowPrint extends React.Component { { - item.CHECK_RESULT == null? "无隐患" :enums.SKCheckResultEnum.enums[item.CHECK_RESULT] + item.CHECK_RESULT == null ? "无隐患" : enums.SKCheckResultEnum.enums[item.CHECK_RESULT] } @@ -267,15 +266,15 @@ class SK012ShowPrint extends React.Component {
{ this.state.detailUsers ? -
- - { - this.state.detailUsers?.filter(it => it.ISCHECK).map((item, i) => { - return showUserSign(item.Nav_User, config.picServerHost) - }) - } - -
:null +
+ + { + this.state.detailUsers?.filter(it => it.ISCHECK).map((item, i) => { + return showUserSign(item.Nav_User, config.picServerHost) + }) + } + +
: null }
diff --git a/src/components/CustomPages/SK/SK014ShowPrint.js b/src/components/CustomPages/SK/SK014ShowPrint.js index f1efede..e5a4239 100644 --- a/src/components/CustomPages/SK/SK014ShowPrint.js +++ b/src/components/CustomPages/SK/SK014ShowPrint.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, showFiles, GetFileModel,showUserSign } from "../../../utils/common"; +import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, showUserSign } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import config from "../../../config"; import XLSX from 'xlsx'; @@ -60,6 +60,7 @@ class SK014ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); extendRule(json, 'TASK_ID', 1, taskID); extendIgnoreDataRule(json) @@ -191,7 +192,7 @@ class SK014ShowPrint extends React.Component { item.HIDDEN_PLACE } - + { item?.Nav_ReportDetailReasons && item?.Nav_ReportDetailReasons.map((item2, i) => { @@ -203,8 +204,8 @@ class SK014ShowPrint extends React.Component { { - item.ISCHECK? {item.Nav_RecitifyUser?.NAME}: - {item.Nav_RecitifyUser?.NAME} + item.ISCHECK ? {item.Nav_RecitifyUser?.NAME} : + {item.Nav_RecitifyUser?.NAME} } {/* { item.Nav_RecitifyUser?.NAME @@ -225,18 +226,18 @@ class SK014ShowPrint extends React.Component { } { - data && data.Nav_ReportDetails ? -
- - { - data.Nav_ReportDetails?.map((item, i) => { - if (item && item.ISCHECK ) { - showUserSign(item.Nav_RecitifyUser, config.picServerHost) - } - }) - } - -
:null + data && data.Nav_ReportDetails ? +
+ + { + data.Nav_ReportDetails?.map((item, i) => { + if (item && item.ISCHECK) { + showUserSign(item.Nav_RecitifyUser, config.picServerHost) + } + }) + } + +
: null }
diff --git a/src/components/CustomPages/SK/SK016ShowPrint.js b/src/components/CustomPages/SK/SK016ShowPrint.js index 523b7d7..2ce5f5d 100644 --- a/src/components/CustomPages/SK/SK016ShowPrint.js +++ b/src/components/CustomPages/SK/SK016ShowPrint.js @@ -41,6 +41,7 @@ class SK016ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); // extendRule(json, 'TASK_ID', 1, taskID); extendInclude(json, 'Nav_ApplyUser'); @@ -71,7 +72,7 @@ class SK016ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } diff --git a/src/components/CustomPages/SK/SK018ShowPrint.js b/src/components/CustomPages/SK/SK018ShowPrint.js index f0683f1..c7aea07 100644 --- a/src/components/CustomPages/SK/SK018ShowPrint.js +++ b/src/components/CustomPages/SK/SK018ShowPrint.js @@ -57,6 +57,7 @@ class SK018ShowPrint extends React.Component { } loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); // extendRule(json, 'TASK_ID', 1, taskID); extendInclude(json, 'Nav_Report'); @@ -102,7 +103,7 @@ class SK018ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } @@ -165,7 +166,7 @@ class SK018ShowPrint extends React.Component { {data.Nav_Question?.DESCREPTION} {enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]} {data.RECTIFICATION_MEASURES} - { + { data?.Nav_Reasons && data?.Nav_Reasons.map((item2, i) => { return {(i > 0 ? "," : "") + item2.Nav_Reason.NAME} @@ -176,9 +177,9 @@ class SK018ShowPrint extends React.Component { {/* {enums.FMDepartmentType.enums[data.DEPARTMENT_TYPE]} {data.Nav_CheckType ? data.Nav_CheckType.NAME : ''} {enums.BSPLANCHECKFREQUENCYEnum.enums[data.PLANCHECKFREQUENCY]} */} - { data.STATUS == 30 && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ? + {data.STATUS == 30 && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ? showUserSign(data.Nav_RecitifyUser, config.picServerHost) - : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''} + : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''} {moment(data.RECITIFY_TIME).format('YYYY-MM-DD')} { showFiles(data?.Nav_Files, config.picServerHost, this) diff --git a/src/components/CustomPages/SK/SK020ShowPrint.js b/src/components/CustomPages/SK/SK020ShowPrint.js index cd2e00c..65ada03 100644 --- a/src/components/CustomPages/SK/SK020ShowPrint.js +++ b/src/components/CustomPages/SK/SK020ShowPrint.js @@ -60,6 +60,7 @@ class SK020ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); extendRule(json, 'TASK_ID', 1, taskID); extendIgnoreDataRule(json) @@ -91,7 +92,7 @@ class SK020ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } @@ -179,7 +180,7 @@ class SK020ShowPrint extends React.Component { */} { - item.Nav_Question?.DESCREPTION?item.Nav_Question.DESCREPTION:item.HIDDEN_DESCRIPTION + item.Nav_Question?.DESCREPTION ? item.Nav_Question.DESCREPTION : item.HIDDEN_DESCRIPTION } diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js index 39986a2..3ac12ae 100644 --- a/src/components/CustomPages/SK/SK022ShowPrint.js +++ b/src/components/CustomPages/SK/SK022ShowPrint.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, showFiles,showUserSign,showFileImg, GetFileModel } from "../../../utils/common"; +import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, showUserSign, showFileImg, GetFileModel } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import config from "../../../config"; import XLSX from 'xlsx'; @@ -57,6 +57,7 @@ class SK022ShowPrint extends React.Component { } loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); // extendRule(json, 'TASK_ID', 1, taskID); // extendInclude(json, 'Nav_ApplyUser'); @@ -92,7 +93,7 @@ class SK022ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } @@ -124,7 +125,7 @@ class SK022ShowPrint extends React.Component { pageStyle=".printDIV { padding:0 40px;} img{width :120px}" /> - +
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id}>

隐患整改记录

@@ -147,21 +148,21 @@ class SK022ShowPrint extends React.Component { // return }) } - {data.Nav_Question?.DESCREPTION?data.Nav_Question.DESCREPTION:data.HIDDEN_DESCRIPTION} + {data.Nav_Question?.DESCREPTION ? data.Nav_Question.DESCREPTION : data.HIDDEN_DESCRIPTION} {enums.SKHiddenLevel.enums[data.HIDDEN_LEVEL]} {data.RECTIFICATION_MEASURES} {moment(data.RECITIFY_TIME).format('YYYY-MM-DD')} {data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''} {data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''} { - data.STATUS == 21 && - data.Nav_ImplementUser && data.Nav_ImplementUser.FILE_PATH ? - showUserSign(data.Nav_ImplementUser, config.picServerHost) - : data.Nav_ImplementUser ? data.Nav_ImplementUser.NAME : ''} + data.STATUS == 21 && + data.Nav_ImplementUser && data.Nav_ImplementUser.FILE_PATH ? + showUserSign(data.Nav_ImplementUser, config.picServerHost) + : data.Nav_ImplementUser ? data.Nav_ImplementUser.NAME : ''} {data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''} {data.RECTIFICATION_DESCRIPTION} {data.RECTIFICATION_MONEY} - {data.COMPLETE_DATE?moment(data.COMPLETE_DATE).format('YYYY-MM-DD'):null} + {data.COMPLETE_DATE ? moment(data.COMPLETE_DATE).format('YYYY-MM-DD') : null} { showFileImg(data?.Nav_RectifyPhotoas, config.picServerHost, this) } @@ -171,17 +172,17 @@ class SK022ShowPrint extends React.Component { { showFiles(data?.Nav_RectifyFiles, config.picServerHost, this) } - {data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null} - {enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]} - {data.ACCEPT_OPINION} + {data.ACCEPT_DATE ? moment(data.ACCEPT_DATE).format('YYYY-MM-DD') : null} + {enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]} + {data.ACCEPT_OPINION} { data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ? - showUserSign(data.Nav_RecitifyUser, config.picServerHost) - : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : '' + showUserSign(data.Nav_RecitifyUser, config.picServerHost) + : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : '' } { - (data.STATUS == 20 ||data.STATUS == 30)&& data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ? - showUserSign(data.Nav_RecitifyUser, config.picServerHost) + (data.STATUS == 20 || data.STATUS == 30) && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ? + showUserSign(data.Nav_RecitifyUser, config.picServerHost) : data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : '' } diff --git a/src/components/CustomPages/SK/SK024ShowPrint.js b/src/components/CustomPages/SK/SK024ShowPrint.js index 44d286c..c07bc4e 100644 --- a/src/components/CustomPages/SK/SK024ShowPrint.js +++ b/src/components/CustomPages/SK/SK024ShowPrint.js @@ -57,6 +57,7 @@ class SK024ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); // extendRule(json, 'TASK_ID', 1, taskID); extendInclude(json, 'Nav_ApplyUser'); @@ -84,7 +85,7 @@ class SK024ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } diff --git a/src/components/CustomPages/SK/SK026ShowPrint.js b/src/components/CustomPages/SK/SK026ShowPrint.js index 797fa9f..a9fa8da 100644 --- a/src/components/CustomPages/SK/SK026ShowPrint.js +++ b/src/components/CustomPages/SK/SK026ShowPrint.js @@ -228,6 +228,7 @@ class SK026ShowPrint extends React.Component { loadData = (dataId) => { let that = this; let json = initFilter(that.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); // extendInclude(json, 'Nav_ApplyUser'); // extendInclude(json, 'Nav_ApplyDepartment'); @@ -272,7 +273,7 @@ class SK026ShowPrint extends React.Component { // this.setState({ isFinished: 'inline' }) // } } - + } }); } @@ -496,7 +497,7 @@ class SK026ShowPrint extends React.Component { {i + 1} - {item.Nav_ProductionUnit?.NAME} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area ? item.Nav_Area.NAME : ''} @@ -511,13 +512,13 @@ class SK026ShowPrint extends React.Component { {item.Nav_Type ? item.Nav_Type?.NAME : ''} - {item.Nav_SCOREL? item.Nav_SCOREL?.SCORE : 0} + {item.Nav_SCOREL ? item.Nav_SCOREL?.SCORE : 0} - {item.Nav_SCOREE? item.Nav_SCOREE?.SCORE : 0} + {item.Nav_SCOREE ? item.Nav_SCOREE?.SCORE : 0} - {item.Nav_SCOREC? item.Nav_SCOREC?.SCORE : 0} + {item.Nav_SCOREC ? item.Nav_SCOREC?.SCORE : 0} {item.EVALUATE_SCORE} diff --git a/src/components/CustomPages/SK/SK027ShowPrint.js b/src/components/CustomPages/SK/SK027ShowPrint.js index 07ca05f..06bfb32 100644 --- a/src/components/CustomPages/SK/SK027ShowPrint.js +++ b/src/components/CustomPages/SK/SK027ShowPrint.js @@ -47,6 +47,7 @@ class SK027ShowPrint 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); extendIgnoreDataRule(json) // extendRule(json, 'ID', 1, dataId); @@ -77,7 +78,7 @@ class SK027ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } diff --git a/src/components/CustomPages/SK/SK031ShowPrint.js b/src/components/CustomPages/SK/SK031ShowPrint.js index b254452..cb03c8d 100644 --- a/src/components/CustomPages/SK/SK031ShowPrint.js +++ b/src/components/CustomPages/SK/SK031ShowPrint.js @@ -41,6 +41,7 @@ class SK031ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); // extendRule(json, 'TASK_ID', 1, taskID); // extendInclude(json, 'Nav_ApplyUser'); @@ -68,7 +69,7 @@ class SK031ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } diff --git a/src/components/CustomPages/SK/SK033ShowPrint.js b/src/components/CustomPages/SK/SK033ShowPrint.js index 6329857..bc1d601 100644 --- a/src/components/CustomPages/SK/SK033ShowPrint.js +++ b/src/components/CustomPages/SK/SK033ShowPrint.js @@ -42,7 +42,15 @@ class SK033ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); - json.Parameter22 = this.props.data?.TASK_ORGID + if (this.props.data.ORG_ID_HV) { + json.Parameter22 = this.props.data.ORG_ID_HV; + } + else if (this.props.data?.TASK_ORGID) { + json.Parameter22 = this.props.data?.TASK_ORGID + } + else { + json.Parameter22 = this.props.data.ORG_ID_HV; + } extendRule(json, 'ID', 1, dataId); // extendRule(json, 'TASK_ID', 1, taskID); // extendInclude(json, 'Nav_ApplyUser'); diff --git a/src/components/CustomPages/SK/SK035CheckLibrary.js b/src/components/CustomPages/SK/SK035CheckLibrary.js index b490e3f..6e90d3b 100644 --- a/src/components/CustomPages/SK/SK035CheckLibrary.js +++ b/src/components/CustomPages/SK/SK035CheckLibrary.js @@ -1,6 +1,6 @@ -import { Button, Descriptions,Popconfirm, Row, Col, Form,Modal, Input, Select, Table } from 'antd'; +import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, 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, initQueryFilter } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import stylesStep from '../HI/StepForm.css'; import config from "../../../config"; @@ -10,434 +10,431 @@ import moment from 'moment'; import { message } from "antd/lib/index"; import FormPage from '../../../components/FormPage' class SK035CheckLibrary extends React.Component { - constructor(props) { - super(props); - this.state = { - data: null, - BtnAgreeDisplay: 'none', - tmpData: {}, - showDetail:false, - showDetailContent: false, - Details:{}, - columns:[], - DetailContents:{}, - columnContents:[], - DetailPosts:{}, - columnPosts:[] - }; + constructor(props) { + super(props); + this.state = { + data: null, + BtnAgreeDisplay: 'none', + tmpData: {}, + showDetail: false, + showDetailContent: false, + Details: {}, + columns: [], + DetailContents: {}, + columnContents: [], + DetailPosts: {}, + columnPosts: [] }; + }; - componentDidMount() { - if (this.props.data?.id) - this.loadData(this.props.data?.id); - this.state.columnContents = [ - { - title: '序号', - dataIndex: 'NUM', - key: "NUM", - }, - // { - // title: "检查内容", - // dataIndex: "Nav_Contents.CHECKCONTENT", - // key: "Nav_Contents.CHECKCONTENT", - // }, - { - title: "检查内容", - dataIndex: "Nav_Contents.CHECKCONTENT", - key: "Nav_Contents.CHECKCONTENT", - }, - { - title: "检查依据", - dataIndex: "CHECK_BASIC", - key: "CHECK_BASIC", - }, - { - title: "判定标准", - dataIndex: "CHECK_STANDARD", - key: "CHECK_STANDARD", - }, - { - title: '操作', - dataIndex: '', - key: '', - render: (text, record, index) => { - return
+ } } -export default connect(({ login,app }) => ({ login,app }))(SK035CheckLibrary) \ No newline at end of file +export default connect(({ login, app }) => ({ login, app }))(SK035CheckLibrary) \ No newline at end of file diff --git a/src/components/CustomPages/SK/SK035ShowPrint.js b/src/components/CustomPages/SK/SK035ShowPrint.js index a96a8c5..2ad4f2d 100644 --- a/src/components/CustomPages/SK/SK035ShowPrint.js +++ b/src/components/CustomPages/SK/SK035ShowPrint.js @@ -41,6 +41,7 @@ class SK035ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); // extendRule(json, 'TASK_ID', 1, taskID); // extendInclude(json, 'Nav_ApplyUser'); @@ -72,7 +73,7 @@ class SK035ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } @@ -147,7 +148,7 @@ class SK035ShowPrint extends React.Component { {i + 1} - {item.Nav_ProductionUnit?.NAME} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area?.NAME} diff --git a/src/components/CustomPages/SK/SK037ShowPrint.js b/src/components/CustomPages/SK/SK037ShowPrint.js index 49f89be..431f242 100644 --- a/src/components/CustomPages/SK/SK037ShowPrint.js +++ b/src/components/CustomPages/SK/SK037ShowPrint.js @@ -42,6 +42,7 @@ class SK037ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); // extendRule(json, 'TASK_ID', 1, taskID); // extendInclude(json, 'Nav_ApplyUser'); @@ -73,7 +74,7 @@ class SK037ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } @@ -148,7 +149,7 @@ class SK037ShowPrint extends React.Component { {i + 1} - {item.Nav_ProductionUnit?.NAME} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area?.NAME} diff --git a/src/components/CustomPages/SK/SK039ShowPrint.js b/src/components/CustomPages/SK/SK039ShowPrint.js index d4d483f..4f06c63 100644 --- a/src/components/CustomPages/SK/SK039ShowPrint.js +++ b/src/components/CustomPages/SK/SK039ShowPrint.js @@ -41,6 +41,7 @@ class SK039ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); // extendRule(json, 'TASK_ID', 1, taskID); // extendInclude(json, 'Nav_ApplyUser'); @@ -73,7 +74,7 @@ class SK039ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } @@ -152,7 +153,7 @@ class SK039ShowPrint extends React.Component { {i + 1} - {item.Nav_ProductionUnit?.NAME} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area?.NAME} @@ -170,13 +171,13 @@ class SK039ShowPrint extends React.Component { {enums.SKEvaluateLevelEnum.enums[item.EVALUATE_LEVEL]} - {item.Nav_SCOREL? item.Nav_SCOREL?.SCORE : 0} + {item.Nav_SCOREL ? item.Nav_SCOREL?.SCORE : 0} - {item.Nav_SCOREE? item.Nav_SCOREE?.SCORE : 0} + {item.Nav_SCOREE ? item.Nav_SCOREE?.SCORE : 0} - {item.Nav_SCOREC? item.Nav_SCOREC?.SCORE : 0} + {item.Nav_SCOREC ? item.Nav_SCOREC?.SCORE : 0} {item.EVALUATE_SCORE} @@ -185,7 +186,7 @@ class SK039ShowPrint extends React.Component { { //item.MEASURE item?.Nav_DetailMeasures && item?.Nav_DetailMeasures.map((item2, i) => { - return {item2?.NUM+"、" + item2?.MEASURES_NAME} + return {item2?.NUM + "、" + item2?.MEASURES_NAME} }) } diff --git a/src/components/CustomPages/SK/SK041ShowPrint.js b/src/components/CustomPages/SK/SK041ShowPrint.js index 4a4512b..8b4bcd1 100644 --- a/src/components/CustomPages/SK/SK041ShowPrint.js +++ b/src/components/CustomPages/SK/SK041ShowPrint.js @@ -1,5 +1,5 @@ import { message } from "antd/lib/index"; -import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table ,Modal} from 'antd'; +import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table, Modal } from 'antd'; import React from 'react'; import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common"; import ReactToPrint from "react-to-print"; @@ -41,6 +41,7 @@ class SK041ShowPrint extends React.Component { loadData = (dataId, taskID) => { let json = initFilter(this.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); // extendRule(json, 'TASK_ID', 1, taskID); // extendInclude(json, 'Nav_ApplyUser'); @@ -73,7 +74,7 @@ class SK041ShowPrint extends React.Component { } this.onClickApprove(false); } - + } }); } @@ -152,7 +153,7 @@ class SK041ShowPrint extends React.Component { {i + 1} - {item.Nav_ProductionUnit?.NAME} + {item.Nav_ProductionUnit?.NAME} {item.Nav_Area?.NAME} @@ -170,13 +171,13 @@ class SK041ShowPrint extends React.Component { {enums.SKEvaluateLevelEnum.enums[item.EVALUATE_LEVEL]} - {item.Nav_SCOREL? item.Nav_SCOREL?.SCORE : 0} + {item.Nav_SCOREL ? item.Nav_SCOREL?.SCORE : 0} - {item.Nav_SCOREE? item.Nav_SCOREE?.SCORE : 0} + {item.Nav_SCOREE ? item.Nav_SCOREE?.SCORE : 0} - {item.Nav_SCOREC? item.Nav_SCOREC?.SCORE : 0} + {item.Nav_SCOREC ? item.Nav_SCOREC?.SCORE : 0} {item.EVALUATE_SCORE} @@ -185,7 +186,7 @@ class SK041ShowPrint extends React.Component { { //item.MEASURE item?.Nav_DetailMeasures && item?.Nav_DetailMeasures.map((item2, i) => { - return {item2?.NUM +"、"+item2?.MEASURES_NAME} + return {item2?.NUM + "、" + item2?.MEASURES_NAME} }) } diff --git a/src/components/CustomPages/SK/SK043ShowPrint.js b/src/components/CustomPages/SK/SK043ShowPrint.js index 46bf059..3ba2bd3 100644 --- a/src/components/CustomPages/SK/SK043ShowPrint.js +++ b/src/components/CustomPages/SK/SK043ShowPrint.js @@ -1,6 +1,6 @@ -import { Button, Descriptions,Popconfirm, Row, Col, Form,Modal, Input, Select, Table } from 'antd'; +import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, 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, initQueryFilter } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import stylesStep from '../HI/StepForm.css'; import config from "../../../config"; @@ -29,15 +29,16 @@ class SK043ShowPrint extends React.Component { this.loadData(NextProps.data?.id); } } - + 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 that=this; + let that = this; let json = initFilter(that.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); extendInclude(json, 'Nav_Type'); extendInclude(json, 'Nav_Area'); @@ -45,20 +46,19 @@ class SK043ShowPrint extends React.Component { extendInclude(json, 'Nav_Contents.Nav_Contents'); extendInclude(json, 'Nav_Hiddens'); extendIgnoreDataRule(json) - that.props.dispatch({ + that.props.dispatch({ type: 'app/getDataByPost', payload: json, url: 'SK/BasicLibraryTemp/Get', onComplete: (ret) => { if (ret) { - if(that.props.data && that.props.data.loadDataDeal) - { + if (that.props.data && that.props.data.loadDataDeal) { that.props.data.loadDataDeal(1); } that.setState({ data: ret }); - if (that.props.data.tableKey==="2" ||that.props.data.tableKey===undefined) { + if (that.props.data.tableKey === "2" || that.props.data.tableKey === undefined) { that.setState({ BtnAgreeDisplay: 'none' }) - }else{ + } else { that.setState({ BtnAgreeDisplay: 'inline' }) } this.onClickApprove(false); @@ -67,22 +67,22 @@ class SK043ShowPrint extends React.Component { // this.setState({ isFinished: 'inline' }) // } } - + } }); } onTableBtnExport() { - const enums=this.props.data.enums ? this.props.data.enums :this.props.app.enums ; + const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; let TableWrap = document.getElementById('tableId' + this.props.data.id); let Table = TableWrap.getElementsByTagName('table')[0]; const wb = XLSX.utils.table_to_book(Table); XLSX.writeFile(wb, "双控基础库.xlsx") } - onClickApprove=(appVisible)=>{ + onClickApprove = (appVisible) => { const newtmpData = { - data: { id: this.props.data.id, isShow: true,key:guid(),param:this.props.data.param,appVisible:appVisible,BtnAgreeDisplay:'inline'}, + data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' }, formCode: "PF123", } this.setState({ @@ -91,81 +91,81 @@ class SK043ShowPrint extends React.Component { } render() { const { data } = this.state; - const enums=this.props.data.enums ? this.props.data.enums :this.props.app.enums ; + const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; // let aaa = Math.random(); return
- +
- {/* */} + {/* */} } + trigger={() => } content={() => this.componentRef} /> - +
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id}>

双控基础库

{ - data ? -
- - {data.Nav_ProductionUnit?.NAME} - {data.Nav_Area? data.Nav_Area?.NAME : ''} - {data.RISK_NAME} - {data.RISK_DESCRIPTION} - {data.Nav_Type? data.Nav_Type?.NAME : ''} - {data.EVALUATE_L} - {data.EVALUATE_E} - {data.EVALUATE_C} - {data.EVALUATE_SCORE} - {enums.SKEvaluateLevelEnum.enums[data.EVALUATE_LEVEL]} - - - - - { - data?.Nav_Measures && data?.Nav_Measures.map((item, i) => { - return - - {(i+1)+"."+item?.MEASURES_NAME} - - - {item?.EMERGENCY} - - - { - item?.Nav_Levels && item?.Nav_Levels.map((item2, i) => { - return {enums.SKDepartmentTypeEnum.enums[item2?.DEPARTMENT_TYPE]} - }) - } - + data ? +
+ + {data.Nav_ProductionUnit?.NAME} + {data.Nav_Area ? data.Nav_Area?.NAME : ''} + {data.RISK_NAME} + {data.RISK_DESCRIPTION} + {data.Nav_Type ? data.Nav_Type?.NAME : ''} + {data.EVALUATE_L} + {data.EVALUATE_E} + {data.EVALUATE_C} + {data.EVALUATE_SCORE} + {enums.SKEvaluateLevelEnum.enums[data.EVALUATE_LEVEL]} + + + + + { + data?.Nav_Measures && data?.Nav_Measures.map((item, i) => { + return + + {(i + 1) + "." + item?.MEASURES_NAME} + + + {item?.EMERGENCY} + + + { + item?.Nav_Levels && item?.Nav_Levels.map((item2, i) => { + return {enums.SKDepartmentTypeEnum.enums[item2?.DEPARTMENT_TYPE]} + }) + } + + + }) + } + + + + { + data?.Nav_Contents && data?.Nav_Contents.map((item, i) => { + return {(i + 1) + "." + item?.CHECK_CONTENT} + {item?.CHECK_BASIC} + {item?.CHECK_STANDARD} - }) - } - - - - { - data?.Nav_Contents && data?.Nav_Contents.map((item, i) => { - return {(i+1)+"."+item?.CHECK_CONTENT} - {item?.CHECK_BASIC} - {item?.CHECK_STANDARD} - - }) - } - - - { - data?.Nav_Hiddens && data?.Nav_Hiddens.map((item, i) => { - return {(i+1)+"."+item?.HIDDEN_DESCRIPTION} - {enums.SKHiddenLevel.enums[item?.HIDDEN_LEVEL]} - {item?.RECTIFICATION_MEASURES} - }) - } - -
:null + }) + } + + + { + data?.Nav_Hiddens && data?.Nav_Hiddens.map((item, i) => { + return {(i + 1) + "." + item?.HIDDEN_DESCRIPTION} + {enums.SKHiddenLevel.enums[item?.HIDDEN_LEVEL]} + {item?.RECTIFICATION_MEASURES} + }) + } + +
: null } - +
@@ -173,4 +173,4 @@ class SK043ShowPrint extends React.Component { } -export default connect(({ login,app }) => ({ login,app }))(SK043ShowPrint) \ No newline at end of file +export default connect(({ login, app }) => ({ login, app }))(SK043ShowPrint) \ No newline at end of file diff --git a/src/components/CustomPages/SK/SK045ShowPrint.js b/src/components/CustomPages/SK/SK045ShowPrint.js index 156c740..e1d1de0 100644 --- a/src/components/CustomPages/SK/SK045ShowPrint.js +++ b/src/components/CustomPages/SK/SK045ShowPrint.js @@ -1,6 +1,6 @@ -import { Button, Descriptions,Popconfirm, Row, Col, Form,Modal, Input, Select, Table } from 'antd'; +import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, 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, initQueryFilter } from "../../../utils/common"; import ReactToPrint from "react-to-print"; import stylesStep from '../HI/StepForm.css'; import config from "../../../config"; @@ -29,15 +29,16 @@ class SK045ShowPrint extends React.Component { this.loadData(NextProps.data?.id); } } - + 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 that=this; + let that = this; let json = initFilter(that.props.login.OrgId); + json.Parameter22 = this.props.data.ORG_ID_HV; extendRule(json, 'ID', 1, dataId); // extendInclude(json, 'Nav_Type'); // extendInclude(json, 'Nav_Area'); @@ -49,20 +50,19 @@ class SK045ShowPrint extends React.Component { // extendInclude(json, 'Nav_Contents.Nav_Departs.Nav_Posts.Nav_Post'); // extendInclude(json, 'Nav_Hiddens'); extendIgnoreDataRule(json) - that.props.dispatch({ + that.props.dispatch({ type: 'app/getDataByPost', payload: json, url: 'SK/SKEnterpriseLibraryTemp/FullGet', onComplete: (ret) => { if (ret) { - if(that.props.data && that.props.data.loadDataDeal) - { + if (that.props.data && that.props.data.loadDataDeal) { that.props.data.loadDataDeal(1); } that.setState({ data: ret }); - if (that.props.data.tableKey==="2" ||that.props.data.tableKey===undefined) { + if (that.props.data.tableKey === "2" || that.props.data.tableKey === undefined) { that.setState({ BtnAgreeDisplay: 'none' }) - }else{ + } else { that.setState({ BtnAgreeDisplay: 'inline' }) } this.onClickApprove(false); @@ -71,22 +71,22 @@ class SK045ShowPrint extends React.Component { // this.setState({ isFinished: 'inline' }) // } } - + } }); } onTableBtnExport() { - const enums=this.props.data.enums ? this.props.data.enums :this.props.app.enums ; + const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; let TableWrap = document.getElementById('tableId' + this.props.data.id); let Table = TableWrap.getElementsByTagName('table')[0]; const wb = XLSX.utils.table_to_book(Table); XLSX.writeFile(wb, "双控企业库.xlsx") } - onClickApprove=(appVisible)=>{ + onClickApprove = (appVisible) => { const newtmpData = { - data: { id: this.props.data.id, isShow: true,key:guid(),param:this.props.data.param,appVisible:appVisible,BtnAgreeDisplay:'inline'}, + data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' }, formCode: "PF123", } this.setState({ @@ -95,105 +95,105 @@ class SK045ShowPrint extends React.Component { } render() { const { data } = this.state; - const enums=this.props.data.enums ? this.props.data.enums :this.props.app.enums ; + const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; // let aaa = Math.random(); return
- +
- {/* */} + {/* */} } + trigger={() => } content={() => this.componentRef} /> - +
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id}>

双控企业库

{ - data ? -
- - {data.Nav_ProductionUnit?.NAME} - {data.Nav_Area? data.Nav_Area?.NAME : ''} - {data.RISK_NAME} - {data.RISK_DESCRIPTION} - {data.Nav_Type? data.Nav_Type?.NAME : ''} - {data.EVALUATE_L} - {data.EVALUATE_E} - {data.EVALUATE_C} - {data.EVALUATE_SCORE} - {enums.SKEvaluateLevelEnum.enums[data.EVALUATE_LEVEL]} - {data.CREATE_TIME} - {enums.FMEnableStatusEnum.enums[data.ENABLE_STATUS]} - - - - { - data?.Nav_Measures && data?.Nav_Measures.map((item, i) => { - return - - {(i+1)+"."+item?.MEASURES_NAME} - - - {item?.EMERGENCY} - - - { - item?.Nav_Departs && item?.Nav_Departs.map((item2, i) => { - return - {enums.SKDepartmentTypeEnum.enums[item2?.DEPARTMENT_TYPE]} - {item2?.Nav_Department?.NAME} - {item2?.Nav_User?.NAME} - - }) - } - - - - }) - } - - - - { - data?.Nav_Contents && data?.Nav_Contents.map((item, i) => { - return {(i+1)+"."+item?.CHECK_CONTENT} - {item?.CHECK_BASIC} - {item?.CHECK_STANDARD} - - { - item?.Nav_Departs && item?.Nav_Departs.map((item2, i) => { - return - {enums.SKDepartmentTypeEnum.enums[item2?.CHECK_TYPE]} - { - item2?.Nav_Posts && item2?.Nav_Posts.map((item3, i) => { - return - {item3?.Nav_Post?.NAME} + data ? +
+ + {data.Nav_ProductionUnit?.NAME} + {data.Nav_Area ? data.Nav_Area?.NAME : ''} + {data.RISK_NAME} + {data.RISK_DESCRIPTION} + {data.Nav_Type ? data.Nav_Type?.NAME : ''} + {data.EVALUATE_L} + {data.EVALUATE_E} + {data.EVALUATE_C} + {data.EVALUATE_SCORE} + {enums.SKEvaluateLevelEnum.enums[data.EVALUATE_LEVEL]} + {data.CREATE_TIME} + {enums.FMEnableStatusEnum.enums[data.ENABLE_STATUS]} + + + + { + data?.Nav_Measures && data?.Nav_Measures.map((item, i) => { + return + + {(i + 1) + "." + item?.MEASURES_NAME} + + + {item?.EMERGENCY} + + + { + item?.Nav_Departs && item?.Nav_Departs.map((item2, i) => { + return + {enums.SKDepartmentTypeEnum.enums[item2?.DEPARTMENT_TYPE]} + {item2?.Nav_Department?.NAME} + {item2?.Nav_User?.NAME} + + }) + } + + + + }) + } + + + + { + data?.Nav_Contents && data?.Nav_Contents.map((item, i) => { + return {(i + 1) + "." + item?.CHECK_CONTENT} + {item?.CHECK_BASIC} + {item?.CHECK_STANDARD} + + { + item?.Nav_Departs && item?.Nav_Departs.map((item2, i) => { + return + {enums.SKDepartmentTypeEnum.enums[item2?.CHECK_TYPE]} + { + item2?.Nav_Posts && item2?.Nav_Posts.map((item3, i) => { + return + {item3?.Nav_Post?.NAME} + + }) + } + {item2?.Nav_CheckType?.NAME} + {enums.SKPLANCHECKFREQUENCYEnum.enums[item2?.CHECK_CYCLE]} }) - } - {item2?.Nav_CheckType?.NAME} - {enums.SKPLANCHECKFREQUENCYEnum.enums[item2?.CHECK_CYCLE]} - - }) - } - - - }) - } - - - { - data?.Nav_Hiddens && data?.Nav_Hiddens.map((item, i) => { - return {(i+1)+"."+item?.HIDDEN_DESCRIPTION} - {enums.SKHiddenLevel.enums[item?.HIDDEN_LEVEL]} - {item?.RECTIFICATION_MEASURES} - }) - } - -
:null + } + + + }) + } + + + { + data?.Nav_Hiddens && data?.Nav_Hiddens.map((item, i) => { + return {(i + 1) + "." + item?.HIDDEN_DESCRIPTION} + {enums.SKHiddenLevel.enums[item?.HIDDEN_LEVEL]} + {item?.RECTIFICATION_MEASURES} + }) + } + +
: null } - +
@@ -201,4 +201,4 @@ class SK045ShowPrint extends React.Component { } -export default connect(({ login,app }) => ({ login,app }))(SK045ShowPrint) \ No newline at end of file +export default connect(({ login, app }) => ({ login, app }))(SK045ShowPrint) \ No newline at end of file diff --git a/src/files/edit/FO043.js b/src/files/edit/FO043.js index 04754b3..0172e6f 100644 --- a/src/files/edit/FO043.js +++ b/src/files/edit/FO043.js @@ -125,6 +125,44 @@ export default { } }, + onSubChange: ({ row, pageCode, record, colInfo, dispatch, stateData, props, saveRowRecord }) => { + if (colInfo.FIELD_NAME == 'Nav_Train.CERTIFICATE_NAME') { + let trainId = getDataFieldValue(record, 'TRAIN_ID'); + if (trainId) { + const json = initFilter(); + extendRule(json, 'ID', 1, trainId); + extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File') + dispatch({ + type: 'app/getDataByPost', + url: 'SE/RenewalTrain/OrderPaged', + payload: json, + onComplete: (ret) => { + if (ret) { + //record["Nav_Posts"] = []; + let copyRecord={...record}; + if (ret && ret.length > 0) { + let identifyings= ret[0].Nav_Files.map(item => { + return { + FIRE_JOB_USER_ID: record.ID, + ID: guid(), + IMG_FILE_ID: item.IMG_FILE_ID, + Nav_ImgFile: item.Nav_ImgFile, + ORG_ID: record.ORG_ID, + }; + }); + copyRecord["Nav_UserFiles"]=[...identifyings] + } + console.log(copyRecord) + saveRowRecord(copyRecord) + } + } + }) + } else { + record.Nav_Posts = []; + saveRowRecord(record) + } + } + }, // handleRenderRowControl(params) { // // setRowFieldVisible('Nav_Details.IS_CONFIRM_NEW', false) // // setRowFieldVisible('Nav_Details.Nav_DetailFiles', false) diff --git a/src/files/edit/SK018.js b/src/files/edit/SK018.js index 1baec84..f9c3a0d 100644 --- a/src/files/edit/SK018.js +++ b/src/files/edit/SK018.js @@ -1,7 +1,8 @@ import { message } from "antd/lib/index"; import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common"; import moment from 'moment'; -import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd'; +import FormPage from '../../components/FormPage'; +import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin, Table } from 'antd'; /** * @return {string} */ @@ -12,43 +13,64 @@ export default { params.record.PUBLISH = params.customParams; // params.record.FORM_CODE = params.data.reloadKey.substring(0,params.data.reloadKey.indexOf("_")); }, - onBeforeEdit(params){ - const { isNew, isCopy, dispatch, login, setFieldValue,data, stateData,setFieldVisible,getFieldValue} = params ? params : {}; - - if (isNew) { - setFieldValue('MineType', login.currentMineType); - setFieldVisible("CONTEXT", false); - } - else - { - if(stateData.STATUS === 40) - { - setFieldVisible("CONTEXT", true); - } - else - {setFieldVisible("CONTEXT", false);} + onBeforeEdit(params) { + const { isNew, isCopy, dispatch, login, setFieldValue, data, stateData, setFieldVisible, getFieldValue } = params ? params : {}; + + if (isNew) { + setFieldValue('MineType', login.currentMineType); + setFieldVisible("CONTEXT", false); + } + else { + if (stateData.STATUS === 40) { + setFieldVisible("CONTEXT", true); } + else { setFieldVisible("CONTEXT", false); } + } }, - onChange: ({ value, colInfo, record, stateData, data, getFieldValue, setFieldVisible, setFieldRequired,setFieldValue }) => { + onChange: ({ value, colInfo, record, stateData, data, getFieldValue, setFieldVisible, setFieldRequired, setFieldValue }) => { if (colInfo != null && colInfo.FIELD_NAME == "IS_STORE") { - var isStore = getFieldValue("IS_STORE"); - if(isStore && isStore === 10 ) - { - setFieldVisible("DEPARTMENT_TYPE", true); - setFieldVisible("Nav_CheckType.NAME", true); - setFieldVisible("PLANCHECKFREQUENCY", true); - setFieldRequired("DEPARTMENT_TYPE", true); - setFieldRequired("Nav_CheckType.NAME", true); - setFieldRequired("PLANCHECKFREQUENCY", true); - }else - { - setFieldVisible("DEPARTMENT_TYPE", false); - setFieldVisible("Nav_CheckType.NAME", false); - setFieldVisible("PLANCHECKFREQUENCY", false); - setFieldRequired("DEPARTMENT_TYPE", false); - setFieldRequired("Nav_CheckType.NAME", false); - setFieldRequired("PLANCHECKFREQUENCY", false); - } - } + var isStore = getFieldValue("IS_STORE"); + if (isStore && isStore === 10) { + setFieldVisible("DEPARTMENT_TYPE", true); + setFieldVisible("Nav_CheckType.NAME", true); + setFieldVisible("PLANCHECKFREQUENCY", true); + setFieldRequired("DEPARTMENT_TYPE", true); + setFieldRequired("Nav_CheckType.NAME", true); + setFieldRequired("PLANCHECKFREQUENCY", true); + } else { + setFieldVisible("DEPARTMENT_TYPE", false); + setFieldVisible("Nav_CheckType.NAME", false); + setFieldVisible("PLANCHECKFREQUENCY", false); + setFieldRequired("DEPARTMENT_TYPE", false); + setFieldRequired("Nav_CheckType.NAME", false); + setFieldRequired("PLANCHECKFREQUENCY", false); + } + } + }, + btnAddContent: ({ record, close, loadData, custom, login, dispatch, btn }) => { + // const rrecord= {record}; + const regClick = async function () { + await dispatch({ + type: 'custom/save', + payload: { + ['engineeringPlanEditClick' +(record ? record.CHECK_CONTENTS_ID : "") ]: true + }, + }); + }; + + const data = { + id: (record ? record.CHECK_CONTENTS_ID : ""), + clickKey: 'engineeringPlanEditClick', + close: () => { + }, + onCancel: () => { + }, + } + + return { + content: , + click: regClick + } + }, }