diff --git a/src/components/CustomPages/FO/FO041ShowPrint.js b/src/components/CustomPages/FO/FO041ShowPrint.js
index 36651d7..d8ca135 100644
--- a/src/components/CustomPages/FO/FO041ShowPrint.js
+++ b/src/components/CustomPages/FO/FO041ShowPrint.js
@@ -14,7 +14,11 @@ class FO041ShowPrint extends React.Component {
         this.state = {
             data: null,
             enumData: null,
-            BtnAgreeDisplay: 'none'
+            BtnAgreeDisplay: 'none',
+            fileForm: {
+                title: "",
+                visible: false,
+            },
         };
     };
 
@@ -122,8 +126,41 @@ class FO041ShowPrint extends React.Component {
                          <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>
+                         <Descriptions.Item column={24} label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
+                         </Descriptions>
+
+                         <Descriptions size="middle" bordered className={styles.description}>
+                    <Descriptions.Item label="交接班地点">{data.PLACE}</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.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
+                            return item.Nav_AfterUser?.NAME + '  '
+                        })
                       
+                    }</Descriptions.Item>
+                     </Descriptions>
+
+<Descriptions size="middle" bordered className={styles.description}>
+                             <Descriptions.Item column={12} label="交班人签字">{
+                                 data.Nav_Users && data.Nav_Users.map((item, i) => {
+                                    if (item.DEAL_STATUS == 1) {
+                                        showUserSign(item.Nav_User, config.picServerHost)
+                                    }
+                                })
+                               
+                             }</Descriptions.Item>
+                           
+                             <Descriptions.Item column={12} 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>
                      </Descriptions>
                      {
                         data && data.Nav_Details?
@@ -158,7 +195,7 @@ class FO041ShowPrint extends React.Component {
                                                 <td>
                                                 {
                                     item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => {
-                                        return <tr> {item2?.Nav_Area?.NAME}</tr>
+                                        return item2?.Nav_Area?.NAME +'    '
                                     })
                                 }
                                                 </td>
@@ -189,36 +226,7 @@ class FO041ShowPrint extends React.Component {
                                 </tbody>
                             </table> : null
                     }
-                    <br></br>
-                <Descriptions size="middle" bordered className={styles.description}>
-                    <Descriptions.Item label="交接班地点">{data.PLACE}</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.Nav_Users && data.Nav_Users.map((item, i) => {
-                                    if (item.DEAL_STATUS == 1) {
-                                        showUserSign(item.Nav_User, config.picServerHost)
-                                    }
-                                })
-                               
-                             }</Descriptions.Item>
-                             <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>
-                 </Descriptions>
+                   
                  </div>:null
                  }
                  </div>
diff --git a/src/components/CustomPages/FO/FO043ShowPrint.js b/src/components/CustomPages/FO/FO043ShowPrint.js
index 2a2831f..9d5dd39 100644
--- a/src/components/CustomPages/FO/FO043ShowPrint.js
+++ b/src/components/CustomPages/FO/FO043ShowPrint.js
@@ -15,7 +15,11 @@ class FO043ShowPrint extends React.Component {
         this.state = {
             data: null,
             enumData: null,
-            BtnAgreeDisplay: 'none'
+            BtnAgreeDisplay: 'none',
+            fileForm: {
+                title: "",
+                visible: false,
+            },
         };
     };
 
@@ -144,7 +148,62 @@ class FO043ShowPrint extends React.Component {
                                      return item.RISK_NAME + '  '
                             })}</Descriptions.Item>
                          <Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
