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

2025-11-20 22:03:51 +08:00 · 2025-11-20 22:03:51 +08:00 · 2ea153e947
commit 2ea153e947
parent 70e5dcff30 9aefffb9ed
38 changed files with 163 additions and 149 deletions
--- a/src/components/CustomPages/FO/FO015ShowPrint.js
+++ b/src/components/CustomPages/FO/FO015ShowPrint.js
@ -93,7 +93,7 @@ class FO015ShowPrint extends React.Component {
                        this.setState({ BtnAgreeDisplay: 'inline' })
                    }
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+                
            }
        });
    }
--- a/src/components/CustomPages/FO/FO017ShowPrint.js
+++ b/src/components/CustomPages/FO/FO017ShowPrint.js
@ -82,7 +82,7 @@ class FO017ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+               
            }
        });
    }
--- a/src/components/CustomPages/FO/FO017ShowPrintJD.js
+++ b/src/components/CustomPages/FO/FO017ShowPrintJD.js
@ -82,7 +82,6 @@ class FO017ShowPrintJD extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
            }
        });
    }
--- a/src/components/CustomPages/FO/FO019ShowPrint.js
+++ b/src/components/CustomPages/FO/FO019ShowPrint.js
@ -85,8 +85,6 @@ class FO019ShowPrint extends React.Component {
                        this.setState({ BtnAgreeDisplay: 'inline' })
                    }
                }
-                else
-                { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');}
            }
        });
    }
--- a/src/components/CustomPages/FO/FO021ShowPrint.js
+++ b/src/components/CustomPages/FO/FO021ShowPrint.js
@ -88,7 +88,6 @@ class FO021ShowPrint extends React.Component {
                        this.setState({ BtnAgreeDisplay: 'inline' })
                    }
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
            }
        });
    }
--- a/src/components/CustomPages/FO/FO022ShowPrint.js
+++ b/src/components/CustomPages/FO/FO022ShowPrint.js
@ -104,7 +104,7 @@ class FO022ShowPrint extends React.Component {
                        this.setState({ BtnAgreeDisplay: 'inline' })
                    }
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+                
            }
        });
    }
--- a/src/components/CustomPages/FO/FO025ShowPrint.js
+++ b/src/components/CustomPages/FO/FO025ShowPrint.js
@ -82,7 +82,7 @@ class FO025ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+              
            }
        });
    }
--- a/src/components/CustomPages/FO/FO035ShowPrint.js
+++ b/src/components/CustomPages/FO/FO035ShowPrint.js
@ -74,8 +74,6 @@ class FO035ShowPrint extends React.Component {
                        this.setState({ BtnAgreeDisplay: 'inline' })
                    }
                }
-                else
-                { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');}
            }
        });
    }
--- a/src/components/CustomPages/FO/FO037ShowPrint.js
+++ b/src/components/CustomPages/FO/FO037ShowPrint.js
@ -74,8 +74,7 @@ class FO037ShowPrint extends React.Component {
                        this.setState({ BtnAgreeDisplay: 'inline' })
                    }
                }
-                else
-                { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');}
+               
            }
        });
    }
--- a/src/components/CustomPages/FO/FO041ShowPrint.js
+++ b/src/components/CustomPages/FO/FO041ShowPrint.js
@ -74,8 +74,7 @@ class FO041ShowPrint extends React.Component {
                        this.setState({ BtnAgreeDisplay: 'inline' })
                    }
                }
-                else
-                { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');}
+                
            }
        });
    }
--- a/src/components/CustomPages/FO/FO043ShowPrint.js
+++ b/src/components/CustomPages/FO/FO043ShowPrint.js
@ -74,8 +74,7 @@ class FO043ShowPrint extends React.Component {
                        this.setState({ BtnAgreeDisplay: 'inline' })
                    }
                }
-                else
-                { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');}
+               
            }
        });
    }
--- a/src/components/CustomPages/FO/FO045ShowPrint.js
+++ b/src/components/CustomPages/FO/FO045ShowPrint.js
@ -74,8 +74,7 @@ class FO045ShowPrint extends React.Component {
                        this.setState({ BtnAgreeDisplay: 'inline' })
                    }
                }
-                else
-                { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');}
+               
            }
        });
    }
--- a/src/components/CustomPages/SK/OperateLog.css
+++ b/src/components/CustomPages/SK/OperateLog.css
@ -156,43 +156,6 @@
  /* margin-right: 15px; */
  width: 120px;
  height: 40px;
