diff --git a/src/components/CustomPages/FM/FM202ShowPrint.js b/src/components/CustomPages/FM/FM202ShowPrint.js
index eecf52d..43ce53b 100644
--- a/src/components/CustomPages/FM/FM202ShowPrint.js
+++ b/src/components/CustomPages/FM/FM202ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Modal, Row, Col, Form, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, GetFileModel, showFiles } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, GetFileModel, showFiles, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import stylesStep from '../HI/StepForm.css';
 import config from "../../../config";
@@ -75,7 +75,7 @@ class FM202ShowPrint extends React.Component {
                     } else {
                         that.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -92,16 +92,7 @@ class FM202ShowPrint 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/FO/FO017ShowPrint.js b/src/components/CustomPages/FO/FO017ShowPrint.js
index d07d7de..9a4573f 100644
--- a/src/components/CustomPages/FO/FO017ShowPrint.js
+++ b/src/components/CustomPages/FO/FO017ShowPrint.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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -81,7 +81,8 @@ class FO017ShowPrint extends React.Component {
                     } else {
                         that.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    // approveView(this, 'inline', false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -94,21 +95,22 @@ class FO017ShowPrint 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                {/* <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button> */}
+                <Button onClick={() => approveView(this)} 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/FO017ShowPrintJD.js b/src/components/CustomPages/FO/FO017ShowPrintJD.js
index ffd64c8..75b2176 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
             }
         });
@@ -92,21 +92,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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/FO025ShowPrint.js b/src/components/CustomPages/FO/FO025ShowPrint.js
index 7d9c017..7780daf 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -94,21 +94,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 54ae6bc..e036e3e 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 React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -78,21 +78,12 @@ class FO043ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', 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];
@@ -105,7 +96,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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 8525822..08ebaa5 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -78,21 +78,12 @@ class FO045ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', 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];
@@ -105,7 +96,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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 a7287fa..b854dba 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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);
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     if (ret.STATUS >= 4) {
                         this.state.isFinished = "inline";
                     }
@@ -166,15 +166,7 @@ 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) {
@@ -217,7 +209,7 @@ class HM042ShowPrint extends React.Component {
         return <div>
             <div style={{ padding: '10px' }}>
 
-                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 ca00813..5a968bb 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendOrder, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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);
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', 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,15 +127,6 @@ 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();
@@ -144,7 +135,7 @@ class HM061ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 688276b..5639587 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -51,15 +51,6 @@ 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();
@@ -109,7 +100,7 @@ class HM063ShowPrint extends React.Component {
                         this.props.data.loadDataDeal(1);
                     }
                     // this.state.areas = this.removeDuplicateArea(ret.Nav_Details);
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     // let index = ret.Nav_Users.findIndex((item) =>
                     //     item.USER_ID == this.props.login.userId
                     // );
@@ -175,7 +166,7 @@ class HM063ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 a51ca2a..fb726fe 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
             }
         });
@@ -87,21 +87,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 216a407..d359ca6 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -51,15 +51,6 @@ 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();
@@ -91,7 +82,7 @@ class HM099ShowPrint extends React.Component {
                     if (this.props.data && this.props.data.loadDataDeal) {
                         this.props.data.loadDataDeal(1);
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     // let index = ret.Nav_Users.findIndex((item) =>
                     //     item.USER_ID == this.props.login.userId
                     // );
@@ -143,7 +134,7 @@ class HM099ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 f85cba9..d58afbb 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendOrder, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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);
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     this.setState({ data: ret });
                     this.props.dispatch({
                         type: 'app/getDataByPost',
@@ -99,15 +99,6 @@ 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();
@@ -116,7 +107,7 @@ class HM101ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 f695360..6f25a76 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -96,22 +96,13 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 ee06d99..3904fec 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
                 else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
             }
@@ -90,22 +90,13 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 013a99d..38f6e00 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
                 else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
             }
@@ -90,22 +90,13 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 161826c..26adb02 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
                 else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); }
             }
@@ -90,22 +90,13 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 810bd62..07dea8c 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -41,22 +41,13 @@ class HM121ShowPrint extends React.Component {
                 if (this.props.data && this.props.data.loadDataDeal) {
                     this.props.data.loadDataDeal(1);
                 }
-                this.onClickApprove(false);
+                approveView(this, 'inline', 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) {
@@ -274,7 +265,7 @@ class HM121ShowPrint extends React.Component {
         const content = ['', '职业危害辨识', '危险源与风险辨识'];
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 13717ed..8dd0d50 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -97,22 +97,13 @@ class SC046ShowPrint 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 74222f7..8831a57 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -98,22 +98,13 @@ class SC052ShowPrint 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 1cbc193..baa731d 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter, extendOrder, approveView } 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 });
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     this.setState({ data: ret })
                 }
             }