-                         {
+                         
+                <Descriptions.Item label="动火作业现场条件验收情况">{data.COMPLETED_CONDITION}</Descriptions.Item>
+                <Descriptions.Item label="是否可以动火">{enums.FOYesOrNoEnum.enums[data.IS_FIRE]}</Descriptions.Item>
+                <Descriptions.Item label="动火实际开始时间">{data.ACT_DATE}</Descriptions.Item>
+                <Descriptions.Item label="附件"> {showFiles(data.Nav_FireFiles, config.picServerHost, this)}</Descriptions.Item>
+                <Descriptions.Item label="矿调度室人员">{data.Nav_DispatchUser?.NAME}</Descriptions.Item>
+                         <Descriptions.Item label="动火部门负责人签名">{
+                             
+                                data.USER_DEAL_STATUS == 1?
+                                    showUserSign(data.Nav_FireUser, config.picServerHost)
+                                :null
+                           
+                         }</Descriptions.Item>
+                        <Descriptions.Item label="安全管理人员签名">{
+                             
+                             data.SAFE_DEAL_STATUS == 1?
+                                 showUserSign(data.Nav_SafeUser, config.picServerHost)
+                             :null
+                        
+                      }</Descriptions.Item>
+                 <Descriptions.Item label="矿调度人员签名">{
+                             
+                             data.DISPATCH_DEAL_STATUS == 1?
+                                 showUserSign(data.Nav_DispatchUser, config.picServerHost)
+                             :null
+                        
+                      }</Descriptions.Item>
+                         <Descriptions.Item label="动火作业完工验收情况">{
+                            data.COMPLETED_CONTENT
+                         }</Descriptions.Item>
+                           <Descriptions.Item label="是否可以撤离">{
+                           enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
+                         }</Descriptions.Item>
+                         <Descriptions.Item label="动火实际结束时间">{
+                            data.ACT_END_DATE
+                         }</Descriptions.Item>
+                         <Descriptions.Item label="离开现场时间">{
+                            data.LEAVE_DATE
+                         }</Descriptions.Item>
+                          <Descriptions.Item label="附件">{
+                           showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
+                         }</Descriptions.Item>
+                           <Descriptions.Item label="动火部门负责人签字">{
+                             data.USER_DEAL_FINISH_STATUS == 1?
+                             showUserSign(data.Nav_FireUser, config.picServerHost)
+                         :null
+                         }</Descriptions.Item>
+                           <Descriptions.Item label="安全生产管理人员签字">{
+                            data.SAFE_DEAL_FINISH_STATUS == 1?
+                            showUserSign(data.Nav_SafeUser, config.picServerHost)
+                        :null
+                         }</Descriptions.Item>
+                       
+                     </Descriptions>
+                     <FormPage {...this.state.tmpData} />
+                     {
                     data && data.Nav_Users?
                         <table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
                             <tbody>
@@ -205,13 +264,14 @@ class FO043ShowPrint extends React.Component {
                                                 {i + 1}
                                             </td>
                                             <td>
-                                                {enums.FOJobStepEnum.enums[data.JOB_STEP]}
+                                                {enums.FOJobStepEnum.enums[item.JOB_STEP]}
                                             </td>
                                             <td>
                                                 {item.CONTENT}
                                             </td>
                                             <td>
-                                                {enums.FOYesOrNoEnum.enums[data.IS_CONFIRM]}
+                                            {item.IS_CONFIRM_NEW ? "是" : "否"}
+                                                {/* {enums.FOYesOrNoEnum.enums[item.IS_CONFIRM]} */}
                                             </td>
                                             <td>
                                             {showFiles(item.Nav_DetailFiles, config.picServerHost, this)}
@@ -223,59 +283,7 @@ class FO043ShowPrint extends React.Component {
                             </tbody>
                         </table> : null
                 }
-                  <FormPage {...this.state.tmpData} />
-                <Descriptions.Item label="动火作业现场条件验收情况">{data.COMPLETED_CONDITION}</Descriptions.Item>
-                <Descriptions.Item label="是否可以动火">{enums.FOYesOrNoEnum.enums[data.IS_FIRE]}</Descriptions.Item>
-                <Descriptions.Item label="动火实际开始时间">{data.ACT_DATE}</Descriptions.Item>
-                <Descriptions.Item label="附件"> {showFiles(data.Nav_FireFiles, config.picServerHost, this)}</Descriptions.Item>
-                <Descriptions.Item label="矿调度室人员">{data.Nav_DispatchUser?.NAME}</Descriptions.Item>
-                         <Descriptions.Item label="动火部门负责人签名">{
-                             
-                                data.USER_DEAL_STATUS == 1?
-                                    showUserSign(data.Nav_FireUser, config.picServerHost)
-                                :null
-                           
-                         }</Descriptions.Item>
-                        <Descriptions.Item label="安全管理人员签名">{
-                             
-                             data.SAFE_DEAL_STATUS == 1?
-                                 showUserSign(data.Nav_SafeUser, config.picServerHost)
-                             :null
-                        
-                      }</Descriptions.Item>
-                 <Descriptions.Item label="矿调度人员签名">{
-                             
-                             data.DISPATCH_DEAL_STATUS == 1?
-                                 showUserSign(data.Nav_DispatchUser, config.picServerHost)
-                             :null
-                        
-                      }</Descriptions.Item>
-                         <Descriptions.Item label="动火作业完工验收情况">{
-                            data.COMPLETED_CONTENT
-                         }</Descriptions.Item>
-                           <Descriptions.Item label="是否可以撤离">{
-                           enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
-                         }</Descriptions.Item>
-                         <Descriptions.Item label="动火实际结束时间">{
-                            data.ACT_END_DATE
-                         }</Descriptions.Item>
-                         <Descriptions.Item label="离开现场时间">{
-                            data.LEAVE_DATE
-                         }</Descriptions.Item>
-                          <Descriptions.Item label="附件">{
-                           showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
-                         }</Descriptions.Item>
-                           <Descriptions.Item label="动火部门负责人签字">{
-                             data.USER_DEAL_FINISH_STATUS == 1?
-                             showUserSign(data.Nav_FireUser, config.picServerHost)
-                         :null
-                         }</Descriptions.Item>
-                           <Descriptions.Item label="安全生产管理人员签字">{
-                            data.SAFE_DEAL_FINISH_STATUS == 1?
-                            showUserSign(data.Nav_SafeUser, config.picServerHost)
-                        :null
-                         }</Descriptions.Item>
-                     </Descriptions>
+               
                  </div> : null
                 }
             </div>
@@ -283,4 +291,4 @@ class FO043ShowPrint extends React.Component {
     }
 
 }
-export default connect(({ login }) => ({ login }))(FO043ShowPrint) 
\ No newline at end of file
+export default connect(({ login,app }) => ({ login,app }))(FO043ShowPrint) 
\ No newline at end of file
diff --git a/src/components/CustomPages/FO/FO045ShowPrint.js b/src/components/CustomPages/FO/FO045ShowPrint.js
index 855a656..9a63218 100644
--- a/src/components/CustomPages/FO/FO045ShowPrint.js
+++ b/src/components/CustomPages/FO/FO045ShowPrint.js
@@ -15,7 +15,11 @@ class FO045ShowPrint extends React.Component {
         this.state = {
             data: null,
             enumData: null,
-            BtnAgreeDisplay: 'none'
+            BtnAgreeDisplay: 'none',
+            fileForm: {
+                title: "",
+                visible: false,
+            },
         };
     };
 
@@ -146,7 +150,55 @@ class FO045ShowPrint extends React.Component {
                                      return item.RISK_NAME + '  '
                             })}</Descriptions.Item>
                          <Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