-  background-color: #70AD47;
-  color: white;
-  border: 1px solid white;
-  /* border: 1px solid #ddd; */
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 20px;
-  position: relative;
-  border-radius: 50px;
-  margin-left: 25px;
-}
-
-/* 超时处理 */
-.stepxOutTime {
-  /* margin-right: 15px; */
-  width: 120px;
-  height: 40px;
-  background-color: #FFC000;
-  color: white;
-  border: 1px solid white;
-  /* border: 1px solid #ddd; */
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 20px;
-  position: relative;
-  border-radius: 50px;
-  margin-left: 25px;
-}
-
-/* 未处理 */
-.stepxEnable {
-  /* margin-right: 15px; */
-  width: 120px;
-  height: 40px;
-  background-color: #A5A5A5;
  color: white;
  border: 1px solid white;
  /* border: 1px solid #ddd; */
--- a/src/components/CustomPages/SK/SK002ShowPrint.js
+++ b/src/components/CustomPages/SK/SK002ShowPrint.js
@ -145,8 +145,6 @@ class SK002ShowPrint extends React.Component {
                    //     this.setState({ isFinished: 'inline' })
                    // }
                }
-                else
-                { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');}
            }
        });
    }
--- a/src/components/CustomPages/SK/SK004ShowPrint.js
+++ b/src/components/CustomPages/SK/SK004ShowPrint.js
@ -203,8 +203,6 @@ class SK004ShowPrint extends React.Component {
                    //     this.setState({ isFinished: 'inline' })
                    // }
                }
-                else
-                { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');}
            }
        });
    }
