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:
wyw 2025-11-24 20:54:00 +08:00
commit 2cb35e7480
6 changed files with 204 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,6 +104,7 @@ class UserEditPage extends React.Component {
extendInclude(userJson, 'Nav_UserPhotoFiles.Nav_ImgFile')
extendInclude(userJson, 'Nav_UserSignFiles.Nav_ImgFile')
extendInclude(userJson, 'Nav_ProdutionUnit.Nav_Enums')
extendInclude(userJson, 'Nav_ProdutionUnit.Nav_Unit')
this.props.dispatch({
type: 'FMUserEdit/getUser',
payload: userJson,
@ -800,12 +801,12 @@ class UserEditPage extends React.Component {
{...formItemLayout}
>
{/* <CheckboxGroup options={this.props.app.enums.FMProductionUnit.options} value={this.state.data.MineType} onChange={onUnitChange} /> */}
<MultiSelectPagination api={'FM/Enum/GetEnumsByCode'}
<MultiSelectPagination api={'FM/UserProductionUnitSet/OrderPaged'}
data={
{
navField: 'ID,VALUE,NAME',
saveField: 'ENUMS_ID,Nav_Enums.VALUE,Nav_Enums.NAME',
labelField: "Nav_Enums.NAME",
navField: 'ID,NAME',
saveField: 'PRODUCTION_UNIT_ID,Nav_Unit.NAME',
labelField: "Nav_Unit.NAME",
showField: "NAME",
filterField: "NAME",
idField: "USER_ID",

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

@ -148,61 +148,9 @@ class FO043ShowPrint extends React.Component {
return item.RISK_NAME + ' '
})}</Descriptions.Item>
<Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
<Descriptions.Item label="动火作业现场条件验收情况">{data.COMPLETED_CONDITION}</Descriptions.Item>
<Descriptions.Item label="是否可以动火">{enums.FOYesOrNoEnum.enums[data.IS_FIRE]}</Descriptions.Item>
<Descriptions.Item label="动火实际开始时间">{data.ACT_DATE}</Descriptions.Item>
<Descriptions.Item label="附件"> {showFiles(data.Nav_FireFiles, config.picServerHost, this)}</Descriptions.Item>
<Descriptions.Item label="矿调度室人员">{data.Nav_DispatchUser?.NAME}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签名">{
data.USER_DEAL_STATUS == 1?
showUserSign(data.Nav_FireUser, config.picServerHost)
:null
}</Descriptions.Item>
<Descriptions.Item label="安全管理人员签名">{
data.SAFE_DEAL_STATUS == 1?
showUserSign(data.Nav_SafeUser, config.picServerHost)
:null
</Descriptions>
}</Descriptions.Item>
<Descriptions.Item label="矿调度人员签名">{
data.DISPATCH_DEAL_STATUS == 1?
showUserSign(data.Nav_DispatchUser, config.picServerHost)
:null
}</Descriptions.Item>
<Descriptions.Item label="动火作业完工验收情况">{
data.COMPLETED_CONTENT
}</Descriptions.Item>
<Descriptions.Item label="是否可以撤离">{
enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
}</Descriptions.Item>
<Descriptions.Item label="动火实际结束时间">{
data.ACT_END_DATE
}</Descriptions.Item>
<Descriptions.Item label="离开现场时间">{
data.LEAVE_DATE
}</Descriptions.Item>
<Descriptions.Item label="附件">{
showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签字">{
data.USER_DEAL_FINISH_STATUS == 1?
showUserSign(data.Nav_FireUser, config.picServerHost)
:null
}</Descriptions.Item>
<Descriptions.Item label="安全生产管理人员签字">{
data.SAFE_DEAL_FINISH_STATUS == 1?
showUserSign(data.Nav_SafeUser, config.picServerHost)
:null
}</Descriptions.Item>
</Descriptions>
<FormPage {...this.state.tmpData} />
{
data && data.Nav_Users?
<table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
@ -283,8 +231,65 @@ class FO043ShowPrint extends React.Component {
</tbody>
</table> : null
}
<Descriptions size="middle" bordered className={styles.description}>
<Descriptions.Item label="动火作业现场条件验收情况">{data.COMPLETED_CONDITION}</Descriptions.Item>
<Descriptions.Item label="是否可以动火">{enums.FOYesOrNoEnum.enums[data.IS_FIRE]}</Descriptions.Item>
<Descriptions.Item label="动火实际开始时间">{data.ACT_DATE}</Descriptions.Item>
<Descriptions.Item label="现场条件验收附件"> {showFiles(data.Nav_FireFiles, config.picServerHost, this)}</Descriptions.Item>
<Descriptions.Item label="矿调度室人员">{data.Nav_DispatchUser?.NAME}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签名">{
data.USER_DEAL_STATUS == 1?
showUserSign(data.Nav_FireUser, config.picServerHost)
:null
}</Descriptions.Item>
<Descriptions.Item label="安全管理人员签名">{
data.SAFE_DEAL_STATUS == 1?
showUserSign(data.Nav_SafeUser, config.picServerHost)
:null
}</Descriptions.Item>
<Descriptions.Item label="矿调度人员签名">{
data.DISPATCH_DEAL_STATUS == 1?
showUserSign(data.Nav_DispatchUser, config.picServerHost)
:null
}</Descriptions.Item>
</Descriptions>
<Descriptions size="middle" bordered className={styles.description}>
<Descriptions.Item label="动火作业完工验收情况">{
data.COMPLETED_CONTENT
}</Descriptions.Item>
<Descriptions.Item label="是否可以撤离">{
enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
}</Descriptions.Item>
<Descriptions.Item label="动火实际结束时间">{
data.ACT_END_DATE
}</Descriptions.Item>
<Descriptions.Item label="离开现场时间">{
data.LEAVE_DATE
}</Descriptions.Item>
<Descriptions.Item label="完工验收附件">{
showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签字">{
data.USER_DEAL_FINISH_STATUS == 1?
showUserSign(data.Nav_FireUser, config.picServerHost)
:null
}</Descriptions.Item>
<Descriptions.Item label="安全生产管理人员签字">{
data.SAFE_DEAL_FINISH_STATUS == 1?
showUserSign(data.Nav_SafeUser, config.picServerHost)
:null
}</Descriptions.Item>
</Descriptions>
<FormPage {...this.state.tmpData} />
</div> : null
}
</div>
</div>

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

@ -150,52 +150,9 @@ class FO045ShowPrint extends React.Component {
return item.RISK_NAME + ' '
})}</Descriptions.Item>
<Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
</Descriptions>
<Descriptions.Item label="动火作业现场条件验收情况">{data.COMPLETED_CONDITION}</Descriptions.Item>
<Descriptions.Item label="是否可以动火">{enums.FOYesOrNoEnum.enums[data.IS_FIRE]}</Descriptions.Item>
<Descriptions.Item label="动火实际开始时间">{data.ACT_DATE}</Descriptions.Item>
<Descriptions.Item label="附件"> {showFiles(data.Nav_FireFiles, config.picServerHost, this)}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签名">{
data.USER_DEAL_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_FireUser[0].Nav_ImgFile.FILE_PATH} />
:null
}</Descriptions.Item>
<Descriptions.Item label="安全管理人员签名">{
data.SAFE_DEAL_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_SafeUser[0].Nav_ImgFile.FILE_PATH} />
:null
}</Descriptions.Item>
<Descriptions.Item label="动火作业完工验收情况">{
data.COMPLETED_CONTENT
}</Descriptions.Item>
<Descriptions.Item label="是否可以撤离">{
enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
}</Descriptions.Item>
<Descriptions.Item label="动火实际结束时间">{
data.ACT_END_DATE
}</Descriptions.Item>
<Descriptions.Item label="离开现场时间">{
data.LEAVE_DATE
}</Descriptions.Item>
<Descriptions.Item label="附件">{
showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签字">{
data.USER_DEAL_FINISH_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_FireUser[0].Nav_ImgFile.FILE_PATH} />
:null
}</Descriptions.Item>
<Descriptions.Item label="安全生产管理人员签字">{
data.SAFE_DEAL_FINISH_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_SafeUser[0].Nav_ImgFile.FILE_PATH} />
:null
}</Descriptions.Item>
</Descriptions>
<FormPage {...this.state.tmpData} />
{
data && data.Nav_Users?
<table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
@ -276,6 +233,61 @@ class FO045ShowPrint extends React.Component {
</tbody>
</table> : null
}
<Descriptions size="middle" bordered className={styles.description}>
<Descriptions.Item label="动火作业现场条件验收情况">{data.COMPLETED_CONDITION}</Descriptions.Item>
<Descriptions.Item label="是否可以动火">{enums.FOYesOrNoEnum.enums[data.IS_FIRE]}</Descriptions.Item>
<Descriptions.Item label="动火实际开始时间">{data.ACT_DATE}</Descriptions.Item>
<Descriptions.Item label="现场条件验收附件"> {showFiles(data.Nav_FireFiles, config.picServerHost, this)}</Descriptions.Item>
<Descriptions.Item label="矿调度室人员">{data.Nav_DispatchUser?.NAME}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签名">{
data.USER_DEAL_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_FireUser[0].Nav_ImgFile.FILE_PATH} />
:null
}</Descriptions.Item>
<Descriptions.Item label="安全管理人员签名">{
data.SAFE_DEAL_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_SafeUser[0].Nav_ImgFile.FILE_PATH} />
:null
}</Descriptions.Item>
<Descriptions.Item label="矿调度人员签名">{
data.DISPATCH_DEAL_STATUS == 1?
showUserSign(data.Nav_DispatchUser, config.picServerHost)
:null
}</Descriptions.Item>
</Descriptions>
<Descriptions size="middle" bordered className={styles.description}>
<Descriptions.Item label="动火作业完工验收情况">{
data.COMPLETED_CONTENT
}</Descriptions.Item>
<Descriptions.Item label="是否可以撤离">{
enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
}</Descriptions.Item>
<Descriptions.Item label="动火实际结束时间">{
data.ACT_END_DATE
}</Descriptions.Item>
<Descriptions.Item label="离开现场时间">{
data.LEAVE_DATE
}</Descriptions.Item>
<Descriptions.Item label="完工验收附件">{
showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
}</Descriptions.Item>
<Descriptions.Item label="动火部门负责人签字">{
data.USER_DEAL_FINISH_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_FireUser[0].Nav_ImgFile.FILE_PATH} />
:null
}</Descriptions.Item>
<Descriptions.Item label="安全生产管理人员签字">{
data.SAFE_DEAL_FINISH_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile?
<img style={{ margin: "0 0 0 15px", width: '150px' }} src={config.picServerHost + data.Nav_SafeUser[0].Nav_ImgFile.FILE_PATH} />
:null
}</Descriptions.Item>
</Descriptions>
<FormPage {...this.state.tmpData} />
</div> : null
}
</div>

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

