diff --git a/src/components/CustomPages/SK/SK012ShowPrint.js b/src/components/CustomPages/SK/SK012ShowPrint.js
index 5e74c3e..51d4bdc 100644
--- a/src/components/CustomPages/SK/SK012ShowPrint.js
+++ b/src/components/CustomPages/SK/SK012ShowPrint.js
@@ -15,6 +15,7 @@ class SK012ShowPrint extends React.Component {
this.state = {
data: null,
enumData: null,
+ detailUsers:[],
BtnAgreeDisplay: 'none',
fileForm: {
title: "",
@@ -83,7 +84,27 @@ class SK012ShowPrint extends React.Component {
if (this.props.data && this.props.data.loadDataDeal) {
this.props.data.loadDataDeal(1);
}
- this.setState({ data: ret })
+ let users=[]
+ let uniqueUsers =[]
+ if(ret.Nav_CheckRecordDetails)
+ {
+ ret.Nav_CheckRecordDetails.forEach(item => {
+ item.Nav_CheckRecordDetailUsers.forEach(item2=>{
+ users.push(item2)
+ })
+ })
+ }
+ if(users)
+ {
+ uniqueUsers= users.reduce((acc, user) => {
+ // 如果累积数组中还没有这个 user_id,则添加
+ if (!acc.some(item => item.USER_ID === user.USER_ID)) {
+ acc.push(user);
+ }
+ return acc;
+ }, []);
+ }
+ this.setState({ data: ret,detailUsers:uniqueUsers })
if (this.props.data.tableKey == "2" || this.props.data.tableKey == undefined) {
this.setState({ BtnAgreeDisplay: 'none' })
} else {
@@ -234,17 +255,12 @@ class SK012ShowPrint extends React.Component {
}
{
- data && data.Nav_CheckRecordDetails ?
+ this.state.detailUsers ?
{
- data.Nav_CheckRecordDetails?.map((item, i) => {
- item? item?.Nav_CheckRecordDetailUsers && item?.Nav_CheckRecordDetailUsers.map((item2, i) => {
- if (item2 && item2.ISCHECK) {
- showUserSign(item2.Nav_User, config.picServerHost)
- }
- }):null
-
+ this.state.detailUsers?.filter(it => it.ISCHECK).map((item, i) => {
+ return showUserSign(item.Nav_User, config.picServerHost)
})
}
diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js
index 76a4661..c582edc 100644
--- a/src/components/CustomPages/SK/SK022ShowPrint.js
+++ b/src/components/CustomPages/SK/SK022ShowPrint.js
@@ -129,7 +129,7 @@ class SK022ShowPrint extends React.Component {
{data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''}
{data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}
{data.Nav_ImplementUser ? data.Nav_ImplementUser.NAME : ''}
-
{data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''}
+
{data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''}
{data.RECTIFICATION_DESCRIPTION}
{data.RECTIFICATION_MONEY}
{data.COMPLETE_DATE?moment(data.COMPLETE_DATE).format('YYYY-MM-DD'):null}
@@ -146,12 +146,14 @@ class SK022ShowPrint extends React.Component {
{enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]}
{data.ACCEPT_OPINION}
{
- data.STATUS == 20 && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
-
: data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
+ data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
+ showUserSign(data.Nav_RecitifyUser, config.picServerHost)
+ : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
}
{
- data.STATUS == 20 && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
-
: data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
+ (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 : ''
}
: null