--- a/src/components/CustomPages/SK/SK006ShowOperateLog.js
+++ b/src/components/CustomPages/SK/SK006ShowOperateLog.js
@ -1,4 +1,4 @@
-import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
+import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table, Modal } from 'antd';
 import React from 'react';
 import {
  initFilter,
@ -8,6 +8,7 @@ import {
  showApprove,
  guid,
  ShowDateTime,
+  GetFileModel,
 } from '../../../utils/common.js';
 import ReactToPrint from 'react-to-print';
 import { ExportToExcel } from '@woowalker/feui';
@ -17,6 +18,7 @@ import moment from 'moment';
 import { message } from 'antd/lib/index';
 import styles from './OperateLog.css';
 import config from '../../../config.js';
+import FormPage from '../../FormPage';

 class SK006ShowOperateLog extends React.Component {
  constructor(props) {
@ -26,6 +28,17 @@ class SK006ShowOperateLog extends React.Component {
      riskCount: 1,
      riskHeight: 50,
      opEnd: null,
+      detailForm: {
+        isShow: false,
+        formCode: '',
+        title: '',
+        ID: '',
+      },
+      fileData: [],
+      fileForm: {
+        title: '',
+        visible: false,
+      },
      // dateFirst: [
      //     [{ OPERATEPOINT: 10 }, { OPERATEPOINT: 20 }, { OPERATEPOINT: 30 }, { OPERATEPOINT: 40 }],
      //     [{ OPERATEPOINT: 48 }, { OPERATEPOINT: 50 }, { OPERATEPOINT: 60 }, { OPERATEPOINT: 70 }, { OPERATEPOINT: 80 }],
@ -87,6 +100,35 @@ class SK006ShowOperateLog extends React.Component {
      },
    });
  };
+  showDetailModalPage = (ID, CODE) => {
+    if (ID == null) return message.warning('暂无待办');
+    const newtmpData = {
+      data: {
+        id: ID,
+        // USER_ID: USER_ID,
+      },
+      formCode: CODE,
+    };
+    this.setState({ tmpDataPage: newtmpData }, () => {
+      var detailForm = {
+        isShow: true,
+        title: '',
+      };
+      console.log(this.state.tmpDataPage, '00');
+      this.setState({
+        detailForm: detailForm,
+      });
+    });
+  };
+  //详情弹窗关闭（隐藏）
+  detailFormClose = () => {
+    var detailForm = {
+      isShow: false,
+    };
+    this.setState({
+      detailForm: detailForm,
+    });
+  };
  render() {
    const { data, riskCount, dataRiskMore, opEnd, riskHeight } = this.state;
    const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
@ -108,14 +150,22 @@ class SK006ShowOperateLog extends React.Component {
              data?.map((item, index) => {
                // 判断当前item的logList中是否所有STATUS都是0
                const allStatusZero = item.logList?.every((log) => log.STATUS === 0);
+                // 获取上一个item的FORM_NAME
+                const prevFormName = index > 0 ? data[index - 1].FORM_NAME : null;
+                // 判断当前FORM_NAME是否与上一个重复
+                const isDuplicate = item.FORM_NAME === prevFormName;
+
                {
                  return (
                    <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'flex-start' }}>
                      <div style={{ width: '150px', textAlign: 'center', marginRight: '30px' }}>
-                        <div className={allStatusZero ? styles.stepno : styles.step} id="ste1">
-                          {item.FORM_NAME}
-                        </div>
-                        {index < data.length - 1 && (
+                        {/* 当不是重复的FORM_NAME时才显示步骤名称 */}
+                        {!isDuplicate && (
+                          <div className={allStatusZero ? styles.stepno : styles.step} id="ste1">
+                            {item.FORM_NAME}
+                          </div>
+                        )}
+                        {!isDuplicate && index < data.length - 1 && (
                          <div className={allStatusZero ? styles.rectangleno : styles.rectangle} id="step1"></div>
                        )}
                      </div>
@ -134,15 +184,21 @@ class SK006ShowOperateLog extends React.Component {
                                    }}
                                    key={index1}
                                  >
-                                    <div>
+                                    <div onClick={() => this.showDetailModalPage(item1.ID, item1.CODE)}>
                                      <div
-                                        className={
-                                          item1.STATUS == 0
-                                            ? styles.stepxEnable
-                                            : item1.STATUS == 5
-                                            ? styles.stepx
-                                            : styles.stepxOutTime
-                                        }
+                                        className={styles.stepx}
+                                        style={{
+                                          backgroundColor:
+                                            item1.STATUS === 0
+                                              ? '#A5A5A5' // STATUS=0 → 灰色背景
+                                              : item1.STATUS === 10
+                                              ? '#FFC000' // STATUS=10 → 橙色背景
+                                              : item1.STATUS === 20
+                                              ? '#f56c6c' // STATUS=20 → 红色背景
+                                              : item1.STATUS === 16
+                                              ? '#ADCDEA' // STATUS=16 → 蓝色背景
+                                              : '#70AD47', // STATUS=5，15 → 绿色背景
+                                        }}
                                        id="step20"
                                      >
                                        {item1.NAME}
@ -172,6 +228,20 @@ class SK006ShowOperateLog extends React.Component {
            {/* 隐患整改记录 */}
          </tbody>
        </table>
+        <div style={{ display: 'inline-block' }}>
+          <Modal
+            visible={this.state.detailForm.isShow}
+            title={this.state.detailForm.title}
+            maskClosable={false}
+            closeModal={this.detailFormClose}
+            onCancel={this.detailFormClose}
+            footer={null}
+            width="95%"
+          >
+            <FormPage {...this.state.tmpDataPage} />
+          </Modal>
+        </div>
+        {GetFileModel(Modal, FormPage, this, this.state.fileForm.visible)}
      </div>
    );
  }
--- a/src/components/CustomPages/SK/SK006ShowPrint.js
+++ b/src/components/CustomPages/SK/SK006ShowPrint.js
@ -79,7 +79,7 @@ class SK006ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+                
            }
        });
    }
@ -115,7 +115,7 @@ class SK006ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+                
            }
        });
    }
--- a/src/components/CustomPages/SK/SK010ShowPrint.js
+++ b/src/components/CustomPages/SK/SK010ShowPrint.js
@ -91,7 +91,7 @@ class SK010ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+               
            }
        });
    }
--- a/src/components/CustomPages/SK/SK012ShowPrint.js
+++ b/src/components/CustomPages/SK/SK012ShowPrint.js
@ -112,7 +112,7 @@ class SK012ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+               
            }
        });
    }
--- a/src/components/CustomPages/SK/SK014ShowPrint.js
+++ b/src/components/CustomPages/SK/SK014ShowPrint.js
@ -91,7 +91,7 @@ class SK014ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+
            }
        });
    }
--- a/src/components/CustomPages/SK/SK016ShowPrint.js
+++ b/src/components/CustomPages/SK/SK016ShowPrint.js
@ -71,7 +71,7 @@ class SK016ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+                
            }
        });
    }
