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

bug修复

Browse Source
This commit is contained in:
何美荣 2025-11-22 01:42:37 +08:00
parent f45d92a394
commit c82e7125c6
8 changed files with 162 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/CustomPages/FM/UserEditPage.js
View File

@ -720,6 +720,18 @@ class UserEditPage extends React.Component {
</Select>)} </Select>)}
</Form.Item> </Form.Item>
</Col> </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}> <Col span={8}>
<Form.Item <Form.Item
label={'入职时间'} label={'入职时间'}

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

@ -108,7 +108,7 @@ class FO035ShowPrint extends React.Component {
<div> <div>
<Descriptions size="middle" bordered className={stylesStep.description}> <Descriptions size="middle" bordered className={stylesStep.description}>
<Descriptions.Item label="编号">{data.CODE}</Descriptions.Item> <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.DISCLOSURE_DATE}</Descriptions.Item>
<Descriptions.Item label="交底地点">{data.JOB_LOCATION}</Descriptions.Item> <Descriptions.Item label="交底地点">{data.JOB_LOCATION}</Descriptions.Item>
<Descriptions.Item label="交底人">{data.Nav_User ? data.Nav_User.NAME : ''}</Descriptions.Item> <Descriptions.Item label="交底人">{data.Nav_User ? data.Nav_User.NAME : ''}</Descriptions.Item>

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

@ -109,7 +109,7 @@ class FO037ShowPrint extends React.Component {
<div> <div>
<Descriptions size="middle" bordered className={stylesStep.description}> <Descriptions size="middle" bordered className={stylesStep.description}>
<Descriptions.Item label="编号">{data.CODE}</Descriptions.Item> <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.DISCLOSURE_DATE}</Descriptions.Item>
<Descriptions.Item label="交底地点">{data.JOB_LOCATION}</Descriptions.Item> <Descriptions.Item label="交底地点">{data.JOB_LOCATION}</Descriptions.Item>
<Descriptions.Item label="交底人">{data.Nav_User ? data.Nav_User.NAME : ''}</Descriptions.Item> <Descriptions.Item label="交底人">{data.Nav_User ? data.Nav_User.NAME : ''}</Descriptions.Item>

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

