ccy/mh-sms-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh-sms-web

Browse Source
This commit is contained in:
yunkexin 2024-05-28 09:43:45 +08:00
commit e470b0fc3e
4 changed files with 67 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/components/CustomPages/HM/HM042ShowPrint.js
View File

@ -19,6 +19,7 @@ class HM042ShowPrint extends React.Component {
isAudit: 'none', isAudit: 'none',
tmpData: {}, tmpData: {},
DEALOPINION: '', DEALOPINION: '',
teamUsers: []
}; };
}; };
//审批意见 改变 //审批意见 改变
@ -83,7 +84,14 @@ class HM042ShowPrint extends React.Component {
if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function') if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
this.props.data.onCancel(); this.props.data.onCancel();
} }
removeDuplicateUser(arr) {
let obj = {};
arr = arr.reduce((newArr, next) => {
obj[next.USER_ID] ? "" : (obj[next.USER_ID] = true && newArr.push(next));
return newArr;
}, []);
return arr;
}
loadData = (dataId) => { loadData = (dataId) => {
let json = initFilter(this.props.login.OrgId); let json = initFilter(this.props.login.OrgId);
extendRule(json, 'ID', 1, dataId); extendRule(json, 'ID', 1, dataId);
@ -104,6 +112,7 @@ class HM042ShowPrint extends React.Component {
if (this.props.data && this.props.data.loadDataDeal) { if (this.props.data && this.props.data.loadDataDeal) {
this.props.data.loadDataDeal(1); this.props.data.loadDataDeal(1);
} }
this.teamUsers = this.removeDuplicateUser(ret.Nav_Details);
this.onClickApprove(false); this.onClickApprove(false);
if (ret.STATUS >= 4) { if (ret.STATUS >= 4) {
this.state.isFinished = "inline"; this.state.isFinished = "inline";
@ -226,8 +235,8 @@ class HM042ShowPrint extends React.Component {
<Descriptions.Item label="风险管理小组副组长" span={1.5}>{data.Nav_DeputyGroupLeader ? data.Nav_DeputyGroupLeader.NAME : ''}</Descriptions.Item> <Descriptions.Item label="风险管理小组副组长" span={1.5}>{data.Nav_DeputyGroupLeader ? data.Nav_DeputyGroupLeader.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="风险管理小组组长" span={1.5}>{data.Nav_GroupLeader ? data.Nav_GroupLeader.NAME : ''}</Descriptions.Item> <Descriptions.Item label="风险管理小组组长" span={1.5}>{data.Nav_GroupLeader ? data.Nav_GroupLeader.NAME : ''}</Descriptions.Item>
<Descriptions.Item label="风险管理小组成员" span={3}>{ <Descriptions.Item label="风险管理小组成员" span={3}>{
data.Nav_Details && data.Nav_Details.map((item, i) => { this.teamUsers && this.teamUsers.map((item, i) => {
if (i == (data.Nav_Details.length - 1)) { if (i == (this.teamUsers.length - 1)) {
if (item.DEAL_STATUS == 0) if (item.DEAL_STATUS == 0)
return <label style={{ color: 'red' }} title='未签到'> {item.Nav_ChargeUser ? item.Nav_ChargeUser.NAME : ''}</label> return <label style={{ color: 'red' }} title='未签到'> {item.Nav_ChargeUser ? item.Nav_ChargeUser.NAME : ''}</label>
else else
@ -257,30 +266,32 @@ class HM042ShowPrint extends React.Component {
</Descriptions.Item> </Descriptions.Item>
</Descriptions> </Descriptions>
<table style={{ width: '100%', textAlign: 'center' }} className={styles.PrintForm1}> <table style={{ width: '100%', textAlign: 'center' }} className={styles.PrintForm1}>
<tr> <tbody>
<td className={styles.fontBold}>开始时间</td> <tr>
<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>
<td className={styles.fontBold}>负责人</td> <td className={styles.fontBold}>辨识对象</td>
<td className={styles.fontBold}>备注</td> <td className={styles.fontBold}>负责人</td>
</tr> <td className={styles.fontBold}>备注</td>
{ </tr>
data.Nav_Details && data.Nav_Details.map((item, i) => { {
return <tr> data.Nav_Details && data.Nav_Details.map((item, i) => {
<td>{moment(item.START_TIME).format('YYYY-MM-DD')}</td> return <tr>
<td>{moment(item.END_TIME).format('YYYY-MM-DD')}</td> <td>{moment(item.START_TIME).format('YYYY-MM-DD')}</td>
<td>{this.renderLevel(item.LEVEL)}</td> <td>{moment(item.END_TIME).format('YYYY-MM-DD')}</td>
<td>{this.joinArea(item.Nav_Areas)}</td> <td>{this.renderLevel(item.LEVEL)}</td>
<td>{this.joinIdentifying(item.Nav_Identifyings)}</td> <td>{this.joinArea(item.Nav_Areas)}</td>
<td>{this.props.app.enums.HMRiskTypeEnmu.enums[item.RISK_TYPE]}</td> <td>{this.joinIdentifying(item.Nav_Identifyings)}</td>
<td>{item.Nav_ChargeUser?.NAME}</td> <td>{this.props.app.enums.HMRiskTypeEnmu.enums[item.RISK_TYPE]}</td>
<td>{item.REMARK}</td> <td>{item.Nav_ChargeUser?.NAME}</td>
</tr> <td>{item.REMARK}</td>
}) </tr>
} })
}
</tbody>
</table> </table>
<FormPage {...this.state.tmpData} /> <FormPage {...this.state.tmpData} />
<table style={{ width: '90%', lineHeight: '35px' }}> <table style={{ width: '90%', lineHeight: '35px' }}>

7
src/components/CustomPages/PF/PFCommonApproveView.js
View File

@ -476,22 +476,23 @@ class PFCommonApproveView extends React.Component {
if (item.NODE_APPROVE_STATUS != 0) { if (item.NODE_APPROVE_STATUS != 0) {
if (item.Nav_ApproveUser != null && item.Nav_ApproveUser.Nav_UserSignFiles[0] != null) if (item.Nav_ApproveUser != null && item.Nav_ApproveUser.Nav_UserSignFiles[0] != null)
{ {
return <table style={{border:"0",width:'100%', textAlign: 'left'}}><tr><td style={{border:"0"}}><b>{(item.NAME? item.NAME: "")}</b><br/> return <table style={{border:"0",width:'100%', textAlign: 'left'}}><tbody><tr><td style={{border:"0"}}><b>{(item.NAME? item.NAME: "")}</b><br/>
{("审批结论："+(item.CONTEXT===undefined?"同意":item.CONTEXT ))}<br/> {("审批结论："+(item.CONTEXT===undefined?"同意":item.CONTEXT ))}<br/>
{("审核时间："+item.NODE_APPROVE_TIME)}</td> {("审核时间："+item.NODE_APPROVE_TIME)}</td>
<td style={{border:"0"}}><br/><img style={{ margin: "0 0 0 15px",width:'150px' }} alt={item.Nav_ApproveUser.NAME} src={config.picServerHost + item.Nav_ApproveUser.Nav_UserSignFiles[0].Nav_ImgFile.Nav_File.FILE_PATH} /> <td style={{border:"0"}}><br/><img style={{ margin: "0 0 0 15px",width:'150px' }} alt={item.Nav_ApproveUser.NAME} src={config.picServerHost + item.Nav_ApproveUser.Nav_UserSignFiles[0].Nav_ImgFile.Nav_File.FILE_PATH} />
</td></tr> </td></tr>
<tr><td colSpan={2} style={{border:"0"}}><hr style={{border:'1px dashed #ccc'}}></hr></td></tr> <tr><td colSpan={2} style={{border:"0"}}><hr style={{border:'1px dashed #ccc'}}></hr></td></tr>
</tbody>
</table> </table>
} }
else else
{ {
return <table style={{border:"0",width:'100%', textAlign: 'left'}}><tr><td style={{border:"0"}}><b>{(item.NAME? item.NAME: "")}</b><br/> return <table style={{border:"0",width:'100%', textAlign: 'left'}}><tbody><tr><td style={{border:"0"}}><b>{(item.NAME? item.NAME: "")}</b><br/>
{("审批结论："+(item.CONTEXT===undefined?"同意":item.CONTEXT ))}<br/> {("审批结论："+(item.CONTEXT===undefined?"同意":item.CONTEXT ))}<br/>
{("审核时间："+item.NODE_APPROVE_TIME)}</td> {("审核时间："+item.NODE_APPROVE_TIME)}</td>
<td style={{border:"0"}}><br/><img style={{ margin: "0 0 0 15px",width:'150px' }} title={item.Nav_ApproveUser.NAME} /> <td style={{border:"0"}}><br/><img style={{ margin: "0 0 0 15px",width:'150px' }} title={item.Nav_ApproveUser.NAME} />
</td></tr> </td></tr>
<tr><td colSpan={2} style={{border:"0"}}><hr style={{border:'1px dashed #ccc'}}></hr></td></tr> <tr><td colSpan={2} style={{border:"0"}}><hr style={{border:'1px dashed #ccc'}}></hr></td></tr></tbody>
</table> </table>
} }
} }

3
src/layout/Header.js
View File

@ -392,8 +392,7 @@ function Header(props) {
> >
安全管理系统 安全管理系统
<span style={{ color: "#c99d03" }}>（SMS）</span> <span style={{ color: "#c99d03" }}>（SMS）</span>
{/* {baseConfig.SYS_NAME}{" "} */} {baseConfig.SYS_NAME}{" "}
-宁化行洛坑
</span> </span>
)} )}
</div> </div>

48
src/routes/Home.js
View File

@ -574,18 +574,18 @@ class Home extends React.Component {
} }
} }
showTableEditModal = (dataId, formCode, TaskID, title, taskCode) => { showTableEditModal = (dataId, formCode, TaskID, title, taskCode) => {
this.props.dispatch({ // this.props.dispatch({
type: "app/getDataByPost", // type: "app/getDataByPost",
url: "BI/BIController/getVersion", // url: "BI/BIController/getVersion",
onComplete: (ret) => { // onComplete: (ret) => {
if (ret > config.version) { // if (ret > config.version) {
window.localStorage.clear(); // window.localStorage.clear();
message.success("清除成功，即将重新加载页面", 2, () => { // message.success("清除成功，即将重新加载页面", 2, () => {
setTimeout(() => window.location.reload(true), 500); // setTimeout(() => window.location.reload(true), 500);
}); // });
} // }
}, // },
}); // });
const newtmpData = { const newtmpData = {
data: { data: {
id: dataId, id: dataId,
@ -612,18 +612,18 @@ class Home extends React.Component {
); );
}; };
showEditModal = (dataId, formCode, TaskID, title, taskCode) => { showEditModal = (dataId, formCode, TaskID, title, taskCode) => {
this.props.dispatch({ // this.props.dispatch({
type: "app/getDataByPost", // type: "app/getDataByPost",
url: "BI/BIController/getVersion", // url: "BI/BIController/getVersion",
onComplete: (ret) => { // onComplete: (ret) => {
if (ret > config.version) { // if (ret > config.version) {
window.localStorage.clear(); // window.localStorage.clear();
message.success("清除成功，即将重新加载页面", 2, () => { // message.success("清除成功，即将重新加载页面", 2, () => {
setTimeout(() => window.location.reload(true), 500); // setTimeout(() => window.location.reload(true), 500);
}); // });
} // }
}, // },
}); // });
const newtmpData = { const newtmpData = {
data: { data: {
id: dataId, id: dataId,