--- a/src/components/CustomPages/SK/SK018ShowPrint.js
+++ b/src/components/CustomPages/SK/SK018ShowPrint.js
@ -102,7 +102,7 @@ class SK018ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+               
            }
        });
    }
--- a/src/components/CustomPages/SK/SK020ShowPrint.js
+++ b/src/components/CustomPages/SK/SK020ShowPrint.js
@ -91,7 +91,7 @@ class SK020ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+   
            }
        });
    }
--- a/src/components/CustomPages/SK/SK022ShowPrint.js
+++ b/src/components/CustomPages/SK/SK022ShowPrint.js
@ -92,7 +92,7 @@ class SK022ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+               
            }
        });
    }
@ -124,7 +124,7 @@ class SK022ShowPrint extends React.Component {
                    pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
                />
                <Button style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
-                <Button type="primary" style={{ marginLeft: '8px', display: data && data.STATUS === 21 ? "inline" : "none"  }} onClick={() => this.onTableBtnAgree()} icon="check" >确认</Button>
+                <Button type="primary" style={{ marginLeft: '8px', display: data && data.STATUS === 21 ? "inline" : "none"  }} onClick={() => this.onTableBtnAgree()} icon="check" >审阅</Button>
            </div>
            <div ref={el => (this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id}>
                <h1 style={{ textAlign: 'center', margin: '15px' }}>隐患整改记录</h1>
@ -153,7 +153,11 @@ class SK022ShowPrint extends React.Component {
                                <Descriptions.Item label="整改期限">{moment(data.RECITIFY_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                <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.STATUS == 21 &&
+                                 data.Nav_ImplementUser && data.Nav_ImplementUser.FILE_PATH ?
+                                 showUserSign(data.Nav_ImplementUser, config.picServerHost)
+                                      : 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.RECTIFICATION_DESCRIPTION}</Descriptions.Item>
                                <Descriptions.Item label="整改资金(元)">{data.RECTIFICATION_MONEY}</Descriptions.Item>
@ -167,16 +171,17 @@ class SK022ShowPrint extends React.Component {
                                <Descriptions.Item label="预案或方案">{
                                    showFiles(data?.Nav_RectifyFiles, config.picServerHost, this)
                                }</Descriptions.Item>
-                                <Descriptions.Item label="验收时间">{data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null}</Descriptions.Item>
-                                <Descriptions.Item label="验收结论">{enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]}</Descriptions.Item>
-                                <Descriptions.Item label="验收意见">{data.ACCEPT_OPINION}</Descriptions.Item>
+                                <Descriptions.Item style={{display:(data.STATUS ==20 ||data.STATUS==30)?"inline":"none"}} label="验收时间">{data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null}</Descriptions.Item>
+                                <Descriptions.Item style={{display:(data.STATUS ==20 ||data.STATUS==30)?"inline":"none"}} label="验收结论">{enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]}</Descriptions.Item>
+                                <Descriptions.Item style={{display:(data.STATUS ==20 ||data.STATUS==30)?"inline":"none"}} label="验收意见">{data.ACCEPT_OPINION}</Descriptions.Item>
                                <Descriptions.Item label="整改责任人签名">{
+                                    data.STATUS == 20 &&
                                    data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
                                    showUserSign(data.Nav_RecitifyUser, config.picServerHost)
                                         : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
                                }</Descriptions.Item>
                                <Descriptions.Item label="验收人签名">{
-                                    (data.STATUS == 20 ||data.STATUS == 30) && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
+                                    data.STATUS == 30 && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
                                    showUserSign(data.Nav_RecitifyUser, config.picServerHost)
                                        : data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
                                }</Descriptions.Item>
--- a/src/components/CustomPages/SK/SK024ShowPrint.js
+++ b/src/components/CustomPages/SK/SK024ShowPrint.js
@ -84,7 +84,7 @@ class SK024ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+                
            }
        });
    }
--- a/src/components/CustomPages/SK/SK026ShowPrint.js
+++ b/src/components/CustomPages/SK/SK026ShowPrint.js
@ -272,7 +272,7 @@ class SK026ShowPrint extends React.Component {
          //     this.setState({ isFinished: 'inline' })
          // }
        }
-        else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+        
      }
    });
  }