@@ -99,15 +99,6 @@ 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) {
@@ -131,7 +122,7 @@ class SE009ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 7f07da5..97aec95 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, approveView } 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);
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', 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,15 +93,6 @@ 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) {
@@ -142,7 +133,7 @@ class SE011ShowPrint extends React.Component {
         const { data } = this.state;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => this.onClickApprove(true)} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} icon="export">审批详情</Button>
                 <ReactToPrint
                     trigger={() => <Button type={'primary'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SE/SE071ShowPrint.js b/src/components/CustomPages/SE/SE071ShowPrint.js
index 361339a..f9b41aa 100644
--- a/src/components/CustomPages/SE/SE071ShowPrint.js
+++ b/src/components/CustomPages/SE/SE071ShowPrint.js
@@ -55,7 +55,7 @@ class SE071ShowPrint extends React.Component {
         extendInclude(json, 'Nav_ListPlanDetail.Nav_ListDetailDepartment.Nav_Department')
         extendInclude(json, 'Nav_ListPlanDetail.Nav_TrainTypeEnum')
         extendInclude(json, 'Nav_ListPlanDetail.Nav_ApproveRole')
-        extendInclude(json, "Nav_Approve.Nav_ApproveDetails.Nav_ApproveUser");
+        // extendInclude(json, "Nav_Approve.Nav_ApproveDetails.Nav_ApproveUser");
         this.props.dispatch({
             type: 'app/getDataByPost',
             payload: json,
@@ -66,6 +66,7 @@ class SE071ShowPrint extends React.Component {
                         data: ret,
                     })
                 }
+                approveView(this, 'inline', false);
             }
         });
     }
@@ -82,7 +83,6 @@ class SE071ShowPrint extends React.Component {
                     </tr>
                 </table>
             </div>
-            <FormPage {...this.state.tmpData} />
             <div ref={el => (this.componentRef = el)} style={{ padding: '20px', paddingTop: '20px' }} id={'tableId' + this.props.data.id}>
                 <h1 className={styles.showPrintHead}>年度培训计划</h1>
                 {
@@ -155,20 +155,22 @@ class SE071ShowPrint extends React.Component {
                                     </tr>
                                 })}
 
-
-                                <tr>
-                                    <td>审批详情</td> {/* 审核意见 如果已经审批 显示审批信息 */}
+                                {/* 审核意见 如果已经审批 显示审批信息 */}
+                                {/* <tr>
+                                    <td>审批详情</td> 
                                     <td colSpan={11} style={{ textAlign: "left" }}>
                                         {
                                             showApprove(data.Nav_Approve?.Nav_ApproveDetails, enums.NodeApproveStatus.enums, config.picServerHost, 200)
                                         }
                                     </td>
-                                </tr>
+                                </tr> */}
 
                             </tbody>
                         </table>
                         : null
                 }
+
+                <FormPage {...this.state.tmpData} />
             </div>
             {
                 GetFileModel(Modal, FormPage, this, this.state.fileForm.visible)
diff --git a/src/components/CustomPages/SK/SK002ShowPrint.js b/src/components/CustomPages/SK/SK002ShowPrint.js
index d9e13ce..d5882d0 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule,setDataFieldValue, guid, initQueryFilter, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
diff --git a/src/components/CustomPages/SK/SK004ShowPrint.js b/src/components/CustomPages/SK/SK004ShowPrint.js
index 22cada7..f6c8821 100644
--- a/src/components/CustomPages/SK/SK004ShowPrint.js
+++ b/src/components/CustomPages/SK/SK004ShowPrint.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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import stylesStep from '../HI/StepForm.css';
 import config from "../../../config";
@@ -194,7 +194,7 @@ class SK004ShowPrint extends React.Component {
           } else {
             that.setState({ BtnAgreeDisplay: 'inline' })
           }
-          this.onClickApprove(false);
+          approveView(this, 'inline', false);
           //归档才显示打印和导出按钮
           // if(ret.PRE_MEETING_STATUS==5){
           //     this.setState({ isFinished: 'inline' })
@@ -212,15 +212,6 @@ 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,
diff --git a/src/components/CustomPages/SK/SK006ShowPrint.js b/src/components/CustomPages/SK/SK006ShowPrint.js
index 5761f1f..9d7ace2 100644
--- a/src/components/CustomPages/SK/SK006ShowPrint.js
+++ b/src/components/CustomPages/SK/SK006ShowPrint.js
@@ -78,7 +78,7 @@ class SK006ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -115,7 +115,7 @@ class SK006ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -128,21 +128,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 397a080..91e4ca8 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -103,21 +103,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 f861514..8f5dcb6 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, showUserSign, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -122,21 +122,14 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)
+                    
+                } 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 fa3a205..abc2ba8 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, showUserSign, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -103,21 +103,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 7ce2574..0d5cc30 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -84,15 +84,6 @@ 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 64bb8a6..bc1995d 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -115,21 +115,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 65ada03..4368e10 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -103,21 +103,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 e9db354..2dbd29b 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, showUserSign, showFileImg, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -104,21 +104,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 c07bc4e..3753f0d 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -96,21 +96,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() =>approveView(this)} 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 a9fa8da..c9650ad 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
           }
