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

优化

Browse Source
This commit is contained in:
何美荣 2025-11-19 21:41:11 +08:00
parent 42f7f1bf09
commit b526872fc2
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/CustomPages/SK/SK022ShowPrint.js
View File

@ -9,6 +9,7 @@ import { connect } from 'dva';
import stylesStep from '../HI/StepForm.css';
import FormPage from '../../../components/FormPage'
import moment from 'moment';
import { display } from "html2canvas/dist/types/css/property-descriptors/display";
class SK022ShowPrint extends React.Component {
constructor(props) {
super(props);
@ -124,7 +125,7 @@ class SK022ShowPrint extends React.Component {
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
<Button style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: data && data.STATUS === 21 ? "inline" : "none" }} onClick={() => this.onTableBtnAgree()} icon="check" >确认</Button>
<Button type="primary" style={{ marginLeft: '8px', display: data && data.STATUS === 21 ? "inline" : "none" }} onClick={() => this.onTableBtnAgree()} icon="check" >审阅</Button>
</div>
<div ref={el => (this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id}>
<h1 style={{ textAlign: 'center', margin: '15px' }}>隐患整改记录</h1>
@ -153,7 +154,11 @@ class SK022ShowPrint extends React.Component {
<Descriptions.Item label="整改期限">{moment(data.RECITIFY_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
<Descriptions.Item label="整改部门">{data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改责任人">{data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改落实人">{data.Nav_ImplementUser ? data.Nav_ImplementUser.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改落实人">{
data.STATUS == 21 &&
data.Nav_ImplementUser && data.Nav_ImplementUser.FILE_PATH ?
showUserSign(data.Nav_ImplementUser, config.picServerHost)
: data.Nav_ImplementUser ? data.Nav_ImplementUser.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改验收人">{data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="整改情况描述">{data.RECTIFICATION_DESCRIPTION}</Descriptions.Item>
<Descriptions.Item label="整改资金(元)">{data.RECTIFICATION_MONEY}</Descriptions.Item>
@ -167,16 +172,18 @@ class SK022ShowPrint extends React.Component {
<Descriptions.Item label="预案或方案">{
showFiles(data?.Nav_RectifyFiles, config.picServerHost, this)
}</Descriptions.Item>
<Descriptions.Item label="验收时间">{data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null}</Descriptions.Item>
<Descriptions.Item label="验收结论">{enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]}</Descriptions.Item>
<Descriptions.Item label="验收意见">{data.ACCEPT_OPINION}</Descriptions.Item>
<Descriptions.Item style={{display:(data.STATUS ===20 ||data.STATUS===30)?'inline':'none'}} label="验收时间">{data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null}</Descriptions.Item>
<Descriptions.Item style={{display:(data.STATUS ===20 ||data.STATUS===30)?'inline':'none'}} label="验收结论">{enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]}</Descriptions.Item>
<Descriptions.Item style={{display:(data.STATUS ===20 ||data.STATUS===30)?'inline':'none'}} label="验收意见">{data.ACCEPT_OPINION}</Descriptions.Item>
<Descriptions.Item label="整改责任人签名">{
data.STATUS == 20 &&
data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
showUserSign(data.Nav_RecitifyUser, config.picServerHost)
: data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
}</Descriptions.Item>
<Descriptions.Item label="验收人签名">{
(data.STATUS == 20 ||data.STATUS == 30) && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
data.STATUS == 30 && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
showUserSign(data.Nav_RecitifyUser, config.picServerHost)
: data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
}</Descriptions.Item>

10
src/files/edit/SK006.js
View File

@ -189,11 +189,11 @@ export default {
},
btnSubContents: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => {
// if(!stateData.PRODUCTION_UNIT_ID)
// {
// message.error("请选择生产单元!")
// return
// }debugger
if(!stateData.PRODUCTION_UNIT_ID)
{
message.error("请选择生产单元!")
return
}
// if(!stateData.DEPARTMENT_TYPE)
// {
// message.error("请选择检查层级!")