@ -3,7 +3,7 @@ import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table }
import React from 'react'; 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 ReactToPrint from "react-to-print";
import stylesStep from '../HI/StepForm.css'; import styles from '../HI/StepForm.css';
import config from "../../../config"; import config from "../../../config";
import XLSX from 'xlsx'; import XLSX from 'xlsx';
import { connect } from 'dva'; import { connect } from 'dva';
@ -107,7 +107,7 @@ class FO041ShowPrint extends React.Component {
{ {
data? data?
<div> <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_Company?.NAME}</Descriptions.Item>
<Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item> <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
<Descriptions.Item label="发起时间">{data.CREATE_TIME}</Descriptions.Item> <Descriptions.Item label="发起时间">{data.CREATE_TIME}</Descriptions.Item>
@ -123,6 +123,8 @@ class FO041ShowPrint extends React.Component {
<Descriptions.Item label="值班结束时间">{data.JOB_END_DATE}</Descriptions.Item> <Descriptions.Item label="值班结束时间">{data.JOB_END_DATE}</Descriptions.Item>
<Descriptions.Item label="班次">{data.Nav_Class?.NAME}</Descriptions.Item> <Descriptions.Item label="班次">{data.Nav_Class?.NAME}</Descriptions.Item>
<Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item> <Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
</Descriptions>
{ {
data && data.Nav_Details? data && data.Nav_Details?
<table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}> <table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
@ -176,7 +178,7 @@ class FO041ShowPrint extends React.Component {
{item.Nav_User?.NAME} {item.Nav_User?.NAME}
</td> </td>
<td> <td>
{item.USER_DEAL_STATUS == 1?showUserSign(item.Nav_User, config.picServerHost):item.Nav_User?.NAME} {item.USER_DEAL_STATUS == 1?showUserSign(item.Nav_User, config.picServerHost):null}
</td> </td>
<td> <td>
{item.ITEM} {item.ITEM}
@ -187,16 +189,18 @@ class FO041ShowPrint extends React.Component {
</tbody> </tbody>
</table> : null </table> : null
} }
<br></br>
<Descriptions size="middle" bordered className={styles.description}>
<Descriptions.Item label="交接班地点">{data.PLACE}</Descriptions.Item> <Descriptions.Item label="交接班地点">{data.PLACE}</Descriptions.Item>
<Descriptions.Item label="交班人">{ <Descriptions.Item label="交班人">{
data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => { data.Nav_Users && data.Nav_Users.map((item, i) => {
return item.Nav_PreUser?.NAME + ' ' return item.Nav_User?.NAME + ' '
}) })
}</Descriptions.Item> }</Descriptions.Item>
<Descriptions.Item label="交班人签字">{ <Descriptions.Item label="交班人签字">{
data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => { data.Nav_Users && data.Nav_Users.map((item, i) => {
if (item.PRE_USER_DEAL_STATUS == 1) { if (item.DEAL_STATUS == 1) {
showUserSign(item.Nav_PreUser, config.picServerHost) showUserSign(item.Nav_User, config.picServerHost)
} }
}) })

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

@ -3,11 +3,12 @@ import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table }
import React from 'react'; 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 ReactToPrint from "react-to-print";
import stylesStep from '../HI/StepForm.css'; import styles from '../HI/StepForm.css';
import config from "../../../config"; import config from "../../../config";
import XLSX from 'xlsx'; import XLSX from 'xlsx';
import { connect } from 'dva'; import { connect } from 'dva';
import moment from 'moment'; import moment from 'moment';
import FormPage from '../../../components/FormPage'
class FO043ShowPrint extends React.Component { class FO043ShowPrint extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
@ -73,12 +74,21 @@ class FO043ShowPrint extends React.Component {
}else{ }else{
this.setState({ BtnAgreeDisplay: 'inline' }) 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() { onTableBtnExport() {
let TableWrap = document.getElementById('tableId' + this.props.data.id); let TableWrap = document.getElementById('tableId' + this.props.data.id);
let Table = TableWrap.getElementsByTagName('table')[0]; let Table = TableWrap.getElementsByTagName('table')[0];
@ -88,8 +98,10 @@ class FO043ShowPrint extends React.Component {
render() { render() {
const { data } = this.state; const { data } = this.state;
const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
return <div> return <div>
<div style={{ padding: '10px' }}> <div style={{ padding: '10px' }}>
<Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
<ReactToPrint <ReactToPrint
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }}>打印</Button>} trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }}>打印</Button>}
content={() => this.componentRef} content={() => this.componentRef}
@ -107,7 +119,7 @@ class FO043ShowPrint extends React.Component {
{ {
data ? data ?
<div> <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_Company?.NAME}</Descriptions.Item>
<Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item> <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
<Descriptions.Item label="发起时间">{data.CREATE_TIME}</Descriptions.Item> <Descriptions.Item label="发起时间">{data.CREATE_TIME}</Descriptions.Item>

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

@ -3,11 +3,12 @@ import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table }
import React from 'react'; 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 ReactToPrint from "react-to-print";
import stylesStep from '../HI/StepForm.css'; import styles from '../HI/StepForm.css';
import config from "../../../config"; import config from "../../../config";
import XLSX from 'xlsx'; import XLSX from 'xlsx';
import { connect } from 'dva'; import { connect } from 'dva';
import moment from 'moment'; import moment from 'moment';
import FormPage from '../../../components/FormPage'
class FO045ShowPrint extends React.Component { class FO045ShowPrint extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
@ -73,12 +74,21 @@ class FO045ShowPrint extends React.Component {
}else{ }else{
this.setState({ BtnAgreeDisplay: 'inline' }) 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() { onTableBtnExport() {
let TableWrap = document.getElementById('tableId' + this.props.data.id); let TableWrap = document.getElementById('tableId' + this.props.data.id);
let Table = TableWrap.getElementsByTagName('table')[0]; let Table = TableWrap.getElementsByTagName('table')[0];
@ -88,8 +98,10 @@ class FO045ShowPrint extends React.Component {
render() { render() {
const { data } = this.state; const { data } = this.state;
const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
return <div> return <div>
<div style={{ padding: '10px' }}> <div style={{ padding: '10px' }}>
<Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
<ReactToPrint <ReactToPrint
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }}>打印</Button>} trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }}>打印</Button>}
content={() => this.componentRef} 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"> <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 ? data ?
<div> <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_Company?.NAME}</Descriptions.Item>
<Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item> <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
<Descriptions.Item label="发起时间">{data.CREATE_TIME}</Descriptions.Item> <Descriptions.Item label="发起时间">{data.CREATE_TIME}</Descriptions.Item>

17
src/files/edit/FO039.js
View File

@ -6,7 +6,7 @@ import moment from 'moment';
*/ */
// 编辑 // 编辑
export default { export default {
onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => { onChange: ({ colInfo, getFieldValue, setFieldValueByBatch,setFieldValue, dispatch,login,updateSubTableData }) => {
if (!(colInfo.FIELD_NAME == 'Nav_User.NAME')) if (!(colInfo.FIELD_NAME == 'Nav_User.NAME'))
return; return;
@ -26,8 +26,8 @@ export default {
}, },
onSubChange: ({ row, getFieldValue, setFieldValueByBatch, pageCode, record, setDataState, colInfo, dispatch, stateData, saveRowRecord }) => { onSubChange: ({ row, getFieldValue, setFieldValueByBatch, pageCode, record, setDataState, colInfo, dispatch, stateData, saveRowRecord }) => {
if (colInfo.FIELD_NAME === "START_DATE" ||colInfo.FIELD_NAME === "END_DATE" ) { if (colInfo.FIELD_NAME === "START_DATE" ||colInfo.FIELD_NAME === "END_DATE" ) {
let startDate = getFieldValue('START_DATE') let startDate = getDataFieldValue(record, 'START_DATE');
let endDate = getFieldValue('END_DATE') let endDate =getDataFieldValue(record, 'END_DATE');
if(startDate && endDate) if(startDate && endDate)
{ {
const start = new Date(startDate); const start = new Date(startDate);
@ -40,8 +40,17 @@ export default {
yearsWithDecimal = yearsWithDecimal.substring(0, yearsWithDecimal.length - 2); yearsWithDecimal = yearsWithDecimal.substring(0, yearsWithDecimal.length - 2);
} }
record["WORK_YEAR"] = parseDecimal(yearsWithDecimal); record["WORK_YEAR"] = yearsWithDecimal;
saveRowRecord(record) 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)
}
} }
} }
} }

6
src/files/edit/FO043.js
View File

@ -37,7 +37,7 @@ export default {
setFieldEditable('IS_FIRE', false) setFieldEditable('IS_FIRE', false)
setFieldEditable('ACT_DATE', false) setFieldEditable('ACT_DATE', false)
setFieldEditable('Nav_FireFiles', false) setFieldEditable('Nav_FireFiles', false)
setFieldEditable('Nav_DispatchUser', false) setFieldEditable('Nav_DispatchUser.NAME', false)
setFieldEditable('COMPLETED_CONTENT', false) setFieldEditable('COMPLETED_CONTENT', false)
setFieldEditable('IS_LEAVE', false) setFieldEditable('IS_LEAVE', false)
setFieldEditable('ACT_END_DATE', false) setFieldEditable('ACT_END_DATE', false)
@ -50,7 +50,7 @@ export default {
setFieldEditable('IS_FIRE', true) setFieldEditable('IS_FIRE', true)
setFieldEditable('ACT_DATE', true) setFieldEditable('ACT_DATE', true)
setFieldEditable('Nav_FireFiles', true) setFieldEditable('Nav_FireFiles', true)
setFieldEditable('Nav_DispatchUser', true) setFieldEditable('Nav_DispatchUser.NAME', true)
setFieldEditable('COMPLETED_CONTENT', false) setFieldEditable('COMPLETED_CONTENT', false)
setFieldEditable('IS_LEAVE', false) setFieldEditable('IS_LEAVE', false)
setFieldEditable('ACT_END_DATE', false) setFieldEditable('ACT_END_DATE', false)
@ -75,7 +75,7 @@ export default {
setFieldEditable('IS_FIRE', false) setFieldEditable('IS_FIRE', false)
setFieldEditable('ACT_DATE', false) setFieldEditable('ACT_DATE', false)
setFieldEditable('Nav_FireFiles', false) setFieldEditable('Nav_FireFiles', false)
setFieldEditable('Nav_DispatchUser', false) setFieldEditable('Nav_DispatchUser.NAME', false)
setFieldEditable('COMPLETED_CONTENT', false) setFieldEditable('COMPLETED_CONTENT', false)
setFieldEditable('IS_LEAVE', false) setFieldEditable('IS_LEAVE', false)
setFieldEditable('ACT_END_DATE', false) setFieldEditable('ACT_END_DATE', false)