@ -102,14 +102,14 @@ class SK004CheckPost extends React.Component {
return <label>{this.props.app.enums.SKEvaluateLevelEnum.enums[record.EVALUATE_LEVEL]}</label>
}
},
{
title: '操作',
dataIndex: '',
key: '',
render: (text, record, index) => {
return <Button type='defualt' size='small' onClick={(e) => { this.showModalCard(record) }} icon='eye' />
}
}
// {
// title: '操作',
// dataIndex: '',
// key: '',
// render: (text, record, index) => {
// return <Button type='defualt' size='small' onClick={(e) => { this.showModalCard(record) }} icon='eye' />
// }
// }
],
columndatas : [
{
@ -122,11 +122,11 @@ class SK004CheckPost extends React.Component {
},
{
title: "生产单元",
dataIndex: "Nav_Librarys[0].MineType",
key: "Nav_Librarys[0].MineType",
render: (text, record, index) => {
return <label>{this.props.app.enums.SKProductionUnit.enums[record.Nav_Librarys[0]?.MineType]}</label>
}
dataIndex: "Nav_Library.Nav_ProductionUnit.NAME",
key: "Nav_Library.Nav_ProductionUnit.NAME",
// render: (text, record, index) => {
// return <label>{this.props.app.enums.SKProductionUnit.enums[record.Nav_Librarys[0]?.MineType]}</label>
// }
},
{
title: "辨识部门",
@ -191,7 +191,7 @@ class SK004CheckPost extends React.Component {
}
if(this.state.inputText3)
{
temp=temp.filter(t=>t.Nav_Librarys[0]?.MineType == this.state.inputText3);
temp=temp.filter(t=>t.Nav_Library?.Nav_ProductionUnit?.NAME.includes(this.state.inputText3));
}
this.setState({dataList :temp})
}

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

@ -10,7 +10,7 @@ export default {
params.record.TaskID = params.data.TaskID //TaskID传递消息表ID
params.record.PUBLISH = params.customParams;
},
onBeforeEdit: ({ isNew,login,record, dispatch,stateData, setFieldEditable,setFieldVisible,setFieldValue,setFieldValueByBatch }) => {
onBeforeEdit: ({ isNew,login,record, dispatch,stateData,setRowFieldVisible, setFieldEditable,setFieldVisible,setFieldValue,setFieldValueByBatch }) => {
if (isNew) {
let json = initFilter(login.OrgId);
extendRule(json, "ID", 1, login.userId);
@ -32,17 +32,17 @@ export default {
}
}
});
///发起人不能编辑
setFieldEditable('COMPLETED_CONDITION', false)
setFieldEditable('IS_FIRE', false)
setFieldEditable('ACT_DATE', false)
setFieldEditable('Nav_FireFiles', false)
setFieldEditable('Nav_DispatchUser.NAME', false)
setFieldEditable('COMPLETED_CONTENT', false)
setFieldEditable('IS_LEAVE', false)
setFieldEditable('ACT_END_DATE', false)
setFieldEditable('LEAVE_DATE', false)
setFieldEditable('Nav_MonitorFiles', false)
///发起人不能查看
setFieldVisible('COMPLETED_CONDITION', false)
setFieldVisible('IS_FIRE', false)
setFieldVisible('ACT_DATE', false)
setFieldVisible('Nav_FireFiles', false)
setFieldVisible('Nav_DispatchUser.NAME', false)
setFieldVisible('COMPLETED_CONTENT', false)
setFieldVisible('IS_LEAVE', false)
setFieldVisible('ACT_END_DATE', false)
setFieldVisible('LEAVE_DATE', false)
setFieldVisible('Nav_MonitorFiles', false)
}
else if(stateData.FIRE_STATUS == 10)
{
@ -59,34 +59,33 @@ export default {
}
else if(stateData.FIRE_STATUS == 18)
{
setFieldEditable('COMPLETED_CONDITION', false)
setFieldEditable('IS_FIRE', false)
setFieldEditable('ACT_DATE', false)
setFieldEditable('Nav_FireFiles', false)
setFieldEditable('Nav_DispatchUser.NAME', false)
setFieldEditable('COMPLETED_CONTENT', true)
setFieldEditable('IS_LEAVE', true)
setFieldEditable('ACT_END_DATE', true)
setFieldEditable('LEAVE_DATE', true)
setFieldEditable('Nav_MonitorFiles', true)
setFieldVisible('COMPLETED_CONDITION', false)
setFieldVisible('IS_FIRE', false)
setFieldVisible('ACT_DATE', false)
setFieldVisible('Nav_FireFiles', false)
setFieldVisible('Nav_DispatchUser.NAME', false)
setFieldVisible('COMPLETED_CONTENT', true)
setFieldVisible('IS_LEAVE', true)
setFieldVisible('ACT_END_DATE', true)
setFieldVisible('LEAVE_DATE', true)
setFieldVisible('Nav_MonitorFiles', true)
}else
{
setFieldEditable('COMPLETED_CONDITION', false)
setFieldEditable('IS_FIRE', false)
setFieldEditable('ACT_DATE', false)
setFieldEditable('Nav_FireFiles', false)
setFieldEditable('Nav_DispatchUser.NAME', false)
setFieldEditable('COMPLETED_CONTENT', false)
setFieldEditable('IS_LEAVE', false)
setFieldEditable('ACT_END_DATE', false)
setFieldEditable('LEAVE_DATE', false)
setFieldEditable('Nav_MonitorFiles', false)
setFieldVisible('COMPLETED_CONDITION', false)
setFieldVisible('IS_FIRE', false)
setFieldVisible('ACT_DATE', false)
setFieldVisible('Nav_FireFiles', false)
setFieldVisible('Nav_DispatchUser.NAME', false)
setFieldVisible('COMPLETED_CONTENT', false)
setFieldVisible('IS_LEAVE', false)
setFieldVisible('ACT_END_DATE', false)
setFieldVisible('LEAVE_DATE', false)
setFieldVisible('Nav_MonitorFiles', false)
}
},
onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => {
if (!(colInfo.FIELD_NAME == 'Nav_OperationStep.NAME'))
return;
if (colInfo.FIELD_NAME == 'Nav_OperationStep.NAME')
{
let code = getFieldValue('OPERATION_STEP_ID')
let json = initFilter(login.OrgId,code);
dispatch({
@ -104,5 +103,38 @@ export default {
}
}
})
}
if (colInfo.FIELD_NAME == 'Nav_FireDepartment.NAME')
{
let code = getFieldValue('FIRE_DEPARTMENT_ID')
let json = initFilter(login.OrgId,code);
dispatch({
type: 'app/getDataByPost',
url: 'FO/FOFireJob/GetSafeUser',
payload: json,
onlyData: false,
onComplete: (re) => {
if (re && re.IsSuccessful && re.Data) {
let temps = [];
temps.push({ field: 'SAFE_USER_ID', value: re.Data?.ID })
temps.push({ field: 'Nav_SafeUser.NAME', value: re.Data?.NAME})
setFieldValueByBatch(temps);
}
}
})
}
},
// handleRenderRowControl(params) {
// // setRowFieldVisible('Nav_Details.IS_CONFIRM_NEW', false)
// // setRowFieldVisible('Nav_Details.Nav_DetailFiles', false)
// if (params.colConfig.field === 'Nav_Details.IS_CONFIRM_NEW') {
// return <>
// <a>{params.record.Nav_ApproveUser?.NAME}</a>
// </>
// } else {
// return ""
// }
// }
}

1
src/files/list/SK058.js
View File

@ -17,6 +17,7 @@ export default {
extendGroupRule(filterGroup, "ID", 1, item);
})
filter.FilterGroup = filterGroup;
extendInclude(filter, 'Nav_ListCheckQuestion');
dispatch({
type: 'app/getDataByPost',
url: 'SK/CheckContents/Entities',