From a0e522f8ae0d331d77b23584a74723e3423aa63d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Fri, 21 Nov 2025 00:35:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E5=B8=A6=E7=8F=AD=E4=B8=8B?=
 =?UTF-8?q?=E4=BA=95=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomPages/FO/FO041ShowPrint.js          | 125 ++++++++++++++----
 1 file changed, 99 insertions(+), 26 deletions(-)

diff --git a/src/components/CustomPages/FO/FO041ShowPrint.js b/src/components/CustomPages/FO/FO041ShowPrint.js
index c8b6cb5..74d8807 100644
--- a/src/components/CustomPages/FO/FO041ShowPrint.js
+++ b/src/components/CustomPages/FO/FO041ShowPrint.js
@@ -108,36 +108,109 @@ class FO041ShowPrint extends React.Component {
                      data ?
                      <div>
                      <Descriptions size="middle" bordered className={stylesStep.description}>
-                         <Descriptions.Item label="编号">{data.CODE}</Descriptions.Item>
-                         <Descriptions.Item label="交底事项">{data.NAME}</Descriptions.Item>
-                         <Descriptions.Item label="交底时间">{data.DISCLOSURE_DATE}</Descriptions.Item>
-                         <Descriptions.Item label="交底地点">{data.JOB_LOCATION}</Descriptions.Item>
-                         <Descriptions.Item label="交底人">{data.Nav_User ? data.Nav_User.NAME : ''}</Descriptions.Item>
-                         <Descriptions.Item label="被交底人">{
-                          data.Nav_Person && data.Nav_Person.map((item, i) => {
-                             if (i == (data.Nav_Person.length - 1)) {
-                                 if (item.DEAL_STATUS == 0)
-                                     return <label style={{ color: 'red' }} title='未签到'> {item.Nav_User?.NAME}</label>
-                                 else
-                                     return item.Nav_User?.NAME
-                             } else {
-                                 if (item.DEAL_STATUS == 0)
-                                     return <label style={{ color: 'red' }} title='未签到'>{item.Nav_User?.NAME + '  '}</label>
-                                 else
-                                     return item.Nav_User?.NAME + '  '
-                             }
+                     <Descriptions.Item label="公司">{data.Nav_Company?.NAME}</Descriptions.Item>
+                     <Descriptions.Item label="生产单元">{data.Nav_ProductionUnit?.NAME}</Descriptions.Item>
+                     <Descriptions.Item label="发起时间">{data.CREATE_TIME}</Descriptions.Item>
+                        
+                         <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment?.NAME}</Descriptions.Item>
+                         <Descriptions.Item label="发起人">{data.Nav_ApplyUser?.NAME}</Descriptions.Item>
+                         <Descriptions.Item label="值班领导">{
+                          data.Nav_Users && data.Nav_Users.map((item, i) => {
+                            return item.Nav_User?.NAME + '  '
                          })
                      }</Descriptions.Item>
-                         <Descriptions.Item label="交底内容">{data.DisclosureContent}</Descriptions.Item>
-                         <Descriptions.Item label="交底人签字">{
-                             (data.Nav_User && data.Nav_User.FILE_PATH)?
-                             showUserSign(data.Nav_User, config.picServerHost):null
+                         <Descriptions.Item label="值班开始时间">{data.JOB_START_DATE}</Descriptions.Item>
+                         <Descriptions.Item label="值班结束时间">{data.JOB_END_DATE}</Descriptions.Item>
+                         <Descriptions.Item label="班次">{data.Nav_Class?.NAME}</Descriptions.Item>
+                         <Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
+                         {
+                    data && data.Nav_Details?
+                        <table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
+                            <tbody>
+
+                                <tr>
+                                    <td width="100px" 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>
+                                {
+                                    data.Nav_Details && data.Nav_Details.map((item, i) => {
+                                        return <tr>
+                                            <td width="100px">
+                                                {i + 1}
+                                            </td>
+                                            <td>
+                                                {item.START_DATE}
+                                            </td>
+                                            <td>
+                                                {item.END_DATE}
+                                            </td>
+                                            <td>
+                                            {
+                                item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => {
+                                    return <tr> {item2?.Nav_Area?.NAME}</tr>
+                                })
+                            }
+                                            </td>
+                                            <td>
+                                                {item.DESCRIPTION}
+                                            </td>
+                                            <td>
+                                                {item.QUESTION}
+                                            </td>
+                                            <td>
+                                                {item.MEASURE}
+                                            </td>
+                                            <td>
+                                            {showFiles(item.Nav_DetailFiles, config.picServerHost, this)}
+                                            </td>
+                                            <td>
+                                                {item.Nav_User?.NAME}
+                                            </td>
+                                            <td>
+                                                {item.USER_DEAL_STATUS == 1?showUserSign(item.Nav_User, config.picServerHost):item.Nav_User?.NAME}
+                                            </td>
+                                            <td>
+                                                {item.ITEM}
+                                            </td>
+                                        </tr>
+                                    })
+                                }
+                            </tbody>
+                        </table> : null
+                }
+                <Descriptions.Item label="交接班地点">{data.PLACE}</Descriptions.Item>
+                <Descriptions.Item label="交班人">{
+                     data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => {
+                        return item.Nav_PreUser?.NAME + '  '
+                    })
+                }</Descriptions.Item>
+                         <Descriptions.Item label="交班人签字">{
+                             data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => {
+                                if (item.PRE_USER_DEAL_STATUS == 1) {
+                                    showUserSign(item.Nav_PreUser, config.picServerHost)
+                                }
+                            })
                            
                          }</Descriptions.Item>
-                         <Descriptions.Item label="被交底人签字">{
-                            data.Nav_Person && data.Nav_Person.map((item, i) => {
-                                 if (item.DEAL_STATUS == 1) {
-                                     showUserSign(item.Nav_User, config.picServerHost)
+                         <Descriptions.Item label="接班人">{
+                     data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
+                        return item.Nav_AfterUser?.NAME + '  '
+                    })
+                  
+                }</Descriptions.Item>
+                         <Descriptions.Item label="接班人签字">{
+                            data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
+                                 if (item.AFTER_USER_DEAL_STATUS == 1) {
+                                     showUserSign(item.Nav_AfterUser, config.picServerHost)
                                  }
                              })
                          }</Descriptions.Item>