--- a/src/components/CustomPages/SK/SK027ShowPrint.js
+++ b/src/components/CustomPages/SK/SK027ShowPrint.js
@ -77,7 +77,7 @@ class SK027ShowPrint extends React.Component {
          }
          this.onClickApprove(false);
        }
-        else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+        
      }
    });
  }
--- a/src/components/CustomPages/SK/SK031ShowPrint.js
+++ b/src/components/CustomPages/SK/SK031ShowPrint.js
@ -68,7 +68,7 @@ class SK031ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+                
            }
        });
    }
--- a/src/components/CustomPages/SK/SK033ShowPrint.js
+++ b/src/components/CustomPages/SK/SK033ShowPrint.js
@ -72,7 +72,7 @@ class SK033ShowPrint extends React.Component {
                    }
                    this.onClickApprove(true);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+
            }
        });
    }
--- a/src/components/CustomPages/SK/SK035CheckLibrary.js
+++ b/src/components/CustomPages/SK/SK035CheckLibrary.js
@ -210,8 +210,7 @@ class SK035CheckLibrary extends React.Component {
            }
        });
                }
-                else
-                { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');}
+                
            }
        });
    }
--- a/src/components/CustomPages/SK/SK035ShowPrint.js
+++ b/src/components/CustomPages/SK/SK035ShowPrint.js
@ -72,7 +72,7 @@ class SK035ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+                
            }
        });
    }
--- a/src/components/CustomPages/SK/SK037ShowPrint.js
+++ b/src/components/CustomPages/SK/SK037ShowPrint.js
@ -73,7 +73,7 @@ class SK037ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+            
            }
        });
    }
--- a/src/components/CustomPages/SK/SK039ShowPrint.js
+++ b/src/components/CustomPages/SK/SK039ShowPrint.js
@ -73,7 +73,7 @@ class SK039ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+                
            }
        });
    }
--- a/src/components/CustomPages/SK/SK041ShowPrint.js
+++ b/src/components/CustomPages/SK/SK041ShowPrint.js
@ -73,7 +73,7 @@ class SK041ShowPrint extends React.Component {
                    }
                    this.onClickApprove(false);
                }
-                else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
+              
            }
        });
    }
--- a/src/components/CustomPages/SK/SK043ShowPrint.js
+++ b/src/components/CustomPages/SK/SK043ShowPrint.js
@ -67,8 +67,7 @@ class SK043ShowPrint extends React.Component {
                    //     this.setState({ isFinished: 'inline' })
                    // }
                }
-                else
-                { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');}
+               
            }
        });
    }
--- a/src/components/CustomPages/SK/SK045ShowPrint.js
+++ b/src/components/CustomPages/SK/SK045ShowPrint.js
@ -71,8 +71,7 @@ class SK045ShowPrint extends React.Component {
                    //     this.setState({ isFinished: 'inline' })
                    // }
                }
-                else
-                { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');}
+               
            }
        });
    }
--- a/src/files/edit/SK006.js
+++ b/src/files/edit/SK006.js
@ -124,34 +124,27 @@ export default {
      }
    }
  },
