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

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 {
                     }
                 </table>
                 {
-                    data && data.Nav_CheckRecordDetails  ?
+                    this.state.detailUsers ?
                     <div>
                        <Descriptions size="middle" bordered>
                        <Descriptions.Item label="检查人签名">{
-                            data.Nav_CheckRecordDetails?.map((item, i) => {
+                            this.state.detailUsers?.filter(it => it.ISCHECK).map((item, i) => {
-                                item? item?.Nav_CheckRecordDetailUsers && item?.Nav_CheckRecordDetailUsers.map((item2, i) => {
+                                return  showUserSign(item.Nav_User, config.picServerHost)
-                                        if (item2 && item2.ISCHECK) {
-                                            showUserSign(item2.Nav_User, config.picServerHost)
-                                        } 
-                                    }):null
-                                
                              })
                            }</Descriptions.Item>
                        </Descriptions>

src/components/CustomPages/SK/SK022ShowPrint.js

@@ -129,7 +129,7 @@ class SK022ShowPrint extends React.Component {
                                 <Descriptions.Item label="整改部门">{data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改责任人">{data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改落实人">{data.Nav_ImplementUser ? data.Nav_ImplementUser.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="整改落实人">{data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''}</Descriptions.Item>
+                                <Descriptions.Item label="整改验收人">{data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改情况描述">{data.RECTIFICATION_DESCRIPTION}</Descriptions.Item>
                                 <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>
@@ -146,12 +146,14 @@ class SK022ShowPrint extends React.Component {
                                 <Descriptions.Item label="验收结论">{enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]}</Descriptions.Item>
                                 <Descriptions.Item label="验收意见">{data.ACCEPT_OPINION}</Descriptions.Item>
                                 <Descriptions.Item label="整改责任人签名">{
-                                    data.STATUS == 20 && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
+                                    data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
-                                        <img width={'100px'} src={config.picServerHost + data.Nav_RecitifyUser?.FILE_PATH} /> : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
+                                    showUserSign(data.Nav_RecitifyUser, config.picServerHost)
+                                         : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="验收人签名">{
-                                    data.STATUS == 20 && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
+                                    (data.STATUS == 20 ||data.STATUS == 30) && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
-                                        <img width={'100px'} src={config.picServerHost + data.Nav_AcceptUser?.FILE_PATH} /> : data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
+                                    showUserSign(data.Nav_RecitifyUser, config.picServerHost)
+                                        : data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
                                 }</Descriptions.Item>
                             </Descriptions>
                         </div> : null