-                         {
+                        
+                <Descriptions.Item label="动火作业现场条件验收情况">{data.COMPLETED_CONDITION}</Descriptions.Item>
+                <Descriptions.Item label="是否可以动火">{enums.FOYesOrNoEnum.enums[data.IS_FIRE]}</Descriptions.Item>
+                <Descriptions.Item label="动火实际开始时间">{data.ACT_DATE}</Descriptions.Item>
+                <Descriptions.Item label="附件"> {showFiles(data.Nav_FireFiles, config.picServerHost, this)}</Descriptions.Item>
+
+                         <Descriptions.Item label="动火部门负责人签名">{
+                             
+                                data.USER_DEAL_STATUS == 1?
+                                    showUserSign(data.Nav_FireUser, config.picServerHost)
+                                :null
+                           
+                         }</Descriptions.Item>
+                        <Descriptions.Item label="安全管理人员签名">{
+                             
+                             data.SAFE_DEAL_STATUS == 1?
+                                 showUserSign(data.Nav_SafeUser, config.picServerHost)
+                             :null
+                        
+                      }</Descriptions.Item>
+                         <Descriptions.Item label="动火作业完工验收情况">{
+                            data.COMPLETED_CONTENT
+                         }</Descriptions.Item>
+                           <Descriptions.Item label="是否可以撤离">{
+                           enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
+                         }</Descriptions.Item>
+                         <Descriptions.Item label="动火实际结束时间">{
+                            data.ACT_END_DATE
+                         }</Descriptions.Item>
+                         <Descriptions.Item label="离开现场时间">{
+                            data.LEAVE_DATE
+                         }</Descriptions.Item>
+                          <Descriptions.Item label="附件">{
+                           showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
+                         }</Descriptions.Item>
+                           <Descriptions.Item label="动火部门负责人签字">{
+                             data.USER_DEAL_FINISH_STATUS == 1?
+                             showUserSign(data.Nav_FireUser, config.picServerHost)
+                         :null
+                         }</Descriptions.Item>
+                           <Descriptions.Item label="安全生产管理人员签字">{
+                            data.SAFE_DEAL_FINISH_STATUS == 1?
+                            showUserSign(data.Nav_SafeUser, config.picServerHost)
+                        :null
+                         }</Descriptions.Item>
+                       
+                     </Descriptions>
+                     <FormPage {...this.state.tmpData} />
+                     {
                     data && data.Nav_Users?
                         <table style={{ width: '100%', textAlign: 'center', marginTop: '10px', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
                             <tbody>
@@ -207,13 +259,14 @@ class FO045ShowPrint extends React.Component {
                                                 {i + 1}
                                             </td>
                                             <td>
-                                                {enums.FOJobStepEnum.enums[data.JOB_STEP]}
+                                                {enums.FOJobStepEnum.enums[item.JOB_STEP]}
                                             </td>
                                             <td>
                                                 {item.CONTENT}
                                             </td>
                                             <td>
-                                                {enums.FOYesOrNoEnum.enums[data.IS_CONFIRM]}
+                                            {item.IS_CONFIRM_NEW ? "是" : "否"}
+                                                {/* {enums.FOYesOrNoEnum.enums[item.IS_CONFIRM]} */}
                                             </td>
                                             <td>
                                             {showFiles(item.Nav_DetailFiles, config.picServerHost, this)}
@@ -225,52 +278,6 @@ class FO045ShowPrint extends React.Component {
                             </tbody>
                         </table> : null
                 }
-                  <FormPage {...this.state.tmpData} />
-                <Descriptions.Item label="动火作业现场条件验收情况">{data.COMPLETED_CONDITION}</Descriptions.Item>
-                <Descriptions.Item label="是否可以动火">{enums.FOYesOrNoEnum.enums[data.IS_FIRE]}</Descriptions.Item>
-                <Descriptions.Item label="动火实际开始时间">{data.ACT_DATE}</Descriptions.Item>
-                <Descriptions.Item label="附件"> {showFiles(data.Nav_FireFiles, config.picServerHost, this)}</Descriptions.Item>
-
-                         <Descriptions.Item label="动火部门负责人签名">{
-                             
-                                data.USER_DEAL_STATUS == 1?
-                                    showUserSign(data.Nav_FireUser, config.picServerHost)
-                                :null
-                           
-                         }</Descriptions.Item>
-                        <Descriptions.Item label="安全管理人员签名">{
-                             
-                             data.SAFE_DEAL_STATUS == 1?
-                                 showUserSign(data.Nav_SafeUser, config.picServerHost)
-                             :null
-                        
-                      }</Descriptions.Item>
-                         <Descriptions.Item label="动火作业完工验收情况">{
-                            data.COMPLETED_CONTENT
-                         }</Descriptions.Item>
-                           <Descriptions.Item label="是否可以撤离">{
-                           enums.FOYesOrNoEnum.enums[data.IS_LEAVE]
-                         }</Descriptions.Item>
-                         <Descriptions.Item label="动火实际结束时间">{
-                            data.ACT_END_DATE
-                         }</Descriptions.Item>
-                         <Descriptions.Item label="离开现场时间">{
-                            data.LEAVE_DATE
-                         }</Descriptions.Item>
-                          <Descriptions.Item label="附件">{
-                           showFiles(data.Nav_MonitorFiles, config.picServerHost, this)
-                         }</Descriptions.Item>
-                           <Descriptions.Item label="动火部门负责人签字">{
-                             data.USER_DEAL_FINISH_STATUS == 1?
-                             showUserSign(data.Nav_FireUser, config.picServerHost)
-                         :null
-                         }</Descriptions.Item>
-                           <Descriptions.Item label="安全生产管理人员签字">{
-                            data.SAFE_DEAL_FINISH_STATUS == 1?
-                            showUserSign(data.Nav_SafeUser, config.picServerHost)
-                        :null
-                         }</Descriptions.Item>
-                     </Descriptions>
                  </div> : null
                 }
             </div>
@@ -278,4 +285,4 @@ class FO045ShowPrint extends React.Component {
     }
 
 }
-export default connect(({ login }) => ({ login }))(FO045ShowPrint) 
\ No newline at end of file
+export default connect(({ login,app }) => ({ login,app }))(FO045ShowPrint) 
\ No newline at end of file
diff --git a/src/files/edit/FO043.js b/src/files/edit/FO043.js
index d86f811..f2ffa80 100644
--- a/src/files/edit/FO043.js
+++ b/src/files/edit/FO043.js
@@ -63,7 +63,7 @@ export default {
         setFieldEditable('IS_FIRE', false)
         setFieldEditable('ACT_DATE', false)
         setFieldEditable('Nav_FireFiles', false)
-        setFieldEditable('Nav_DispatchUser', false)
+        setFieldEditable('Nav_DispatchUser.NAME', false)
         setFieldEditable('COMPLETED_CONTENT', true)
         setFieldEditable('IS_LEAVE', true)
         setFieldEditable('ACT_END_DATE', true)
diff --git a/src/files/edit/SK006.js b/src/files/edit/SK006.js
index 841fe7b..4831e12 100644
--- a/src/files/edit/SK006.js
+++ b/src/files/edit/SK006.js
@@ -135,6 +135,10 @@ export default {
         onComplete: (re) => {
           if (re && re.IsSuccessful && re.Data) {
             let temps = [];
+            let rets=re.Data?.map((item,i)=>{
+              item['ROW_NO'] = i+1;
+              return item;
+           });
             temps.push({ field: 'Nav_CheckNoticeDetails', value: re.Data })
             setFieldValueByBatch(temps);
             // stateData.Nav_CheckNoticeDetails = re.Data