-  // onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => {
-  //   if (colInfo.FIELD_NAME === 'Nav_ProdutionUnit.NAME' || colInfo.FIELD_NAME === 'Nav_CheckType.NAME' ||colInfo.FIELD_NAME === 'DEPARTMENT_TYPE'||colInfo.FIELD_NAME === 'PLANCHECKFREQUENCY')
-  //   {
-  //     let json = initFilter(login.OrgId);
-  //     json.Parameter1 = getFieldValue('PRODUCTION_UNIT_ID');
-  //     json.Parameter2 = getFieldValue('CHECK_TYPE_ID');
-  //     json.Parameter3 = getFieldValue('DEPARTMENT_TYPE') ;
-  //     json.Parameter4 = getFieldValue('PLANCHECKFREQUENCY') ;
-  //     dispatch({
-  //       type: 'app/getDataByPost',
-  //       url: 'SK/SKSecurityInspectionNotice/GetCheckContentPCs',
-  //       payload: json,
-  //       onlyData: false,
-  //       onComplete: (re) => {
-  //         if (re && re.IsSuccessful && re.Data) {
-  //             let temps = [];
-  //             // let detailConfirms=re.Data?.map((item,i)=>{
-  //             //     item['NUM'] = i+1;
-  //             //     item['SafeConfirmsStr'] = item.NAME;
-  //             //     return item;
-  //             //  });
-  //             temps.push({ field: 'Nav_CheckNoticeDetails', value: re.Data })
-  //             setFieldValueByBatch(temps);
-  //         }
-  //       }
-  //     })
-  //   }
-  // },
+  onChange: ({ colInfo, getFieldValue,stateData, setFieldValueByBatch, dispatch,login,updateSubTableData }) => {
+    if (colInfo.FIELD_NAME === 'Nav_ProdutionUnit.NAME' || colInfo.FIELD_NAME === 'Nav_CheckType.NAME' ||colInfo.FIELD_NAME === 'DEPARTMENT_TYPE'||colInfo.FIELD_NAME === 'PLANCHECKFREQUENCY')
+    {
+      dispatch({
+        type: 'app/getDataByPost',
+        url: 'SK/SKSecurityInspectionNotice/GetCheckContentsNew',
+        payload: stateData,
+        onlyData: false,
+        onComplete: (re) => {
+          if (re && re.IsSuccessful && re.Data) {
+            let temps = [];
+            temps.push({ field: 'Nav_CheckNoticeDetails', value: re.Data })
+            setFieldValueByBatch(temps);
+            // stateData.Nav_CheckNoticeDetails = re.Data
+            // saveRowRecord({ record: stateData, editCode: "T_SK_SECURITY_INSPECTION_NOTICE_DETAIL" })
+          }
+         
+        }
+      })
+    }
+  },
  btnSubAdd: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => {
    
    if(login.tempContents && login.tempContents.length>0)
@ -189,11 +182,11 @@ export default {
 },
 btnSubContents: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => {
    
-  // if(!stateData.PRODUCTION_UNIT_ID)
-  // {
-  //     message.error("请选择生产单元!")
-  //     return
-  // }debugger
+  if(!stateData.PRODUCTION_UNIT_ID)
+  {
+      message.error("请选择生产单元!")
+      return
+  }
  // if(!stateData.DEPARTMENT_TYPE)
  // {
  //     message.error("请选择检查层级!")
--- a/src/utils/customConfig.js
+++ b/src/utils/customConfig.js
@ -151,8 +151,8 @@ const SE063ShowPrint = createLoadableComponent(() => import('../components/Custo
 const SE051ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE051ShowPrint'))
 const SE007ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE007ShowPrint'))

-// const BI001HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI001HomeDetail'))
-// const BI002HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI002HomeDetail'))
+const BI001HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI001HomeDetail'))
+const BI002HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI002HomeDetail'))
 // const BI054HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI054HomeDetail'))
 // const BI055HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI055HomeDetail'))
 // const BI004FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI004FormRunAnalysis'))
@ -164,8 +164,8 @@ const SE007ShowPrint = createLoadableComponent(() => import('../components/Custo
 // const BI008FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI008FormRunAnalysis'))
 // const BI009RiskAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI009RiskAnalysis'))
 // const BI010FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI010FormRunAnalysis'))
-// const BI011FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011FormRunAnalysis'))
-// const BI011TrainSafeAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011TrainSafeAnalysis'))
+const BI011FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011FormRunAnalysis'))
+const BI011TrainSafeAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011TrainSafeAnalysis'))
 // const BI012NotificationTaskAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI012NotificationTaskAnalysis'))
 // const BI013RiskAnalysisModel = createLoadableComponent(() => import('../components/CustomPages/BI/BI013RiskAnalysisModel'))
 // const BI030FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI030FormRunAnalysis'))
@ -173,14 +173,14 @@ const SE007ShowPrint = createLoadableComponent(() => import('../components/Custo
 // const BI060MapeShow = createLoadableComponent(() => import('../components/CustomPages/BI/BI060MapeShow'))
 // const BI060MapePoint = createLoadableComponent(() => import('../components/CustomPages/BI/BI060MapePoint'))
 // const BI061MapeGISShow = createLoadableComponent(() => import('../components/CustomPages/BI/BI061MapeGISShow'))
-// const BI009FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI009FormRunAnalysis'))
-// const BIView = createLoadableComponent(() => import('../components/CustomPages/BI/BIView'))
+const BI009FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI009FormRunAnalysis'))
+const BIView = createLoadableComponent(() => import('../components/CustomPages/BI/BIView'))
 // const BI001 = createLoadableComponent(() => import('../components/CustomPages/BI/BI001'))
 // const BI050BSSafeCheck = createLoadableComponent(() => import('../components/CustomPages/BI/BI050BSSafeCheck'))
 // const BI051BSCompanyYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI051BSCompanyYearOne'))
 // const BI052BSSafeCheckYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI052BSSafeCheckYearOne'))
 // const BI053BSSafeCheckYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI053BSSafeCheckYearOne'))
-// const BI056Performance = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Performance'))
+const BI056Performance = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Performance'))
 // const BI056Dilg1_1 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg1_1'))
 // const BI056Dilg1_2 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg1_2'))
 // const BI056Dilg2_1 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg2_1'))
@ -189,7 +189,7 @@ const SE007ShowPrint = createLoadableComponent(() => import('../components/Custo
 // const BI056Dilg3_2 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg3_2'))
 // const BI003StatiscialAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI003StatiscialAnalysis'))
 // const BI020ApproveAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI020ApproveAnalysis'))
-// const BI014RiskPerformanceModel = createLoadableComponent(() => import('../components/CustomPages/BI/BI014RiskPerformanceModel'))
+const BI014RiskPerformanceModel = createLoadableComponent(() => import('../components/CustomPages/BI/BI014RiskPerformanceModel'))
 // const BI012FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI012FormRunAnalysis'))

 const PF136FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/PF/PF136FormRunAnalysis'))
@ -373,7 +373,7 @@ export default function (componentName, formId, formParam, data, formCode, formD
    // CM045ShowPrint: <CM045ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,


-    // BIView: <BIView formId={formId} formParam={formParam} data={data} formCode={formCode} />,
+    BIView: <BIView formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI001: <BI001 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI050BSSafeCheck: <BI050BSSafeCheck formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI051BSCompanyYear: <BI051BSCompanyYear formId={formId} formParam={formParam} data={data} formCode={formCode} />,
@ -381,7 +381,7 @@ export default function (componentName, formId, formParam, data, formCode, formD
    // BI053BSSafeCheckYear: <BI053BSSafeCheckYear formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI054HomeDetail: <BI054HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI055HomeDetail: <BI055HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
-    // BI056Performance: <BI056Performance formId={formId} formParam={formParam} data={data} formCode={formCode} />,
+    BI056Performance: <BI056Performance formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI056Dilg1_1: <BI056Dilg1_1 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI056Dilg1_2: <BI056Dilg1_2 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI056Dilg2_1: <BI056Dilg2_1 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
@ -389,7 +389,7 @@ export default function (componentName, formId, formParam, data, formCode, formD
    // BI056Dilg3_1: <BI056Dilg3_1 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI056Dilg3_2: <BI056Dilg3_2 formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI003StatiscialAnalysis: <BI003StatiscialAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
-    // BI001HomeDetail: <BI001HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
+    BI001HomeDetail: <BI001HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI002HomeDetail: <BI002HomeDetail formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI004FormRunAnalysis: <BI004FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI005LoginRecord: <BI005LoginRecord formId={formId} formParam={formParam} data={data} formCode={formCode} />,
@ -400,8 +400,8 @@ export default function (componentName, formId, formParam, data, formCode, formD
    // BI008FormRunAnalysis: <BI008FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI009RiskAnalysis: <BI009RiskAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI010FormRunAnalysis: <BI010FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
-    // BI011FormRunAnalysis: <BI011FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
-    // BI011TrainSafeAnalysis: <BI011TrainSafeAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
+    BI011FormRunAnalysis: <BI011FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
+    BI011TrainSafeAnalysis: <BI011TrainSafeAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI012NotificationTaskAnalysis: <BI012NotificationTaskAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI013RiskAnalysisModel: <BI013RiskAnalysisModel formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI014RiskPerformanceModel: <BI014RiskPerformanceModel formId={formId} formParam={formParam} data={data} formCode={formCode} />,
@ -409,7 +409,7 @@ export default function (componentName, formId, formParam, data, formCode, formD
    // BI060MapeShow: <BI060MapeShow formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI060MapePoint: <BI060MapePoint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI061MapeGISShow: <BI061MapeGISShow formId={formId} formParam={formParam} data={data} formCode={formCode} />,
-    // BI009FormRunAnalysis: <BI009FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
+    BI009FormRunAnalysis: <BI009FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI020ApproveAnalysis: <BI020ApproveAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    // BI012FormRunAnalysis: <BI012FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,
    PF136FormRunAnalysis: <PF136FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />,