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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

Browse Source
This commit is contained in:
yunkexin 2025-12-11 16:53:46 +08:00
commit 99e470290a
15 changed files with 85 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/CustomPages/FM/SelectUser.js
View File

@ -98,7 +98,7 @@ class SelectUser extends React.Component {
jsonUser.Limit=1000;
this.props.dispatch({
type: 'app/getDataByPost',
url: 'FM/User/OrderPagedAuthority',
url: 'FM/User/OrderPagedWithLevel',
payload: jsonUser,
onlyData: false,
onComplete: (ret) => {

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

@ -1,20 +1,25 @@
import { message } from "antd/lib/index";
import { Button,Descriptions, 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, 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";
import XLSX from 'xlsx';
import { connect } from 'dva';
import moment from 'moment';
import FormPage from '../../FormPage'
class FO019ShowPrint extends React.Component {
constructor(props) {
super(props);
this.state = {
data: null,
enumData: null,
BtnAgreeDisplay: 'none'
BtnAgreeDisplay: 'none',
fileForm: {
title: "",
visible: false,
},
};
};
@ -170,6 +175,10 @@ class FO019ShowPrint extends React.Component {
<td colSpan={2} rowSpan={1} className={styles.fontBold}>交底内容</td>
<td colSpan={8} rowSpan={1}>{data.DisclosureContent}</td>
</tr>
<tr>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>附件</td>
<td colSpan={8} rowSpan={1}>{showFiles(data.Nav_Files, config.picServerHost, this)}</td>
</tr>
<tr>
<td colSpan={2} rowSpan={1} className={styles.fontBold}>交底人签字</td>
<td colSpan={8} rowSpan={1}>{
@ -214,6 +223,9 @@ class FO019ShowPrint extends React.Component {
</table>:null
}
</div>
{
GetFileModel(Modal, FormPage, this, this.state.fileForm.visible)
}
</div>
}

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

@ -1,20 +1,25 @@
import { message } from "antd/lib/index";
import { Button,Descriptions, 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, 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";
import XLSX from 'xlsx';
import { connect } from 'dva';
import moment from 'moment';
import FormPage from '../../FormPage'
class FO035ShowPrint extends React.Component {
constructor(props) {
super(props);
this.state = {
data: null,
enumData: null,
BtnAgreeDisplay: 'none'
BtnAgreeDisplay: 'none',
fileForm: {
title: "",
visible: false,
},
};
};
@ -128,6 +133,7 @@ class FO035ShowPrint extends React.Component {
})
}</Descriptions.Item>
<Descriptions.Item label="交底内容">{data.DisclosureContent}</Descriptions.Item>
<Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
<Descriptions.Item label="交底人签字">{
(data.Nav_User && data.Nav_User.FILE_PATH)?
showUserSign(data.Nav_User, config.picServerHost):null
@ -149,6 +155,9 @@ class FO035ShowPrint extends React.Component {
</div> : null
}
</div>
{
GetFileModel(Modal, FormPage, this, this.state.fileForm.visible)
}
</div>
}

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

@ -1,20 +1,25 @@
import { message } from "antd/lib/index";
import { Button,Descriptions, 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, 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";
import XLSX from 'xlsx';
import { connect } from 'dva';
import moment from 'moment';
import FormPage from '../../FormPage'
class FO037ShowPrint extends React.Component {
constructor(props) {
super(props);
this.state = {
data: null,
enumData: null,
BtnAgreeDisplay: 'none'
BtnAgreeDisplay: 'none',
fileForm: {
title: "",
visible: false,
},
};
};
@ -129,6 +134,7 @@ class FO037ShowPrint extends React.Component {
})
}</Descriptions.Item>
<Descriptions.Item label="交底内容">{data.DisclosureContent}</Descriptions.Item>
<Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
<Descriptions.Item label="交底人签字">{
(data.Nav_User && data.Nav_User.FILE_PATH)?
showUserSign(data.Nav_User, config.picServerHost):null
@ -150,6 +156,9 @@ class FO037ShowPrint extends React.Component {
</div> : null
}
</div>
{
GetFileModel(Modal, FormPage, this, this.state.fileForm.visible)
}
</div>
}

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

@ -95,11 +95,11 @@ class FO041ShowPrint extends React.Component {
return <div>
<div style={{ padding: '10px' }}>
<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.STATUS === 15?"inline":"none" }}>打印</Button>}
content={() => this.componentRef}
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
<Button style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button style={{ marginLeft: '8px',display: data && data.STATUS === 15?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >确认</Button>
</div>

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

@ -107,11 +107,11 @@ class FO043ShowPrint extends React.Component {
<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>}
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.STATUS === 30?"inline":"none" }}>打印</Button>}
content={() => this.componentRef}
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
<Button style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button style={{ marginLeft: '8px',display: data && data.STATUS === 30?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >审阅</Button>
</div>
@ -141,7 +141,7 @@ class FO043ShowPrint extends React.Component {
<Descriptions.Item label="动火地点">{data.JOB_CONTENT}</Descriptions.Item>
<Descriptions.Item label="动火方式">{data.Nav_Type?.NAME}</Descriptions.Item>
<Descriptions.Item label="动火具体事项">{data.JOB_CONTENT}</Descriptions.Item>
<Descriptions.Item label="作业监护人">{data.Nav_MonitorUser?.NAME}</Descriptions.Item>
{/* <Descriptions.Item label="作业监护人">{data.Nav_MonitorUser?.NAME}</Descriptions.Item> */}
<Descriptions.Item label="动火计划开始时间">{data.JOB_DATE}</Descriptions.Item>
<Descriptions.Item label="动火计划结束时间">{data.JOB_END_DATE}</Descriptions.Item>
<Descriptions.Item label="存在的风险">{ data.Nav_Risks && data.Nav_Risks.map((item, i) => {
@ -259,7 +259,7 @@ class FO043ShowPrint extends React.Component {
}</Descriptions.Item>
</Descriptions>
<Descriptions size="middle" bordered className={styles.description} style={{display:data.FIRE_STATUS >= 10?'block':'none'}}>
<Descriptions size="middle" bordered className={styles.description} style={{display:data.FIRE_STATUS > 15?'block':'none'}}>
<Descriptions.Item label="动火作业完工验收情况">{
data.COMPLETED_CONTENT
}</Descriptions.Item>

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

@ -107,11 +107,11 @@ class FO045ShowPrint extends React.Component {
<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>}
trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px',display: data && data.STATUS === 30?"inline":"none" }}>打印</Button>}
content={() => this.componentRef}
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
<Button style={{ marginLeft: '8px',display: data && data.FORM_STATUS === 2?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button style={{ marginLeft: '8px',display: data && data.STATUS === 30?"inline":"none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
<Button type="primary" style={{ marginLeft: '8px', display: this.state.BtnAgreeDisplay }} onClick={() => this.onTableBtnAgree()} icon="check" >审阅</Button>
</div>

2
src/components/CustomPages/PF/PFTodayReminder.js
View File

@ -95,7 +95,7 @@ class PFTodayReminder extends React.Component {
}
{
this.props.data ?
<div style={{textAlign:"center",marginTop:"50px",display:this.props.data.taskStatus===0?"block":"none"}}>
<div style={{textAlign:"center",marginTop:"50px",display:this.props.data.taskStatus===0 || this.props.data.taskStatus===3?"block":"none"}}>
<Button type="primary" onClick={this.onClick} >已办</Button>
</div>:null
}

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

@ -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, 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';
@ -163,10 +163,10 @@ class SK022ShowPrint extends React.Component {
<Descriptions.Item label="整改资金(元)">{data.RECTIFICATION_MONEY}</Descriptions.Item>
<Descriptions.Item label="整改完成时间">{data.COMPLETE_DATE?moment(data.COMPLETE_DATE).format('YYYY-MM-DD'):null}</Descriptions.Item>
<Descriptions.Item label="整改前照片">{
showFiles(data?.Nav_RectifyPhotoas, config.picServerHost, this)
showFileImg(data?.Nav_RectifyPhotoas, config.picServerHost, this)
}</Descriptions.Item>
<Descriptions.Item label="整改后照片">{
showFiles(data?.Nav_RectifyPhotobs, config.picServerHost, this)
showFileImg(data?.Nav_RectifyPhotobs, config.picServerHost, this)
}</Descriptions.Item>
<Descriptions.Item label="预案或方案">{
showFiles(data?.Nav_RectifyFiles, config.picServerHost, this)
@ -175,13 +175,12 @@ class SK022ShowPrint extends React.Component {
<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 == 30 && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
(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 : ''
}</Descriptions.Item>

28
src/components/CustomPages/SK/SK035CheckLibrary.js
View File

@ -80,19 +80,19 @@ class SK035CheckLibrary extends React.Component {
dataIndex: "Nav_Department.NAME",
key: "Nav_Department.NAME",
},
{
title: "检查岗位",
dataIndex: "Nav_DetailPosts",
key: "Nav_DetailPosts",
render: (text, record) =>
{
return <label>{
record.Nav_DetailPosts && record.Nav_DetailPosts.map((item, i) => {
return item.Nav_Post.NAME+' '
})
}</label>
}
},
// {
// title: "检查岗位",
// dataIndex: "Nav_DetailPosts",
// key: "Nav_DetailPosts",
// render: (text, record) =>
// {
// return <label>{
// record.Nav_DetailPosts && record.Nav_DetailPosts.map((item, i) => {
// return item.Nav_Post.NAME+' '
// })
// }</label>
// }
// },
{
title: "检查类型",
dataIndex: "Nav_CheckType.NAME",
@ -161,7 +161,7 @@ class SK035CheckLibrary extends React.Component {
onComplete: (retTemp) => {
if (retTemp) {
let json = initFilter(that.props.login.OrgId);
extendRule(json, 'MineType', 1, retTemp.MineType);
extendRule(json, 'PRODUCTION_UNIT_ID', 1, retTemp.PRODUCTION_UNIT_ID);
extendRule(json, 'AREA_ID', 1, retTemp.AREA_ID);
extendRule(json, 'TYPE_ID', 1, retTemp.TYPE_ID);
extendRule(json, 'RISK_NAME', 1, retTemp.RISK_NAME);

2
src/components/CustomPages/SK/SK039ShowPrint.js
View File

@ -185,7 +185,7 @@ class SK039ShowPrint extends React.Component {
{
//item.MEASURE
item?.Nav_DetailMeasures && item?.Nav_DetailMeasures.map((item2, i) => {
return <tr> {item2?.NUM + item2?.MEASURES_NAME}</tr>
return <tr> {item2?.NUM+"、" + item2?.MEASURES_NAME}</tr>
})
}
</td>

2
src/components/CustomPages/SK/SK041ShowPrint.js
View File

@ -185,7 +185,7 @@ class SK041ShowPrint extends React.Component {
{
//item.MEASURE
item?.Nav_DetailMeasures && item?.Nav_DetailMeasures.map((item2, i) => {
return <tr> {item2?.NUM +item2?.MEASURES_NAME}</tr>
return <tr> {item2?.NUM +"、"+item2?.MEASURES_NAME}</tr>
})
}
</td>

9
src/files/edit/SK033.js
View File

@ -71,6 +71,14 @@ export default {
if(login.tempDatas && login.tempDatas.length>0)
{
login.tempDatas.map(item=>{
let mesList=[]
item.Nav_Details.map(t=>{
let mes={
NUM:t.NUM,
MEASURE:t.MEASURES_NAME
}
mesList.push(mes)
})
let tmpData = {
ID:guid(),
MineType: item.MineType,
@ -89,6 +97,7 @@ export default {
MARK:10,
ENABLE_STATUS:0,
Nav_ProductionUnit: item.Nav_ProductionUnit,
Nav_DetailMeasures:mesList.sort((x, y) => x.NUM > y.NUM ? 1 : -1)
}
if(stateData && stateData.Nav_Details)
{

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

@ -49,11 +49,11 @@ export default {
message.error("请选择检查部门!")
return
}
if(!stateData.POST_ID)
{
message.error("请选择检查对象!")
return
}
// if(!stateData.POST_ID)
// {
// message.error("请选择检查对象!")
// return
// }
if(!stateData.CHECK_TYPE)
{
message.error("请选择检查层级!")

3
src/files/list/SK066.js
View File

@ -41,7 +41,8 @@ export default {
EVALUATE_LEVEL:item.EVALUATE_LEVEL,
MARK:0,
ENABLE_STATUS:0,
Nav_ProductionUnit:item.Nav_ProductionUnit
Nav_ProductionUnit:item.Nav_ProductionUnit,
Nav_Details:item.Nav_Details
}
temps.push(tmpData);
});