bug修复
This commit is contained in:
何美荣
parent
f45d92a394
commit
c82e7125c6
@ -720,6 +720,18 @@ class UserEditPage extends React.Component {
|
||||
</Select>)}
|
||||
</Form.Item>
|
||||
</Col>
|
||||
<Col span={8}>
|
||||
<Form.Item
|
||||
label={'出生日期'}
|
||||
{...formItemLayout}
|
||||
>
|
||||
<DatePicker
|
||||
value={moment(this.state.data.BORN_DATE)}
|
||||
placeholder={'请输入出生日期'}
|
||||
onChange={(value, dateString) => { onChange('BORN_DATE', dateString, 0) }}
|
||||
/>
|
||||
</Form.Item>
|
||||
</Col>
|
||||
<Col span={8}>
|
||||
<Form.Item
|
||||
label={'入职时间'}
|
||||
|
||||
@ -108,7 +108,7 @@ class FO035ShowPrint extends React.Component {
|
||||
<div>
|
||||
<Descriptions size="middle" bordered className={stylesStep.description}>
|
||||
<Descriptions.Item label="编号">{data.CODE}</Descriptions.Item>
|
||||
<Descriptions.Item label="交底事项">{data.NAME}</Descriptions.Item>
|
||||
{/* <Descriptions.Item label="交底事项">{data.NAME}</Descriptions.Item> */}
|
||||
<Descriptions.Item label="交底时间">{data.DISCLOSURE_DATE}</Descriptions.Item>
|
||||
<Descriptions.Item label="交底地点">{data.JOB_LOCATION}</Descriptions.Item>
|
||||
<Descriptions.Item label="交底人">{data.Nav_User ? data.Nav_User.NAME : ''}</Descriptions.Item>
|
||||
|
||||
@ -109,7 +109,7 @@ class FO037ShowPrint extends React.Component {
|
||||
<div>
|
||||
<Descriptions size="middle" bordered className={stylesStep.description}>
|
||||
<Descriptions.Item label="编号">{data.CODE}</Descriptions.Item>
|
||||
<Descriptions.Item label="交底事项">{data.NAME}</Descriptions.Item>
|
||||
{/* <Descriptions.Item label="交底事项">{data.NAME}</Descriptions.Item> */}
|
||||
<Descriptions.Item label="交底时间">{data.DISCLOSURE_DATE}</Descriptions.Item>
|
||||
<Descriptions.Item label="交底地点">{data.JOB_LOCATION}</Descriptions.Item>
|
||||
<Descriptions.Item label="交底人">{data.Nav_User ? data.Nav_User.NAME : ''}</Descriptions.Item>
|
||||
|
||||
@ -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';
|
||||
@ -105,9 +105,9 @@ class FO041ShowPrint extends React.Component {
|
||||
|
||||
<h1 style={{ textAlign: 'center', margin: '15px' }}>领导带班下井记录</h1>
|
||||
{
|
||||
data ?
|
||||
data?
|
||||
<div>
|
||||
<Descriptions size="middle" bordered className={stylesStep.description}>
|
||||
<Descriptions size="middle" bordered className={styles.description}>
|
||||
<Descriptions.Item label="公司">{data.Nav_Company?.NAME}</Descriptions.Item>
|
||||
<Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
|
||||
<Descriptions.Item label="发起时间">{data.CREATE_TIME}</Descriptions.Item>
|
||||
@ -123,101 +123,105 @@ class FO041ShowPrint extends React.Component {
|
||||
<Descriptions.Item label="值班结束时间">{data.JOB_END_DATE}</Descriptions.Item>
|
||||
<Descriptions.Item label="班次">{data.Nav_Class?.NAME}</Descriptions.Item>
|
||||
<Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
|
||||
{
|
||||
data && data.Nav_Details?
|
||||
<table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
|
||||
<tbody>
|
||||
|
||||
<tr>
|
||||
<td width="100px" className={styles.fontBold}>序号</td>
|
||||
<td className={styles.fontBold}>开始时间</td>
|
||||
<td className={styles.fontBold}>结束时间</td>
|
||||
<td className={styles.fontBold}>巡视区域</td>
|
||||
<td className={styles.fontBold}>现场情况描述</td>
|
||||
<td className={styles.fontBold}>发现问题</td>
|
||||
<td className={styles.fontBold}>处置措施</td>
|
||||
<td className={styles.fontBold}>附件</td>
|
||||
<td className={styles.fontBold}>现场责任人</td>
|
||||
<td className={styles.fontBold}>现场责任人签名</td>
|
||||
<td className={styles.fontBold}>交接事项</td>
|
||||
</tr>
|
||||
{
|
||||
data.Nav_Details && data.Nav_Details.map((item, i) => {
|
||||
return <tr>
|
||||
<td width="100px">
|
||||
{i + 1}
|
||||
</td>
|
||||
<td>
|
||||
{item.START_DATE}
|
||||
</td>
|
||||
<td>
|
||||
{item.END_DATE}
|
||||
</td>
|
||||
<td>
|
||||
{
|
||||
item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => {
|
||||
return <tr> {item2?.Nav_Area?.NAME}</tr>
|
||||
})
|
||||
}
|
||||
</td>
|
||||
<td>
|
||||
{item.DESCRIPTION}
|
||||
</td>
|
||||
<td>
|
||||
{item.QUESTION}
|
||||
</td>
|
||||
<td>
|
||||
{item.MEASURE}
|
||||
</td>
|
||||
<td>
|
||||
{showFiles(item.Nav_DetailFiles, config.picServerHost, this)}
|
||||
</td>
|
||||
<td>
|
||||
{item.Nav_User?.NAME}
|
||||
</td>
|
||||
<td>
|
||||
{item.USER_DEAL_STATUS == 1?showUserSign(item.Nav_User, config.picServerHost):item.Nav_User?.NAME}
|
||||
</td>
|
||||
<td>
|
||||
{item.ITEM}
|
||||
</td>
|
||||
</tr>
|
||||
</Descriptions>
|
||||
{
|
||||
data && data.Nav_Details?
|
||||
<table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
|
||||
<tbody>
|
||||
|
||||
<tr>
|
||||
<td width="100px" className={styles.fontBold}>序号</td>
|
||||
<td className={styles.fontBold}>开始时间</td>
|
||||
<td className={styles.fontBold}>结束时间</td>
|
||||
<td className={styles.fontBold}>巡视区域</td>
|
||||
<td className={styles.fontBold}>现场情况描述</td>
|
||||
<td className={styles.fontBold}>发现问题</td>
|
||||
<td className={styles.fontBold}>处置措施</td>
|
||||
<td className={styles.fontBold}>附件</td>
|
||||
<td className={styles.fontBold}>现场责任人</td>
|
||||
<td className={styles.fontBold}>现场责任人签名</td>
|
||||
<td className={styles.fontBold}>交接事项</td>
|
||||
</tr>
|
||||
{
|
||||
data.Nav_Details && data.Nav_Details.map((item, i) => {
|
||||
return <tr>
|
||||
<td width="100px">
|
||||
{i + 1}
|
||||
</td>
|
||||
<td>
|
||||
{item.START_DATE}
|
||||
</td>
|
||||
<td>
|
||||
{item.END_DATE}
|
||||
</td>
|
||||
<td>
|
||||
{
|
||||
item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => {
|
||||
return <tr> {item2?.Nav_Area?.NAME}</tr>
|
||||
})
|
||||
}
|
||||
</tbody>
|
||||
</table> : null
|
||||
}
|
||||
<Descriptions.Item label="交接班地点">{data.PLACE}</Descriptions.Item>
|
||||
<Descriptions.Item label="交班人">{
|
||||
data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => {
|
||||
return item.Nav_PreUser?.NAME + ' '
|
||||
})
|
||||
}</Descriptions.Item>
|
||||
<Descriptions.Item label="交班人签字">{
|
||||
data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => {
|
||||
if (item.PRE_USER_DEAL_STATUS == 1) {
|
||||
showUserSign(item.Nav_PreUser, config.picServerHost)
|
||||
}
|
||||
})
|
||||
</td>
|
||||
<td>
|
||||
{item.DESCRIPTION}
|
||||
</td>
|
||||
<td>
|
||||
{item.QUESTION}
|
||||
</td>
|
||||
<td>
|
||||
{item.MEASURE}
|
||||
</td>
|
||||
<td>
|
||||
{showFiles(item.Nav_DetailFiles, config.picServerHost, this)}
|
||||
</td>
|
||||
<td>
|
||||
{item.Nav_User?.NAME}
|
||||
</td>
|
||||
<td>
|
||||
{item.USER_DEAL_STATUS == 1?showUserSign(item.Nav_User, config.picServerHost):null}
|
||||
</td>
|
||||
<td>
|
||||
{item.ITEM}
|
||||
</td>
|
||||
</tr>
|
||||
})
|
||||
}
|
||||
</tbody>
|
||||
</table> : null
|
||||
}
|
||||
<br></br>
|
||||
<Descriptions size="middle" bordered className={styles.description}>
|
||||
<Descriptions.Item label="交接班地点">{data.PLACE}</Descriptions.Item>
|
||||
<Descriptions.Item label="交班人">{
|
||||
data.Nav_Users && data.Nav_Users.map((item, i) => {
|
||||
return item.Nav_User?.NAME + ' '
|
||||
})
|
||||
}</Descriptions.Item>
|
||||
<Descriptions.Item label="交班人签字">{
|
||||
data.Nav_Users && data.Nav_Users.map((item, i) => {
|
||||
if (item.DEAL_STATUS == 1) {
|
||||
showUserSign(item.Nav_User, config.picServerHost)
|
||||
}
|
||||
})
|
||||
|
||||
}</Descriptions.Item>
|
||||
<Descriptions.Item label="接班人">{
|
||||
data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
|
||||
return item.Nav_AfterUser?.NAME + ' '
|
||||
})
|
||||
}</Descriptions.Item>
|
||||
<Descriptions.Item label="接班人">{
|
||||
data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
|
||||
return item.Nav_AfterUser?.NAME + ' '
|
||||
})
|
||||
|
||||
}</Descriptions.Item>
|
||||
<Descriptions.Item label="接班人签字">{
|
||||
data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
|
||||
if (item.AFTER_USER_DEAL_STATUS == 1) {
|
||||
showUserSign(item.Nav_AfterUser, config.picServerHost)
|
||||
}
|
||||
})
|
||||
}</Descriptions.Item>
|
||||
</Descriptions>
|
||||
</div> : null
|
||||
}
|
||||
</div>
|
||||
}</Descriptions.Item>
|
||||
<Descriptions.Item label="接班人签字">{
|
||||
data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
|
||||
if (item.AFTER_USER_DEAL_STATUS == 1) {
|
||||
showUserSign(item.Nav_AfterUser, config.picServerHost)
|
||||
}
|
||||
})
|
||||
}</Descriptions.Item>
|
||||
</Descriptions>
|
||||
</div>:null
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
@ -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 <div>
|
||||
<div style={{ padding: '10px' }}>
|
||||
<Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
|
||||
<ReactToPrint
|
||||
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }}>打印</Button>}
|
||||
content={() => this.componentRef}
|
||||
@ -107,7 +119,7 @@ class FO043ShowPrint extends React.Component {
|
||||
{
|
||||
data ?
|
||||
<div>
|
||||
<Descriptions size="middle" bordered className={stylesStep.description}>
|
||||
<Descriptions size="middle" bordered className={styles.description}>
|
||||
<Descriptions.Item label="公司">{data.Nav_Company?.NAME}</Descriptions.Item>
|
||||
<Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
|
||||
<Descriptions.Item label="发起时间">{data.CREATE_TIME}</Descriptions.Item>
|
||||
|
||||
@ -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 <div>
|
||||
<div style={{ padding: '10px' }}>
|
||||
<Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
|
||||
<ReactToPrint
|
||||
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }}>打印</Button>}
|
||||
content={() => this.componentRef}
|
||||
@ -103,11 +115,11 @@ class FO045ShowPrint extends React.Component {
|
||||
{/* */}
|
||||
<div ref={el => (this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id} className="printDIV">
|
||||
|
||||
<h1 style={{ textAlign: 'center', margin: '15px' }}>动火作业工作票动火作业工作票(外包)</h1>
|
||||
<h1 style={{ textAlign: 'center', margin: '15px' }}>动火作业工作票(外包)</h1>
|
||||
{
|
||||
data ?
|
||||
<div>
|
||||
<Descriptions size="middle" bordered className={stylesStep.description}>
|
||||
<Descriptions size="middle" bordered className={styles.description}>
|
||||
<Descriptions.Item label="公司">{data.Nav_Company?.NAME}</Descriptions.Item>
|
||||
<Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
|
||||
<Descriptions.Item label="发起时间">{data.CREATE_TIME}</Descriptions.Item>
|
||||
|
||||
@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user