diff --git a/src/components/CustomPages/FM/UserEditPage.js b/src/components/CustomPages/FM/UserEditPage.js index dd0805c..cb14934 100644 --- a/src/components/CustomPages/FM/UserEditPage.js +++ b/src/components/CustomPages/FM/UserEditPage.js @@ -720,6 +720,18 @@ class UserEditPage extends React.Component { )} + + + { onChange('BORN_DATE', dateString, 0) }} + /> + + {data.CODE} - {data.NAME} + {/* {data.NAME} */} {data.DISCLOSURE_DATE} {data.JOB_LOCATION} {data.Nav_User ? data.Nav_User.NAME : ''} diff --git a/src/components/CustomPages/FO/FO037ShowPrint.js b/src/components/CustomPages/FO/FO037ShowPrint.js index 6296fb5..3873198 100644 --- a/src/components/CustomPages/FO/FO037ShowPrint.js +++ b/src/components/CustomPages/FO/FO037ShowPrint.js @@ -109,7 +109,7 @@ class FO037ShowPrint extends React.Component {
{data.CODE} - {data.NAME} + {/* {data.NAME} */} {data.DISCLOSURE_DATE} {data.JOB_LOCATION} {data.Nav_User ? data.Nav_User.NAME : ''} diff --git a/src/components/CustomPages/FO/FO041ShowPrint.js b/src/components/CustomPages/FO/FO041ShowPrint.js index 74d8807..36651d7 100644 --- a/src/components/CustomPages/FO/FO041ShowPrint.js +++ b/src/components/CustomPages/FO/FO041ShowPrint.js @@ -3,7 +3,7 @@ import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } import React from 'react'; import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter,showFiles, GetFileModel,showUserSign } from "../../../utils/common"; import ReactToPrint from "react-to-print"; -import stylesStep from '../HI/StepForm.css'; +import styles from '../HI/StepForm.css'; import config from "../../../config"; import XLSX from 'xlsx'; import { connect } from 'dva'; @@ -104,10 +104,10 @@ class FO041ShowPrint extends React.Component {
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id} className="printDIV">

领导带班下井记录

- { - data ? + { + data?
- + {data.Nav_Company?.NAME} {data.Nav_ProductionUnit?.NAME} {data.CREATE_TIME} @@ -123,101 +123,105 @@ class FO041ShowPrint extends React.Component { {data.JOB_END_DATE} {data.Nav_Class?.NAME} {showFiles(data.Nav_Files, config.picServerHost, this)} - { - data && data.Nav_Details? - - - - - - - - - - - - - - - - - { - data.Nav_Details && data.Nav_Details.map((item, i) => { - return - - - - {item2?.Nav_Area?.NAME} - }) - } - - - - - - - - - + + + { + data && data.Nav_Details? +
序号开始时间结束时间巡视区域现场情况描述发现问题处置措施附件现场责任人现场责任人签名交接事项
- {i + 1} - - {item.START_DATE} - - {item.END_DATE} - - { - item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => { - return
- {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):item.Nav_User?.NAME} - - {item.ITEM} -
+ + + + + + + + + + + + + + + + { + data.Nav_Details && data.Nav_Details.map((item, i) => { + return + + + + {item2?.Nav_Area?.NAME} }) } - -
序号开始时间结束时间巡视区域现场情况描述发现问题处置措施附件现场责任人现场责任人签名交接事项
+ {i + 1} + + {item.START_DATE} + + {item.END_DATE} + + { + item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => { + return
: null - } - {data.PLACE} - { - data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => { - return item.Nav_PreUser?.NAME + ' ' - }) - } - { - data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => { - if (item.PRE_USER_DEAL_STATUS == 1) { - showUserSign(item.Nav_PreUser, config.picServerHost) - } - }) - - } - { - data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => { - return item.Nav_AfterUser?.NAME + ' ' - }) - - } - { - data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => { - if (item.AFTER_USER_DEAL_STATUS == 1) { - showUserSign(item.Nav_AfterUser, config.picServerHost) - } - }) - } - -
: null - } -
+ + + {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 + } +

+ + {data.PLACE} + { + data.Nav_Users && data.Nav_Users.map((item, i) => { + return item.Nav_User?.NAME + ' ' + }) + } + { + data.Nav_Users && data.Nav_Users.map((item, i) => { + if (item.DEAL_STATUS == 1) { + showUserSign(item.Nav_User, config.picServerHost) + } + }) + + } + { + data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => { + return item.Nav_AfterUser?.NAME + ' ' + }) + + } + { + data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => { + if (item.AFTER_USER_DEAL_STATUS == 1) { + showUserSign(item.Nav_AfterUser, config.picServerHost) + } + }) + } + +
:null + } + } diff --git a/src/components/CustomPages/FO/FO043ShowPrint.js b/src/components/CustomPages/FO/FO043ShowPrint.js index 527e191..2a2831f 100644 --- a/src/components/CustomPages/FO/FO043ShowPrint.js +++ b/src/components/CustomPages/FO/FO043ShowPrint.js @@ -3,11 +3,12 @@ import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } import React from 'react'; import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter,showFiles, GetFileModel,showUserSign } from "../../../utils/common"; import ReactToPrint from "react-to-print"; -import stylesStep from '../HI/StepForm.css'; +import styles from '../HI/StepForm.css'; import config from "../../../config"; import XLSX from 'xlsx'; import { connect } from 'dva'; import moment from 'moment'; +import FormPage from '../../../components/FormPage' class FO043ShowPrint extends React.Component { constructor(props) { super(props); @@ -73,12 +74,21 @@ class FO043ShowPrint extends React.Component { }else{ this.setState({ BtnAgreeDisplay: 'inline' }) } + this.onClickApprove(false); } } }); } - + onClickApprove = (appVisible) => { + const newtmpData = { + data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' }, + formCode: "PF123", + } + this.setState({ + tmpData: newtmpData, + }); + } onTableBtnExport() { let TableWrap = document.getElementById('tableId' + this.props.data.id); let Table = TableWrap.getElementsByTagName('table')[0]; @@ -88,8 +98,10 @@ class FO043ShowPrint extends React.Component { render() { const { data } = this.state; + const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; return
+ } content={() => this.componentRef} @@ -107,7 +119,7 @@ class FO043ShowPrint extends React.Component { { data ?
- + {data.Nav_Company?.NAME} {data.Nav_ProductionUnit?.NAME} {data.CREATE_TIME} diff --git a/src/components/CustomPages/FO/FO045ShowPrint.js b/src/components/CustomPages/FO/FO045ShowPrint.js index 00340a6..855a656 100644 --- a/src/components/CustomPages/FO/FO045ShowPrint.js +++ b/src/components/CustomPages/FO/FO045ShowPrint.js @@ -3,11 +3,12 @@ import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } import React from 'react'; import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter,showFiles, GetFileModel,showUserSign } from "../../../utils/common"; import ReactToPrint from "react-to-print"; -import stylesStep from '../HI/StepForm.css'; +import styles from '../HI/StepForm.css'; import config from "../../../config"; import XLSX from 'xlsx'; import { connect } from 'dva'; import moment from 'moment'; +import FormPage from '../../../components/FormPage' class FO045ShowPrint extends React.Component { constructor(props) { super(props); @@ -73,12 +74,21 @@ class FO045ShowPrint extends React.Component { }else{ this.setState({ BtnAgreeDisplay: 'inline' }) } + this.onClickApprove(false); } } }); } - + onClickApprove = (appVisible) => { + const newtmpData = { + data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' }, + formCode: "PF123", + } + this.setState({ + tmpData: newtmpData, + }); + } onTableBtnExport() { let TableWrap = document.getElementById('tableId' + this.props.data.id); let Table = TableWrap.getElementsByTagName('table')[0]; @@ -88,8 +98,10 @@ class FO045ShowPrint extends React.Component { render() { const { data } = this.state; + const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; return
+ } content={() => this.componentRef} @@ -103,11 +115,11 @@ class FO045ShowPrint 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} diff --git a/src/files/edit/FO039.js b/src/files/edit/FO039.js index d38b0b4..de1bee1 100644 --- a/src/files/edit/FO039.js +++ b/src/files/edit/FO039.js @@ -6,7 +6,7 @@ import moment from 'moment'; */ // 编辑 export default { - onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => { + onChange: ({ colInfo, getFieldValue, setFieldValueByBatch,setFieldValue, dispatch,login,updateSubTableData }) => { if (!(colInfo.FIELD_NAME == 'Nav_User.NAME')) return; @@ -26,8 +26,8 @@ export default { }, onSubChange: ({ row, getFieldValue, setFieldValueByBatch, pageCode, record, setDataState, colInfo, dispatch, stateData, saveRowRecord }) => { if (colInfo.FIELD_NAME === "START_DATE" ||colInfo.FIELD_NAME === "END_DATE" ) { - let startDate = getFieldValue('START_DATE') - let endDate = getFieldValue('END_DATE') + let startDate = getDataFieldValue(record, 'START_DATE'); + let endDate =getDataFieldValue(record, 'END_DATE'); if(startDate && endDate) { const start = new Date(startDate); @@ -40,8 +40,17 @@ export default { yearsWithDecimal = yearsWithDecimal.substring(0, yearsWithDecimal.length - 2); } - record["WORK_YEAR"] = parseDecimal(yearsWithDecimal); + record["WORK_YEAR"] = yearsWithDecimal; saveRowRecord(record) + if(stateData && stateData.Nav_Details) + { + let year = 0; + stateData.Nav_Details.map(t=>{ + year = Math.round(year + t.WORK_YEAR); + }) + stateData.YEAR=year + setDataState(stateData) + } } } } diff --git a/src/files/edit/FO043.js b/src/files/edit/FO043.js index 6cbd8e7..d86f811 100644 --- a/src/files/edit/FO043.js +++ b/src/files/edit/FO043.js @@ -37,7 +37,7 @@ export default { setFieldEditable('IS_FIRE', false) setFieldEditable('ACT_DATE', false) setFieldEditable('Nav_FireFiles', false) - setFieldEditable('Nav_DispatchUser', false) + setFieldEditable('Nav_DispatchUser.NAME', false) setFieldEditable('COMPLETED_CONTENT', false) setFieldEditable('IS_LEAVE', false) setFieldEditable('ACT_END_DATE', false) @@ -50,7 +50,7 @@ export default { setFieldEditable('IS_FIRE', true) setFieldEditable('ACT_DATE', true) setFieldEditable('Nav_FireFiles', true) - setFieldEditable('Nav_DispatchUser', true) + setFieldEditable('Nav_DispatchUser.NAME', true) setFieldEditable('COMPLETED_CONTENT', false) setFieldEditable('IS_LEAVE', false) setFieldEditable('ACT_END_DATE', false) @@ -75,7 +75,7 @@ export default { setFieldEditable('IS_FIRE', false) setFieldEditable('ACT_DATE', false) setFieldEditable('Nav_FireFiles', false) - setFieldEditable('Nav_DispatchUser', false) + setFieldEditable('Nav_DispatchUser.NAME', false) setFieldEditable('COMPLETED_CONTENT', false) setFieldEditable('IS_LEAVE', false) setFieldEditable('ACT_END_DATE', false)