-          this.onClickApprove(false);
+          approveView(this, 'inline', false);
           //归档才显示打印和导出按钮
           // if(ret.PRE_MEETING_STATUS==5){
           //     this.setState({ isFinished: 'inline' })
@@ -286,15 +286,6 @@ 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,
@@ -443,7 +434,7 @@ class SK026ShowPrint extends React.Component {
         />
       </Modal>
       <div style={{ padding: '10px' }}>
-        <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+        <Button onClick={() => approveView(this)} 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 06bfb32..8fa4493 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
           }
-          this.onClickApprove(false);
+          approveView(this, 'inline', false);
         }
 
       }
@@ -89,15 +89,6 @@ 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: {
@@ -161,7 +152,7 @@ class SK027ShowPrint extends React.Component {
       </div>
 
       <div style={{ padding: '10px' }}>
-        <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+        <Button onClick={() => approveView(this)} 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 cb03c8d..82ee5d6 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -80,21 +80,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 6e90d3b..6c7ff85 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, approveView } 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' })
                 }
-                this.onClickApprove(false);
+                approveView(this, 'inline', false);
                 //归档才显示打印和导出按钮
                 // if(ret.PRE_MEETING_STATUS==5){
                 //     this.setState({ isFinished: 'inline' })
@@ -220,15 +220,6 @@ 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,
diff --git a/src/components/CustomPages/SK/SK035ShowPrint.js b/src/components/CustomPages/SK/SK035ShowPrint.js
index 2ad4f2d..798638a 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -84,21 +84,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 431f242..efc41a6 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -85,21 +85,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 4f06c63..46eecd8 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -85,21 +85,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 8b4bcd1..c5314e0 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -85,21 +85,12 @@ 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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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 3ba2bd3..ef236cd 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -80,15 +80,6 @@ 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;
diff --git a/src/components/CustomPages/SK/SK045ShowPrint.js b/src/components/CustomPages/SK/SK045ShowPrint.js
index e1d1de0..6204b63 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, approveView } 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' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -84,15 +84,6 @@ 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;
diff --git a/src/components/CustomPages/SK/SK080ShowPrint.js b/src/components/CustomPages/SK/SK080ShowPrint.js
index b34e5c4..b258520 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 } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, showUserSign, showFileImg, GetFileModel, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -59,7 +59,7 @@ class SK080ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 'inline', false);
                 }
 
             }
@@ -72,21 +72,12 @@ 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,
-        });
-    }
     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={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button>
+                <Button onClick={() => approveView(this)} 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/utils/common.js b/src/utils/common.js
index d52a25d..a6f3d1d 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -1972,12 +1972,15 @@ export function getArryPropShow(arry, propPath) {
 }
 
 /****** 审批查看公共能方法 ******/
-export function approveView(that, appVisible) {
+export function approveView(that, BtnAgreeDisplay, appVisible) {
   if (appVisible == null || appVisible == undefined) {
     appVisible = true
   }
+  if (BtnAgreeDisplay == null || BtnAgreeDisplay == undefined) {
+    BtnAgreeDisplay = 'inline'//inline  none
+  }
   const newtmpData = {
-    data: { id: that.props.data.id, isShow: true, key: guid(), param: that.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'none', ORG_ID_HV: that.props.data.ORG_ID_HV },
+    data: { id: that.props.data.id, isShow: true, key: guid(), param: that.props.data.param, appVisible: appVisible, BtnAgreeDisplay: BtnAgreeDisplay, ORG_ID_HV: that.props.data.ORG_ID_HV },
     formCode: 'PF123',
   }
   that.setState({