diff --git a/src/components/CustomPages/FO/FO017ShowPrintJD.js b/src/components/CustomPages/FO/FO017ShowPrintJD.js
index eeff171..ffd64c8 100644
--- a/src/components/CustomPages/FO/FO017ShowPrintJD.js
+++ b/src/components/CustomPages/FO/FO017ShowPrintJD.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -80,7 +80,7 @@ class FO017ShowPrintJD extends React.Component {
                     } else {
                         that.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
             }
         });
@@ -92,12 +92,21 @@ class FO017ShowPrintJD extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "关键作业/许可作业工作票.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data, } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px' }}>打印</Button>}
                     content={() => this.componentRef}
@@ -165,7 +174,7 @@ class FO017ShowPrintJD extends React.Component {
                                 </tr>
                                 <tr>
                                     <td colSpan={2} rowSpan={1} className={styles.fontBold}>安全措施确认</td>
-                                    <td colSpan={8} rowSpan={1}>{showFiles(data?.Nav_Files, config.picServerHost, this)}</td>
+                                    <td colSpan={8} rowSpan={1}>{ showFiles(data?.Nav_Files, config.picServerHost, this)}</td>
                                 </tr>
                             </tbody>
                         </table> : null
diff --git a/src/components/CustomPages/FO/FO025ShowPrint.js b/src/components/CustomPages/FO/FO025ShowPrint.js
index d489781..7d9c017 100644
--- a/src/components/CustomPages/FO/FO025ShowPrint.js
+++ b/src/components/CustomPages/FO/FO025ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -81,7 +81,7 @@ class FO025ShowPrint extends React.Component {
                     } else {
                         that.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -94,12 +94,21 @@ class FO025ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "关键作业/许可作业工作票(外包).xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data, } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px' }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/FO/FO043ShowPrint.js b/src/components/CustomPages/FO/FO043ShowPrint.js
index e7c2b41..54ae6bc 100644
--- a/src/components/CustomPages/FO/FO043ShowPrint.js
+++ b/src/components/CustomPages/FO/FO043ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
-import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal, Table } from 'antd';
+import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select,Modal, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -78,12 +78,21 @@ class FO043ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
         });
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     onTableBtnExport() {
         let TableWrap = document.getElementById('tableId' + this.props.data.id);
         let Table = TableWrap.getElementsByTagName('table')[0];
@@ -96,7 +105,7 @@ class FO043ShowPrint extends React.Component {
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/FO/FO045ShowPrint.js b/src/components/CustomPages/FO/FO045ShowPrint.js
index bfa3d89..8525822 100644
--- a/src/components/CustomPages/FO/FO045ShowPrint.js
+++ b/src/components/CustomPages/FO/FO045ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -78,12 +78,21 @@ class FO045ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
         });
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     onTableBtnExport() {
         let TableWrap = document.getElementById('tableId' + this.props.data.id);
         let Table = TableWrap.getElementsByTagName('table')[0];
@@ -96,7 +105,7 @@ class FO045ShowPrint extends React.Component {
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/HM/HM042ShowPrint.js b/src/components/CustomPages/HM/HM042ShowPrint.js
index 90fcfdd..a7287fa 100644
--- a/src/components/CustomPages/HM/HM042ShowPrint.js
+++ b/src/components/CustomPages/HM/HM042ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -117,7 +117,7 @@ class HM042ShowPrint extends React.Component {
                         this.props.data.loadDataDeal(1);
                     }
                     this.teamUsers = this.removeDuplicateUser(ret.Nav_Details);
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     if (ret.STATUS >= 4) {
                         this.state.isFinished = "inline";
                     }
@@ -166,6 +166,15 @@ class HM042ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "年度风险评价计划审核表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     joinArea(data) {
         let ret = [];
         for (let it of data) {
@@ -208,7 +217,7 @@ class HM042ShowPrint extends React.Component {
         return <div>
             <div style={{ padding: '10px' }}>
 
-                <Button onClick={() => approveView(this)} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ display: this.state.isFinished }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/HM/HM061ShowPrint.js b/src/components/CustomPages/HM/HM061ShowPrint.js
index f9c6d02..ca00813 100644
--- a/src/components/CustomPages/HM/HM061ShowPrint.js
+++ b/src/components/CustomPages/HM/HM061ShowPrint.js
@@ -2,7 +2,7 @@ import { Button, Descriptions, Row, Col, Form, Input, Select, Table, Modal } fro
 import { message } from "antd/lib/index";
 import React from 'react';
 import moment from 'moment';
-import { initFilter, extendRule, extendInclude, extendOrder, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendOrder, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -54,7 +54,7 @@ class HM061ShowPrint extends React.Component {
                     if (this.props.data && this.props.data.loadDataDeal) {
                         this.props.data.loadDataDeal(1);
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     for (let i = 0; i < ret.Nav_Detail.length; i++) {
                         ret.Nav_Detail.sort((a, b) => {
                             return a.Nav_Area.NAME > b.Nav_Area.NAME ? 1 : -1;
@@ -127,6 +127,15 @@ class HM061ShowPrint extends React.Component {
         }
         return str;
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     BtnClose = () => {
         if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
             this.props.data.onCancel();
@@ -135,7 +144,7 @@ class HM061ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/HM/HM063ShowPrint.js b/src/components/CustomPages/HM/HM063ShowPrint.js
index be18e97..688276b 100644
--- a/src/components/CustomPages/HM/HM063ShowPrint.js
+++ b/src/components/CustomPages/HM/HM063ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -51,6 +51,15 @@ class HM063ShowPrint extends React.Component {
             }
         })
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     BtnClose = () => {
         if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
             this.props.data.onCancel();
@@ -100,7 +109,7 @@ class HM063ShowPrint extends React.Component {
                         this.props.data.loadDataDeal(1);
                     }
                     // this.state.areas = this.removeDuplicateArea(ret.Nav_Details);
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     // let index = ret.Nav_Users.findIndex((item) =>
                     //     item.USER_ID == this.props.login.userId
                     // );
@@ -166,7 +175,7 @@ class HM063ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/HM/HM087ShowPrint.js b/src/components/CustomPages/HM/HM087ShowPrint.js
index 30dbe59..a51ca2a 100644
--- a/src/components/CustomPages/HM/HM087ShowPrint.js
+++ b/src/components/CustomPages/HM/HM087ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -75,7 +75,7 @@ class HM087ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
             }
         });
@@ -87,12 +87,21 @@ class HM087ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "作业任务识别分析表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data, } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.IS_PUBLISH === 5 ? "inline" : "none" }}  >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/HM/HM099ShowPrint.js b/src/components/CustomPages/HM/HM099ShowPrint.js
index cc4cc39..216a407 100644
--- a/src/components/CustomPages/HM/HM099ShowPrint.js
+++ b/src/components/CustomPages/HM/HM099ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -51,6 +51,15 @@ class HM099ShowPrint extends React.Component {
             }
         })
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     BtnClose = () => {
         if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
             this.props.data.onCancel();
@@ -82,7 +91,7 @@ class HM099ShowPrint extends React.Component {
                     if (this.props.data && this.props.data.loadDataDeal) {
                         this.props.data.loadDataDeal(1);
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     // let index = ret.Nav_Users.findIndex((item) =>
                     //     item.USER_ID == this.props.login.userId
                     // );
@@ -134,7 +143,7 @@ class HM099ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/HM/HM101ShowPrint.js b/src/components/CustomPages/HM/HM101ShowPrint.js
index 11f81ee..f85cba9 100644
--- a/src/components/CustomPages/HM/HM101ShowPrint.js
+++ b/src/components/CustomPages/HM/HM101ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendOrder, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendOrder, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import moment from 'moment';
@@ -56,7 +56,7 @@ class HM101ShowPrint extends React.Component {
                     if (this.props.data && this.props.data.loadDataDeal) {
                         this.props.data.loadDataDeal(1);
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     this.setState({ data: ret });
                     this.props.dispatch({
                         type: 'app/getDataByPost',
@@ -99,6 +99,15 @@ class HM101ShowPrint extends React.Component {
             }
         })
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     BtnClose = () => {
         if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
             this.props.data.onCancel();
@@ -107,7 +116,7 @@ class HM101ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/HM/HM104ShowPrint.js b/src/components/CustomPages/HM/HM104ShowPrint.js
index ea8e22e..f695360 100644
--- a/src/components/CustomPages/HM/HM104ShowPrint.js
+++ b/src/components/CustomPages/HM/HM104ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -78,7 +78,7 @@ class HM104ShowPrint extends React.Component {
                     } else {
                         that.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -96,13 +96,22 @@ class HM104ShowPrint extends React.Component {
         XLSX.writeFile(wb, "作业任务识别表.xlsx")
     }
 
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         // let aaa = Math.random();
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button style={{ marginLeft: '8px', display: data && data.IS_PUBLISH === 5 ? "inline" : "none" }} type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/HM/HM107ShowPrint.js b/src/components/CustomPages/HM/HM107ShowPrint.js
index aca8a0a..ee06d99 100644
--- a/src/components/CustomPages/HM/HM107ShowPrint.js
+++ b/src/components/CustomPages/HM/HM107ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -77,7 +77,7 @@ class HM107ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
                 else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
             }
@@ -90,13 +90,22 @@ class HM107ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "许可作业分析表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data, } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
 
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.IS_PUBLISH === 5 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/HM/HM109ShowPrint.js b/src/components/CustomPages/HM/HM109ShowPrint.js
index 6df4ea3..013a99d 100644
--- a/src/components/CustomPages/HM/HM109ShowPrint.js
+++ b/src/components/CustomPages/HM/HM109ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -77,7 +77,7 @@ class HM109ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
                 else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
             }
@@ -90,13 +90,22 @@ class HM109ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "关键任务分析表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data, } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
 
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.IS_PUBLISH === 5 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/HM/HM111ShowPrint.js b/src/components/CustomPages/HM/HM111ShowPrint.js
index 041a96c..161826c 100644
--- a/src/components/CustomPages/HM/HM111ShowPrint.js
+++ b/src/components/CustomPages/HM/HM111ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -77,7 +77,7 @@ class HM111ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
                 else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
             }
@@ -90,13 +90,22 @@ class HM111ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "一般任务分析表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data, } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
 
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.IS_PUBLISH === 5 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/HM/HM121ShowPrint.js b/src/components/CustomPages/HM/HM121ShowPrint.js
index e5637e6..810bd62 100644
--- a/src/components/CustomPages/HM/HM121ShowPrint.js
+++ b/src/components/CustomPages/HM/HM121ShowPrint.js
@@ -1,7 +1,7 @@
 import { Button, Descriptions, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
 import { connect } from 'dva';
-import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -41,13 +41,22 @@ class HM121ShowPrint extends React.Component {
                 if (this.props.data && this.props.data.loadDataDeal) {
                     this.props.data.loadDataDeal(1);
                 }
-                approveView(this, false);
+                this.onClickApprove(false);
                 if (ret) {
                     this.setState({ data: ret })
                 }
             }
         });
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     getChild = (data) => {
         const enums = this.props.app.enums;
         if (data.EVALUATE_TYPE === 2) {
@@ -265,7 +274,7 @@ class HM121ShowPrint extends React.Component {
         const content = ['', '职业危害辨识', '危险源与风险辨识'];
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SC/SC046ShowPrint.js b/src/components/CustomPages/SC/SC046ShowPrint.js
index a95c241..13717ed 100644
--- a/src/components/CustomPages/SC/SC046ShowPrint.js
+++ b/src/components/CustomPages/SC/SC046ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import stylesStep from '../HI/StepForm.css';
 import config from "../../../config";
@@ -78,7 +78,7 @@ class SC046ShowPrint extends React.Component {
                     } else {
                         that.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -96,13 +96,23 @@ class SC046ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "制度体系创建.xlsx")
     }
+
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         // let aaa = Math.random();
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button style={{ marginLeft: '8px', display: data && data.IS_PUBLISH === 5 ? "inline" : "none" }} type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SC/SC052ShowPrint.js b/src/components/CustomPages/SC/SC052ShowPrint.js
index dc738ce..74222f7 100644
--- a/src/components/CustomPages/SC/SC052ShowPrint.js
+++ b/src/components/CustomPages/SC/SC052ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import stylesStep from '../HI/StepForm.css';
 import config from "../../../config";
@@ -79,7 +79,7 @@ class SC052ShowPrint extends React.Component {
                     } else {
                         that.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -97,13 +97,23 @@ class SC052ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "制度体系创建.xlsx")
     }
+
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         // let aaa = Math.random();
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button style={{ marginLeft: '8px', display: data && data.IS_PUBLISH === 5 ? "inline" : "none" }} type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SE/SE009ShowPrint.js b/src/components/CustomPages/SE/SE009ShowPrint.js
index ed983f5..1cbc193 100644
--- a/src/components/CustomPages/SE/SE009ShowPrint.js
+++ b/src/components/CustomPages/SE/SE009ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter, extendOrder, approveView} from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter, extendOrder } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../../CustomPages/HI/StepForm.css';
 import XLSX from 'xlsx';
@@ -77,7 +77,7 @@ class SE009ShowPrint extends React.Component {
             onComplete: (ret) => {
                 if (ret) {
                     ret.Nav_DepTrainPlanDetail.sort((a, b) => { return a.MOON - b.MOON });
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     this.setState({ data: ret })
                 }
             }
@@ -99,6 +99,15 @@ class SE009ShowPrint extends React.Component {
         }
         return ret.join('、');
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     returnModel(level) {
         let str = '';
         if (level == undefined) {
@@ -122,7 +131,7 @@ class SE009ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'primary'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SE/SE011ShowPrint.js b/src/components/CustomPages/SE/SE011ShowPrint.js
index 2e1cd0e..7f07da5 100644
--- a/src/components/CustomPages/SE/SE011ShowPrint.js
+++ b/src/components/CustomPages/SE/SE011ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../../CustomPages/HI/StepForm.css';
 import XLSX from 'xlsx';
@@ -54,7 +54,7 @@ class SE011ShowPrint extends React.Component {
                     if (this.props.data && this.props.data.loadDataDeal) {
                         this.props.data.loadDataDeal(1);
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     ret.Nav_YearTrainPlanDetail.sort((a, b) => { return a.MOON - b.MOON });
                     if (ret.STATUS == 30 && this.props.data.tableKey == "1") {
                         this.setState({ confirmBtn: 'inline' })
@@ -93,6 +93,15 @@ class SE011ShowPrint extends React.Component {
         }
         return ret.join('、');
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     returnModel(level) {
         let str = '';
         if (level == undefined) {
@@ -133,7 +142,7 @@ class SE011ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'primary'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK002ShowPrint.js b/src/components/CustomPages/SK/SK002ShowPrint.js
index 1e303d8..d9e13ce 100644
--- a/src/components/CustomPages/SK/SK002ShowPrint.js
+++ b/src/components/CustomPages/SK/SK002ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions,Popconfirm, Row, Col, Form,Modal, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule,setDataFieldValue, guid, initQueryFilter, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule,setDataFieldValue, guid, initQueryFilter } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import stylesStep from '../HI/StepForm.css';
 import config from "../../../config";
@@ -140,7 +140,7 @@ class SK002ShowPrint extends React.Component {
                     }else{
                         that.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -247,7 +247,7 @@ class SK002ShowPrint extends React.Component {
             />
           </Modal>
             <div style={{ padding: '10px' }}>
-            {/* <Button onClick={() => approveView(this)} style={{ marginRight: '8px'}} icon="export">审批详情</Button> */}
+            {/* <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px'}} icon="export">审批详情</Button> */}
                 <ReactToPrint
                     trigger={() => <Button style={{ marginLeft: '8px', display: data && data.STATUS === 30?"inline":"none" }} type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK004ShowPrint.js b/src/components/CustomPages/SK/SK004ShowPrint.js
index 94f1371..22cada7 100644
--- a/src/components/CustomPages/SK/SK004ShowPrint.js
+++ b/src/components/CustomPages/SK/SK004ShowPrint.js
@@ -194,7 +194,7 @@ class SK004ShowPrint extends React.Component {
           } else {
             that.setState({ BtnAgreeDisplay: 'inline' })
           }
-          approveView(this, false);
+          this.onClickApprove(false);
           //归档才显示打印和导出按钮
           // if(ret.PRE_MEETING_STATUS==5){
           //     this.setState({ isFinished: 'inline' })
@@ -212,6 +212,15 @@ class SK004ShowPrint extends React.Component {
     XLSX.writeFile(wb, "双控企业库.xlsx")
   }
 
+  onClickApprove = (appVisible) => {
+    const newtmpData = {
+      data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+      formCode: "PF123",
+    }
+    this.setState({
+      tmpData: newtmpData,
+    });
+  }
   showModalContent = (item) => {
     this.setState({
       showDetailContent: true,
@@ -302,7 +311,7 @@ class SK004ShowPrint extends React.Component {
         />
       </Modal>
       <div style={{ padding: '10px' }}>
-        {/* <Button onClick={() => approveView(this)} style={{ marginRight: '8px'}} icon="export">审批详情</Button> */}
+        {/* <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px'}} icon="export">审批详情</Button> */}
         <ReactToPrint
           trigger={() => <Button style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }} type={'default'} icon={'printer'} >打印</Button>}
           content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK006ShowPrint.js b/src/components/CustomPages/SK/SK006ShowPrint.js
index d0b24ad..5761f1f 100644
--- a/src/components/CustomPages/SK/SK006ShowPrint.js
+++ b/src/components/CustomPages/SK/SK006ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -78,7 +78,7 @@ class SK006ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -115,7 +115,7 @@ class SK006ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -128,12 +128,21 @@ class SK006ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "安全检查通知.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK010ShowPrint.js b/src/components/CustomPages/SK/SK010ShowPrint.js
index ee19578..397a080 100644
--- a/src/components/CustomPages/SK/SK010ShowPrint.js
+++ b/src/components/CustomPages/SK/SK010ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -90,7 +90,7 @@ class SK010ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -103,13 +103,21 @@ class SK010ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "安全检查记录.xlsx")
     }
-
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK012ShowPrint.js b/src/components/CustomPages/SK/SK012ShowPrint.js
index 76a1de7..f861514 100644
--- a/src/components/CustomPages/SK/SK012ShowPrint.js
+++ b/src/components/CustomPages/SK/SK012ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, showUserSign, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, showUserSign } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -109,7 +109,7 @@ class SK012ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -122,12 +122,21 @@ class SK012ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "安全检查记录汇总表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK014ShowPrint.js b/src/components/CustomPages/SK/SK014ShowPrint.js
index 1ba88fa..fa3a205 100644
--- a/src/components/CustomPages/SK/SK014ShowPrint.js
+++ b/src/components/CustomPages/SK/SK014ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, showUserSign, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, showUserSign } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -90,7 +90,7 @@ class SK014ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -103,12 +103,21 @@ class SK014ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "隐患上报表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK016ShowPrint.js b/src/components/CustomPages/SK/SK016ShowPrint.js
index 1c4b328..7ce2574 100644
--- a/src/components/CustomPages/SK/SK016ShowPrint.js
+++ b/src/components/CustomPages/SK/SK016ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel,approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -71,7 +71,7 @@ class SK016ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -84,6 +84,15 @@ class SK016ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "手动隐患上报表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
diff --git a/src/components/CustomPages/SK/SK018ShowPrint.js b/src/components/CustomPages/SK/SK018ShowPrint.js
index 0c376a6..64bb8a6 100644
--- a/src/components/CustomPages/SK/SK018ShowPrint.js
+++ b/src/components/CustomPages/SK/SK018ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, showUserSign, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -102,7 +102,7 @@ class SK018ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -115,12 +115,21 @@ class SK018ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "隐患确认单.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK020ShowPrint.js b/src/components/CustomPages/SK/SK020ShowPrint.js
index f0a80df..65ada03 100644
--- a/src/components/CustomPages/SK/SK020ShowPrint.js
+++ b/src/components/CustomPages/SK/SK020ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -90,7 +90,7 @@ class SK020ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -103,12 +103,21 @@ class SK020ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "隐患整改通知表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js
index 6e74c2e..e9db354 100644
--- a/src/components/CustomPages/SK/SK022ShowPrint.js
+++ b/src/components/CustomPages/SK/SK022ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, showUserSign, showFileImg, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, showUserSign, showFileImg, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -91,7 +91,7 @@ class SK022ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -104,12 +104,21 @@ class SK022ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "隐患整改记录.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK024ShowPrint.js b/src/components/CustomPages/SK/SK024ShowPrint.js
index f9c3ed9..c07bc4e 100644
--- a/src/components/CustomPages/SK/SK024ShowPrint.js
+++ b/src/components/CustomPages/SK/SK024ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -83,7 +83,7 @@ class SK024ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -96,12 +96,21 @@ class SK024ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "延期整改申请.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK026ShowPrint.js b/src/components/CustomPages/SK/SK026ShowPrint.js
index dc7c2f1..a9fa8da 100644
--- a/src/components/CustomPages/SK/SK026ShowPrint.js
+++ b/src/components/CustomPages/SK/SK026ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import stylesStep from '../HI/StepForm.css';
 import config from "../../../config";
@@ -267,7 +267,7 @@ class SK026ShowPrint extends React.Component {
           } else {
             that.setState({ BtnAgreeDisplay: 'inline' })
           }
-          approveView(this, false);
+          this.onClickApprove(false);
           //归档才显示打印和导出按钮
           // if(ret.PRE_MEETING_STATUS==5){
           //     this.setState({ isFinished: 'inline' })
@@ -286,7 +286,15 @@ class SK026ShowPrint extends React.Component {
     XLSX.writeFile(wb, "风险检查关联表.xlsx")
   }
 
-  
+  onClickApprove = (appVisible) => {
+    const newtmpData = {
+      data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+      formCode: "PF123",
+    }
+    this.setState({
+      tmpData: newtmpData,
+    });
+  }
   showModalMeasure = (item) => {
     this.setState({
       showDetailMeasure: true,
@@ -435,7 +443,7 @@ class SK026ShowPrint extends React.Component {
         />
       </Modal>
       <div style={{ padding: '10px' }}>
-        <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+        <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
         <ReactToPrint
           trigger={() => <Button style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }} type={'default'} icon={'printer'} >打印</Button>}
           content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK027ShowPrint.js b/src/components/CustomPages/SK/SK027ShowPrint.js
index f4ebd38..06bfb32 100644
--- a/src/components/CustomPages/SK/SK027ShowPrint.js
+++ b/src/components/CustomPages/SK/SK027ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Modal, Popconfirm, Row, Col, Form, Input, Select } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -76,7 +76,7 @@ class SK027ShowPrint extends React.Component {
           } else {
             this.setState({ BtnAgreeDisplay: 'inline' })
           }
-          approveView(this, false);
+          this.onClickApprove(false);
         }
 
       }
@@ -89,6 +89,15 @@ class SK027ShowPrint extends React.Component {
     const wb = XLSX.utils.table_to_book(Table);
     XLSX.writeFile(wb, "安全检查汇总表.xlsx")
   }
+  onClickApprove = (appVisible) => {
+    const newtmpData = {
+      data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+      formCode: "PF123",
+    }
+    this.setState({
+      tmpData: newtmpData,
+    });
+  }
   showModalContent = (item, formCode) => {
     const newtmpData = {
       data: {
@@ -152,7 +161,7 @@ class SK027ShowPrint extends React.Component {
       </div>
 
       <div style={{ padding: '10px' }}>
-        <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+        <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
         <ReactToPrint
           trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
           content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK031ShowPrint.js b/src/components/CustomPages/SK/SK031ShowPrint.js
index 65054a5..cb03c8d 100644
--- a/src/components/CustomPages/SK/SK031ShowPrint.js
+++ b/src/components/CustomPages/SK/SK031ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -67,7 +67,7 @@ class SK031ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -80,12 +80,21 @@ class SK031ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "安全风险辨识与评估计划.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK035CheckLibrary.js b/src/components/CustomPages/SK/SK035CheckLibrary.js
index 3d38420..6e90d3b 100644
--- a/src/components/CustomPages/SK/SK035CheckLibrary.js
+++ b/src/components/CustomPages/SK/SK035CheckLibrary.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import stylesStep from '../HI/StepForm.css';
 import config from "../../../config";
@@ -197,7 +197,7 @@ class SK035CheckLibrary extends React.Component {
                 } else {
                   that.setState({ BtnAgreeDisplay: 'inline' })
                 }
-                approveView(this, false);
+                this.onClickApprove(false);
                 //归档才显示打印和导出按钮
                 // if(ret.PRE_MEETING_STATUS==5){
                 //     this.setState({ isFinished: 'inline' })
@@ -220,6 +220,15 @@ class SK035CheckLibrary extends React.Component {
     XLSX.writeFile(wb, "双控企业库.xlsx")
   }
 
+  onClickApprove = (appVisible) => {
+    const newtmpData = {
+      data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+      formCode: "PF123",
+    }
+    this.setState({
+      tmpData: newtmpData,
+    });
+  }
   showModalContent = (item) => {
     this.setState({
       showDetailContent: true,
@@ -310,7 +319,7 @@ class SK035CheckLibrary extends React.Component {
         />
       </Modal>
       <div style={{ padding: '10px' }}>
-        {/* <Button onClick={() => approveView(this)} style={{ marginRight: '8px'}} icon="export">审批详情</Button> */}
+        {/* <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px'}} icon="export">审批详情</Button> */}
         <ReactToPrint
           trigger={() => <Button style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }} type={'default'} icon={'printer'} >打印</Button>}
           content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK035ShowPrint.js b/src/components/CustomPages/SK/SK035ShowPrint.js
index 6142533..2ad4f2d 100644
--- a/src/components/CustomPages/SK/SK035ShowPrint.js
+++ b/src/components/CustomPages/SK/SK035ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -71,7 +71,7 @@ class SK035ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -84,13 +84,21 @@ class SK035ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "安全风险辨识结果表.xlsx")
     }
-    
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK037ShowPrint.js b/src/components/CustomPages/SK/SK037ShowPrint.js
index 828624b..431f242 100644
--- a/src/components/CustomPages/SK/SK037ShowPrint.js
+++ b/src/components/CustomPages/SK/SK037ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -72,7 +72,7 @@ class SK037ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -85,12 +85,21 @@ class SK037ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "安全风险辨识结果汇总表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK039ShowPrint.js b/src/components/CustomPages/SK/SK039ShowPrint.js
index 397afb0..4f06c63 100644
--- a/src/components/CustomPages/SK/SK039ShowPrint.js
+++ b/src/components/CustomPages/SK/SK039ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -72,7 +72,7 @@ class SK039ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -85,12 +85,21 @@ class SK039ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "安全风险评估表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK041ShowPrint.js b/src/components/CustomPages/SK/SK041ShowPrint.js
index f3e053a..8b4bcd1 100644
--- a/src/components/CustomPages/SK/SK041ShowPrint.js
+++ b/src/components/CustomPages/SK/SK041ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -72,7 +72,7 @@ class SK041ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -85,12 +85,21 @@ class SK041ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "安全风险评估汇总表.xlsx")
     }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK043ShowPrint.js b/src/components/CustomPages/SK/SK043ShowPrint.js
index 3cea06a..3ba2bd3 100644
--- a/src/components/CustomPages/SK/SK043ShowPrint.js
+++ b/src/components/CustomPages/SK/SK043ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import stylesStep from '../HI/StepForm.css';
 import config from "../../../config";
@@ -61,7 +61,7 @@ class SK043ShowPrint extends React.Component {
                     } else {
                         that.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -80,6 +80,15 @@ class SK043ShowPrint extends React.Component {
         XLSX.writeFile(wb, "双控基础库.xlsx")
     }
 
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
@@ -87,7 +96,7 @@ class SK043ShowPrint extends React.Component {
         return <div>
 
             <div style={{ padding: '10px' }}>
-                {/* <Button onClick={() => approveView(this)} style={{ marginRight: '8px'}} icon="export">审批详情</Button> */}
+                {/* <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px'}} icon="export">审批详情</Button> */}
                 <ReactToPrint
                     trigger={() => <Button style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }} type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK045ShowPrint.js b/src/components/CustomPages/SK/SK045ShowPrint.js
index 0ea7bcb..e1d1de0 100644
--- a/src/components/CustomPages/SK/SK045ShowPrint.js
+++ b/src/components/CustomPages/SK/SK045ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Modal, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import stylesStep from '../HI/StepForm.css';
 import config from "../../../config";
@@ -65,7 +65,7 @@ class SK045ShowPrint extends React.Component {
                     } else {
                         that.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -84,6 +84,15 @@ class SK045ShowPrint extends React.Component {
         XLSX.writeFile(wb, "双控企业库.xlsx")
     }
 
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
@@ -91,7 +100,7 @@ class SK045ShowPrint extends React.Component {
         return <div>
 
             <div style={{ padding: '10px' }}>
-                {/* <Button onClick={() => approveView(this)} style={{ marginRight: '8px'}} icon="export">审批详情</Button> */}
+                {/* <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px'}} icon="export">审批详情</Button> */}
                 <ReactToPrint
                     trigger={() => <Button style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }} type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK080ShowPrint.js b/src/components/CustomPages/SK/SK080ShowPrint.js
index 96cc4a9..b34e5c4 100644
--- a/src/components/CustomPages/SK/SK080ShowPrint.js
+++ b/src/components/CustomPages/SK/SK080ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, showUserSign, showFileImg, GetFileModel, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, showUserSign, showFileImg, GetFileModel } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -38,7 +38,7 @@ class SK080ShowPrint extends React.Component {
         if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
             this.props.data.onCancel();
     }
-
+  
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
         json.Parameter22 = this.props.data.ORG_ID_HV;
@@ -59,7 +59,7 @@ class SK080ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    approveView(this, false);
+                    this.onClickApprove(false);
                 }
 
             }
@@ -72,21 +72,21 @@ class SK080ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "重大事故隐患治理销号表.xlsx")
     }
-    // onClickApprove = (appVisible) => {
-    //     const newtmpData = {
-    //         data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
-    //         formCode: "PF123",
-    //     }
-    //     this.setState({
-    //         tmpData: newtmpData,
-    //     });
-    // }
+    onClickApprove = (appVisible) => {
+        const newtmpData = {
+            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+            formCode: "PF123",
+        }
+        this.setState({
+            tmpData: newtmpData,
+        });
+    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'default'} icon={'printer'} style={{ marginLeft: '8px', display: data && data.STATUS === 30 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
@@ -104,20 +104,20 @@ class SK080ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起时间">{moment(data.CREATE_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="整改记录单编号">{data.Nav_RectifyRecord ? data.Nav_RectifyRecord?.CODE : ''}</Descriptions.Item>
-                                <Descriptions.Item label="生产单元">{data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_ProductionUnit ? data.Nav_RectifyRecord.Nav_ProductionUnit.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="检查区域">{data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RiskArea ? data.Nav_RectifyRecord.Nav_RiskArea.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="隐患地点">{data.Nav_RectifyRecord ? data.Nav_RectifyRecord.HIDDEN_PLACE : ''}</Descriptions.Item>
+                                <Descriptions.Item label="整改记录单编号">{data.Nav_RectifyRecord?data.Nav_RectifyRecord?.CODE:''}</Descriptions.Item>
+                                <Descriptions.Item label="生产单元">{data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_ProductionUnit?data.Nav_RectifyRecord.Nav_ProductionUnit.NAME:''}</Descriptions.Item>
+                                <Descriptions.Item label="检查区域">{data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RiskArea?data.Nav_RectifyRecord.Nav_RiskArea.NAME:''}</Descriptions.Item>
+                                <Descriptions.Item label="隐患地点">{data.Nav_RectifyRecord?data.Nav_RectifyRecord.HIDDEN_PLACE:''}</Descriptions.Item>
                                 <Descriptions.Item label="整改前照片">{
-                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotoas ? data.Nav_RectifyRecord.Nav_RectifyPhotoas : null, config.picServerHost, this)
+                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotoas ? data.Nav_RectifyRecord.Nav_RectifyPhotoas:null, config.picServerHost, this)
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="整改前照片">{
-                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotobs ? data.Nav_RectifyRecord.Nav_RectifyPhotobs : null, config.picServerHost, this)
+                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotobs ? data.Nav_RectifyRecord.Nav_RectifyPhotobs:null, config.picServerHost, this)
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="重大事故隐患名称">{data.HIDDEN_DESCRIPTION}</Descriptions.Item>
                                 <Descriptions.Item label="重大事故隐患形成原因分析">{data.HIDDEN_REASON}</Descriptions.Item>
                                 <Descriptions.Item label="实地复查负责人">{data.Nav_ChargeUser ? data.Nav_ChargeUser.NAME : ''}</Descriptions.Item>
-
+                              
                                 <Descriptions.Item label="复查人员">{
                                     data?.Nav_Users && data?.Nav_Users.map((item2, i) => {