From 905fa4eb35a3084d88af2a5b05f3fc21d17061d5 Mon Sep 17 00:00:00 2001 From: wjn Date: Fri, 24 May 2024 11:28:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/HM/HM042ShowPrint.js | 65 +++++++++++-------- .../CustomPages/PF/PFCommonApproveView.js | 7 +- src/layout/Header.js | 3 +- src/routes/Home.js | 48 +++++++------- 4 files changed, 67 insertions(+), 56 deletions(-) diff --git a/src/components/CustomPages/HM/HM042ShowPrint.js b/src/components/CustomPages/HM/HM042ShowPrint.js index ea07c2b..44a4d63 100644 --- a/src/components/CustomPages/HM/HM042ShowPrint.js +++ b/src/components/CustomPages/HM/HM042ShowPrint.js @@ -19,6 +19,7 @@ class HM042ShowPrint extends React.Component { isAudit: 'none', tmpData: {}, DEALOPINION: '', + teamUsers: [] }; }; //审批意见 改变 @@ -83,7 +84,14 @@ class HM042ShowPrint extends React.Component { if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function') 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) => { let json = initFilter(this.props.login.OrgId); extendRule(json, 'ID', 1, dataId); @@ -104,6 +112,7 @@ class HM042ShowPrint extends React.Component { if (this.props.data && this.props.data.loadDataDeal) { this.props.data.loadDataDeal(1); } + this.teamUsers = this.removeDuplicateUser(ret.Nav_Details); this.onClickApprove(false); if (ret.STATUS >= 4) { this.state.isFinished = "inline"; @@ -226,8 +235,8 @@ class HM042ShowPrint extends React.Component { {data.Nav_DeputyGroupLeader ? data.Nav_DeputyGroupLeader.NAME : ''} {data.Nav_GroupLeader ? data.Nav_GroupLeader.NAME : ''} { - data.Nav_Details && data.Nav_Details.map((item, i) => { - if (i == (data.Nav_Details.length - 1)) { + this.teamUsers && this.teamUsers.map((item, i) => { + if (i == (this.teamUsers.length - 1)) { if (item.DEAL_STATUS == 0) return else @@ -257,30 +266,32 @@ class HM042ShowPrint extends React.Component { - - - - - - - - - - - { - data.Nav_Details && data.Nav_Details.map((item, i) => { - return - - - - - - - - - - }) - } + + + + + + + + + + + + { + data.Nav_Details && data.Nav_Details.map((item, i) => { + return + + + + + + + + + + }) + } +
开始时间结束时间层级辨识区域类别辨识对象负责人备注
{moment(item.START_TIME).format('YYYY-MM-DD')}{moment(item.END_TIME).format('YYYY-MM-DD')}{this.renderLevel(item.LEVEL)}{this.joinArea(item.Nav_Areas)}{this.joinIdentifying(item.Nav_Identifyings)}{this.props.app.enums.HMRiskTypeEnmu.enums[item.RISK_TYPE]}{item.Nav_ChargeUser?.NAME}{item.REMARK}
开始时间结束时间层级辨识区域类别辨识对象负责人备注
{moment(item.START_TIME).format('YYYY-MM-DD')}{moment(item.END_TIME).format('YYYY-MM-DD')}{this.renderLevel(item.LEVEL)}{this.joinArea(item.Nav_Areas)}{this.joinIdentifying(item.Nav_Identifyings)}{this.props.app.enums.HMRiskTypeEnmu.enums[item.RISK_TYPE]}{item.Nav_ChargeUser?.NAME}{item.REMARK}
diff --git a/src/components/CustomPages/PF/PFCommonApproveView.js b/src/components/CustomPages/PF/PFCommonApproveView.js index 13f35e9..f0cfe17 100644 --- a/src/components/CustomPages/PF/PFCommonApproveView.js +++ b/src/components/CustomPages/PF/PFCommonApproveView.js @@ -476,22 +476,23 @@ class PFCommonApproveView extends React.Component { if (item.NODE_APPROVE_STATUS != 0) { if (item.Nav_ApproveUser != null && item.Nav_ApproveUser.Nav_UserSignFiles[0] != null) { - return
{(item.NAME? item.NAME: "")}
+ return +
{(item.NAME? item.NAME: "")}
{("审批结论："+(item.CONTEXT===undefined?"同意":item.CONTEXT ))}
{("审核时间："+item.NODE_APPROVE_TIME)}
{item.Nav_ApproveUser.NAME}
} else { - return
{(item.NAME? item.NAME: "")}
+ return - +
{(item.NAME? item.NAME: "")}
{("审批结论："+(item.CONTEXT===undefined?"同意":item.CONTEXT ))}
{("审核时间："+item.NODE_APPROVE_TIME)}
} } diff --git a/src/layout/Header.js b/src/layout/Header.js index 6e6997a..89ca841 100644 --- a/src/layout/Header.js +++ b/src/layout/Header.js @@ -392,8 +392,7 @@ function Header(props) { > 安全管理系统 （SMS） - {/* {baseConfig.SYS_NAME}{" "} */} - -宁化行洛坑 + {baseConfig.SYS_NAME}{" "} )} diff --git a/src/routes/Home.js b/src/routes/Home.js index be8d9d3..a0d858b 100644 --- a/src/routes/Home.js +++ b/src/routes/Home.js @@ -561,18 +561,18 @@ class Home extends React.Component { } } showTableEditModal = (dataId, formCode, TaskID, title, taskCode) => { - this.props.dispatch({ - type: "app/getDataByPost", - url: "BI/BIController/getVersion", - onComplete: (ret) => { - if (ret > config.version) { - window.localStorage.clear(); - message.success("清除成功，即将重新加载页面", 2, () => { - setTimeout(() => window.location.reload(true), 500); - }); - } - }, - }); + // this.props.dispatch({ + // type: "app/getDataByPost", + // url: "BI/BIController/getVersion", + // onComplete: (ret) => { + // if (ret > config.version) { + // window.localStorage.clear(); + // message.success("清除成功，即将重新加载页面", 2, () => { + // setTimeout(() => window.location.reload(true), 500); + // }); + // } + // }, + // }); const newtmpData = { data: { id: dataId, @@ -599,18 +599,18 @@ class Home extends React.Component { ); }; showEditModal = (dataId, formCode, TaskID, title, taskCode) => { - this.props.dispatch({ - type: "app/getDataByPost", - url: "BI/BIController/getVersion", - onComplete: (ret) => { - if (ret > config.version) { - window.localStorage.clear(); - message.success("清除成功，即将重新加载页面", 2, () => { - setTimeout(() => window.location.reload(true), 500); - }); - } - }, - }); + // this.props.dispatch({ + // type: "app/getDataByPost", + // url: "BI/BIController/getVersion", + // onComplete: (ret) => { + // if (ret > config.version) { + // window.localStorage.clear(); + // message.success("清除成功，即将重新加载页面", 2, () => { + // setTimeout(() => window.location.reload(true), 500); + // }); + // } + // }, + // }); const newtmpData = { data: { id: dataId,