From ed46f845d59276a60f20154f1be65d803932ef49 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Wed, 13 May 2026 17:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=9F=A5=E7=9C=8B=20?=
 =?UTF-8?q?=E6=95=B4=E4=B8=AA=E7=B3=BB=E7=BB=9F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomPages/FM/FM202ShowPrint.js          | 15 ++-----
 .../CustomPages/FO/FO015ShowPrint.js          | 13 +-----
 .../CustomPages/FO/FO017ShowPrint.js          | 15 ++-----
 .../CustomPages/FO/FO017ShowPrintJD.js        | 17 ++------
 .../CustomPages/FO/FO025ShowPrint.js          | 15 ++-----
 .../CustomPages/FO/FO043ShowPrint.js          | 17 ++------
 .../CustomPages/FO/FO045ShowPrint.js          | 15 ++-----
 .../CustomPages/HM/HM042ShowPrint.js          | 15 ++-----
 .../CustomPages/HM/HM061ShowPrint.js          | 15 ++-----
 .../CustomPages/HM/HM063ShowPrint.js          | 15 ++-----
 .../CustomPages/HM/HM087ShowPrint.js          | 15 ++-----
 .../CustomPages/HM/HM099ShowPrint.js          | 15 ++-----
 .../CustomPages/HM/HM101ShowPrint.js          | 15 ++-----
 .../CustomPages/HM/HM104ShowPrint.js          | 15 ++-----
 .../CustomPages/HM/HM107ShowPrint.js          | 15 ++-----
 .../CustomPages/HM/HM109ShowPrint.js          | 15 ++-----
 .../CustomPages/HM/HM111ShowPrint.js          | 15 ++-----
 .../CustomPages/HM/HM121ShowPrint.js          | 15 ++-----
 .../CustomPages/PF/PF147ShowPrint.js          | 14 +------
 .../CustomPages/SC/SC030ShowPrint.js          | 13 +-----
 .../CustomPages/SC/SC030ShowPrintPer.js       | 14 +------
 .../CustomPages/SC/SC030ShowPrintView.js      | 13 +-----
 .../CustomPages/SC/SC030View copy.js          | 13 +-----
 src/components/CustomPages/SC/SC030View.js    | 13 +-----
 .../CustomPages/SC/SC046ShowPrint.js          | 16 ++------
 .../CustomPages/SC/SC052ShowPrint.js          | 16 ++------
 .../CustomPages/SE/SE009ShowPrint.js          |  2 +-
 .../CustomPages/SK/SK002ShowPrint.js          |  6 +--
 .../CustomPages/SK/SK002ShowSummary.js        |  4 +-
 .../CustomPages/SK/SK004ShowPrint.js          | 13 +-----
 .../CustomPages/SK/SK004ShowSummary.js        |  4 +-
 .../CustomPages/SK/SK006ShowPrint.js          | 17 ++------
 .../CustomPages/SK/SK010ShowPrint.js          | 16 ++------
 .../CustomPages/SK/SK012ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK014ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK016ShowPrint.js          | 13 +-----
 .../CustomPages/SK/SK018ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK020ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK022ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK024ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK026ShowPrint.js          | 16 ++------
 .../CustomPages/SK/SK027ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK031ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK033ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK035CheckLibrary.js       | 15 ++-----
 .../CustomPages/SK/SK035ShowPrint.js          | 16 ++------
 .../CustomPages/SK/SK037ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK039ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK041ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK043ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK045ShowPrint.js          | 15 ++-----
 .../CustomPages/SK/SK080ShowPrint.js          | 40 +++++++++----------
 src/utils/customConfig1.js                    |  2 +
 53 files changed, 168 insertions(+), 590 deletions(-)

diff --git a/src/components/CustomPages/FM/FM202ShowPrint.js b/src/components/CustomPages/FM/FM202ShowPrint.js
index eecf52d..7635ec3 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, false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -93,22 +93,13 @@ class FM202ShowPrint 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/FO/FO015ShowPrint.js b/src/components/CustomPages/FO/FO015ShowPrint.js
index 5806930..80a359c 100644
--- a/src/components/CustomPages/FO/FO015ShowPrint.js
+++ b/src/components/CustomPages/FO/FO015ShowPrint.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, setDataFieldValue, extendIgnoreDataRule, guid, showFiles, GetFileModel } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, extendIgnoreDataRule, guid, showFiles, GetFileModel, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../HI/StepForm.css';
 import config from "../../../config";
@@ -105,20 +105,11 @@ class FO015ShowPrint 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;
         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'} tyle={{ marginLeft: '8px', display: data && data.FORM_STATUS === 2 ? "inline" : "none" }}>打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/FO/FO017ShowPrint.js b/src/components/CustomPages/FO/FO017ShowPrint.js
index d07d7de..bea29c8 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,7 @@ class FO017ShowPrint extends React.Component {
                     } else {
                         that.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, false);
                 }
 
             }
@@ -94,21 +94,12 @@ 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,
-        });
-    }
     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/FO017ShowPrintJD.js b/src/components/CustomPages/FO/FO017ShowPrintJD.js
index ffd64c8..eeff171 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, 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}
@@ -174,7 +165,7 @@ class FO017ShowPrintJD extends React.Component {
                                 </tr>
                                 <tr>
                                     <td colSpan={2} rowSpan={1} className={styles.fontBold}>安全措施确认</td>
-                                    <td colSpan={8} rowSpan={1}>{ showFiles(data?.Nav_Files, config.picServerHost, this)}</td>
+                                    <td colSpan={8} rowSpan={1}>{showFiles(data?.Nav_Files, config.picServerHost, this)}</td>
                                 </tr>
                             </tbody>
                         </table> : null
diff --git a/src/components/CustomPages/FO/FO025ShowPrint.js b/src/components/CustomPages/FO/FO025ShowPrint.js
index 7d9c017..d489781 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, 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..e7c2b41 100644
--- a/src/components/CustomPages/FO/FO043ShowPrint.js
+++ b/src/components/CustomPages/FO/FO043ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
-import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select,Modal, Table } from 'antd';
+import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign } 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, 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..bfa3d89 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, 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..90fcfdd 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, false);
                     if (ret.STATUS >= 4) {
                         this.state.isFinished = "inline";
                     }
@@ -166,15 +166,6 @@ 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 +208,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..f9c6d02 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, 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..be18e97 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, 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..30dbe59 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, 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..cc4cc39 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, 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..11f81ee 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, 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..ea8e22e 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, 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..aca8a0a 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, 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..6df4ea3 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, 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..041a96c 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, 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..e5637e6 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, 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/PF/PF147ShowPrint.js b/src/components/CustomPages/PF/PF147ShowPrint.js
index 642e31d..e8eac18 100644
--- a/src/components/CustomPages/PF/PF147ShowPrint.js
+++ b/src/components/CustomPages/PF/PF147ShowPrint.js
@@ -1,6 +1,6 @@
 import { Button, Descriptions, Modal, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendIgnoreDataRule, extendInclude, GetFileModel, showApprove, guid, showFiles } from "../../../utils/common";
+import { initFilter, extendRule, extendIgnoreDataRule, extendInclude, GetFileModel, showApprove, guid, showFiles, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import { ExportToExcel } from '@woowalker/feui'
 import XLSX from 'xlsx';
@@ -72,16 +72,6 @@ class PF147ShowPrint 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(), PARAM2: this.props.data.PARAM2, appVisible: appVisible, BtnAgreeDisplay: 'none' },
-            formCode: "PF123",
-        }
-        this.setState({
-            tmpData: newtmpData,
-        });
-    }
     render() {
         const { data } = this.state;
 
@@ -248,7 +238,7 @@ class PF147ShowPrint extends React.Component {
                 <table>
                     <tbody>
                         <tr>
-                            {/* <Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button> */}
+                            {/* <Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button> */}
                             <td><ReactToPrint trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>} content={() => this.componentRef} pageStyle={"#tableId" + this.props.data.id + " { padding:0 40px;} img{width :120px}"} /></td>
                             <td><ExportToExcel fileName='视频表' tableId={'tableId' + this.props.data.id} /></td>
                         </tr>
diff --git a/src/components/CustomPages/SC/SC030ShowPrint.js b/src/components/CustomPages/SC/SC030ShowPrint.js
index 4ac4a96..20e0d6a 100644
--- a/src/components/CustomPages/SC/SC030ShowPrint.js
+++ b/src/components/CustomPages/SC/SC030ShowPrint.js
@@ -1,7 +1,7 @@
 import { Checkbox, message, Radio } from "antd/lib/index";
 import { Button, Descriptions, Modal, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, showApprove, GetFileModel, showUsersSign } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, showApprove, GetFileModel, showUsersSign, approveView } from "../../../utils/common";
 import { ExportToExcel } from '@woowalker/feui'
 import styles from '../HI/StepForm.css';
 import ReactToPrint from "react-to-print";
@@ -51,15 +51,6 @@ class SC030ShowPrint extends React.Component {
         XLSX.writeFile(wb, this.props.record.Nav_Department.NAME + ".xlsx")
     }
 
-    onClickApprove = (appVisible) => {
-        const newtmpData = {
-            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'none' },
-            formCode: "PF123",
-        }
-        this.setState({
-            tmpData: newtmpData,
-        });
-    }
 
     //审批意见 改变
     NOTJOINREASONCHANGE = (val) => {
@@ -201,7 +192,7 @@ class SC030ShowPrint extends React.Component {
             <div style={{ padding: '10px' }}>
                 <table>
                     <tr>
-                        <td><Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button></td>
+                        <td><Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button></td>
                         <td><ReactToPrint trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>} content={() => this.componentRef} /></td>
                         <td><ExportToExcel fileName='会议纪要' tableId={'tableId' + this.props.data.id} /></td>
                         {isTaskSign ? <td><Button className={styles.sign} type={'primary'} icon={'check'} onClick={() => this.sign()} >签到</Button></td> : null}
diff --git a/src/components/CustomPages/SC/SC030ShowPrintPer.js b/src/components/CustomPages/SC/SC030ShowPrintPer.js
index b43dd0f..e2b973c 100644
--- a/src/components/CustomPages/SC/SC030ShowPrintPer.js
+++ b/src/components/CustomPages/SC/SC030ShowPrintPer.js
@@ -1,7 +1,7 @@
 import { Checkbox, message, Radio } from "antd/lib/index";
 import { Button, Descriptions, Modal, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, GetFileModel, showFiles, showApprove, showUserSign } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, GetFileModel, showFiles, showApprove, showUserSign, approveView } from "../../../utils/common";
 import { ExportToExcel } from '@woowalker/feui'
 import styles from '../HI/StepForm.css';
 
@@ -49,16 +49,6 @@ class SC030ShowPrintPer extends React.Component {
         XLSX.writeFile(wb, this.props.record.Nav_Department.NAME + ".xlsx")
     }
 
-    onClickApprove = (appVisible) => {
-        const newtmpData = {
-            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'none' },
-            formCode: "PF123",
-        }
-        this.setState({
-            tmpData: newtmpData,
-        });
-    }
-
     //审批意见 改变
     NOTJOINREASONCHANGE = (val) => {
         this.state.NOTJOINREASON = val
@@ -165,7 +155,7 @@ class SC030ShowPrintPer extends React.Component {
             <div style={{ padding: '10px' }}>
                 <table>
                     <tr>
-                        <td><Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button></td>
+                        <td><Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button></td>
                         <td><ReactToPrint trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>} content={() => this.componentRef} pageStyle={"#tableId" + this.props.data.id + " { padding:0 40px;} img{width :120px}"} /></td>
                         <td><ExportToExcel fileName='会议纪要' tableId={'tableId' + this.props.data.id} /></td>
                         {isTaskSign ? <td><Button className={styles.sign} type={'primary'} icon={'check'} onClick={() => this.sign()} >签到</Button></td> : null}
diff --git a/src/components/CustomPages/SC/SC030ShowPrintView.js b/src/components/CustomPages/SC/SC030ShowPrintView.js
index 546f584..7895631 100644
--- a/src/components/CustomPages/SC/SC030ShowPrintView.js
+++ b/src/components/CustomPages/SC/SC030ShowPrintView.js
@@ -1,7 +1,7 @@
 import { Checkbox, message, Radio } from "antd/lib/index";
 import { Button, Modal, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, showApprove, GetFileModel, showUsersSign } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, showApprove, GetFileModel, showUsersSign, approveView } from "../../../utils/common";
 import { ExportToExcel } from '@woowalker/feui'
 import styles from '../HI/StepForm.css';
 import ReactToPrint from "react-to-print";
@@ -52,15 +52,6 @@ class SC030ShowPrintView extends React.Component {
         XLSX.writeFile(wb, this.props.record.Nav_Department.NAME + ".xlsx")
     }
 
-    onClickApprove = (appVisible) => {
-        const newtmpData = {
-            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'none' },
-            formCode: "PF123",
-        }
-        this.setState({
-            tmpData: newtmpData,
-        });
-    }
 
     //审批意见 改变
     NOTJOINREASONCHANGE = (val) => {
@@ -201,7 +192,7 @@ class SC030ShowPrintView extends React.Component {
             <div style={{ padding: '10px' }}>
                 <table>
                     <tr>
-                        <td><Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button></td>
+                        <td><Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button></td>
                         <td><ReactToPrint trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>} content={() => this.componentRef} /></td>
                         <td><ExportToExcel fileName='会议纪要' tableId={'tableId' + this.props.data.id} /></td>
                         {isTaskSign ? <td><Button className={styles.sign} type={'primary'} icon={'check'} onClick={() => this.sign()} >签到</Button></td> : null}
diff --git a/src/components/CustomPages/SC/SC030View copy.js b/src/components/CustomPages/SC/SC030View copy.js
index 073f9b3..123d18f 100644
--- a/src/components/CustomPages/SC/SC030View copy.js	
+++ b/src/components/CustomPages/SC/SC030View copy.js	
@@ -1,7 +1,7 @@
 import { Checkbox, message, Radio } from "antd/lib/index";
 import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, showApprove, showUserSign, showUsersSign } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, showApprove, showUserSign, showUsersSign, approveView } from "../../../utils/common";
 import { ExportToExcel } from '@woowalker/feui'
 import styles from '../HI/StepForm.css';
 import ReactToPrint from "react-to-print";
@@ -46,15 +46,6 @@ class SC030View extends React.Component {
         XLSX.writeFile(wb, this.props.record.Nav_Department.NAME + ".xlsx")
     }
 
-    onClickApprove = (appVisible) => {
-        const newtmpData = {
-            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'none' },
-            formCode: "PF123",
-        }
-        this.setState({
-            tmpData: newtmpData,
-        });
-    }
 
     //审批意见 改变
     NOTJOINREASONCHANGE = (val) => {
@@ -193,7 +184,7 @@ class SC030View extends React.Component {
             <div style={{ padding: '10px' }}>
                 <table>
                     <tr>
-                        <td><Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button></td>
+                        <td><Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button></td>
                         <td><ReactToPrint trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>} content={() => this.componentRef} pageStyle={"#tableId" + this.props.data.id + " { padding:0 40px;} img{width :120px}"} /></td>
                         <td><ExportToExcel fileName='会议纪要' tableId={'tableId' + this.props.data.id} /></td>
                         {isTaskSign ? <td><Button className={styles.sign} type={'primary'} icon={'check'} onClick={() => this.sign()} >签到</Button></td> : null}
diff --git a/src/components/CustomPages/SC/SC030View.js b/src/components/CustomPages/SC/SC030View.js
index 30b6aec..a06dfd8 100644
--- a/src/components/CustomPages/SC/SC030View.js
+++ b/src/components/CustomPages/SC/SC030View.js
@@ -1,7 +1,7 @@
 import { Checkbox, message, Radio } from "antd/lib/index";
 import { Button, Modal, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, showApprove, showUserSign, GetFileModel } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, showApprove, showUserSign, GetFileModel, approveView } from "../../../utils/common";
 import { ExportToExcel } from '@woowalker/feui'
 import styles from '../HI/StepForm.css';
 import stylesExt from '../HI/StepForm.css';
@@ -52,15 +52,6 @@ class SC030View extends React.Component {
         XLSX.writeFile(wb, this.props.record.Nav_Department.NAME + ".xlsx")
     }
 
-    onClickApprove = (appVisible) => {
-        const newtmpData = {
-            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'none' },
-            formCode: "PF123",
-        }
-        this.setState({
-            tmpData: newtmpData,
-        });
-    }
 
     //审批意见 改变
     NOTJOINREASONCHANGE = (val) => {
@@ -199,7 +190,7 @@ class SC030View extends React.Component {
             <div style={{ padding: '10px' }}>
                 <table>
                     <tr>
-                        <td><Button onClick={() => this.onClickApprove(true)} style={{ marginRight: '8px' }} icon="export">审批详情</Button></td>
+                        <td><Button onClick={() => approveView(this)} style={{ marginRight: '8px' }} icon="export">审批详情</Button></td>
                         <td><ReactToPrint trigger={() => <Button type={'default'} icon={'printer'} >打印</Button>} content={() => this.componentRef} pageStyle={"#tableId" + this.props.data.id + " { padding:0 40px;} img{width :120px}"} /></td>
                         <td><ExportToExcel fileName='会议纪要' tableId={'tableId' + this.props.data.id} /></td>
                         {isTaskSign ? <td><Button className={styles.sign} type={'primary'} icon={'check'} onClick={() => this.sign()} >签到</Button></td> : null}
diff --git a/src/components/CustomPages/SC/SC046ShowPrint.js b/src/components/CustomPages/SC/SC046ShowPrint.js
index 13717ed..a95c241 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, false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -96,23 +96,13 @@ class SC046ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "制度体系创建.xlsx")
     }
-
-    onClickApprove = (appVisible) => {
-        const newtmpData = {
-            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
-            formCode: "PF123",
-        }
-        this.setState({
-            tmpData: newtmpData,
-        });
-    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         // let aaa = Math.random();
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => 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..dc738ce 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, false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -97,23 +97,13 @@ class SC052ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "制度体系创建.xlsx")
     }
-
-    onClickApprove = (appVisible) => {
-        const newtmpData = {
-            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
-            formCode: "PF123",
-        }
-        this.setState({
-            tmpData: newtmpData,
-        });
-    }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         // let aaa = Math.random();
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => 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 e47f558..ed983f5 100644
--- a/src/components/CustomPages/SE/SE009ShowPrint.js
+++ b/src/components/CustomPages/SE/SE009ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter, extendOrder, approveView } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter, extendOrder, approveView} from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import styles from '../../CustomPages/HI/StepForm.css';
 import XLSX from 'xlsx';
diff --git a/src/components/CustomPages/SK/SK002ShowPrint.js b/src/components/CustomPages/SK/SK002ShowPrint.js
index d9e13ce..1e303d8 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, false);
                     //归档才显示打印和导出按钮
                     // if(ret.PRE_MEETING_STATUS==5){
                     //     this.setState({ isFinished: 'inline' })
@@ -247,7 +247,7 @@ class SK002ShowPrint extends React.Component {
             />
           </Modal>
             <div style={{ padding: '10px' }}>
-            {/* <Button onClick={() => 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/SK002ShowSummary.js b/src/components/CustomPages/SK/SK002ShowSummary.js
index becac23..fa5c408 100644
--- a/src/components/CustomPages/SK/SK002ShowSummary.js
+++ b/src/components/CustomPages/SK/SK002ShowSummary.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";
@@ -68,7 +68,7 @@ class SK002ShowSummary extends React.Component {
         // 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: "inline" }} type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK004ShowPrint.js b/src/components/CustomPages/SK/SK004ShowPrint.js
index 22cada7..94f1371 100644
--- a/src/components/CustomPages/SK/SK004ShowPrint.js
+++ b/src/components/CustomPages/SK/SK004ShowPrint.js
@@ -194,7 +194,7 @@ class SK004ShowPrint extends React.Component {
           } else {
             that.setState({ BtnAgreeDisplay: 'inline' })
           }
-          this.onClickApprove(false);
+          approveView(this, 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,
@@ -311,7 +302,7 @@ class SK004ShowPrint 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/SK004ShowSummary.js b/src/components/CustomPages/SK/SK004ShowSummary.js
index 2de02f8..b4d5d3f 100644
--- a/src/components/CustomPages/SK/SK004ShowSummary.js
+++ b/src/components/CustomPages/SK/SK004ShowSummary.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";
@@ -73,7 +73,7 @@ class SK004ShowSummary extends React.Component {
         // 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: "inline" }} type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK006ShowPrint.js b/src/components/CustomPages/SK/SK006ShowPrint.js
index 5761f1f..d0b24ad 100644
--- a/src/components/CustomPages/SK/SK006ShowPrint.js
+++ b/src/components/CustomPages/SK/SK006ShowPrint.js
@@ -1,7 +1,7 @@
 import { message } from "antd/lib/index";
 import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Modal } from 'antd';
 import React from 'react';
-import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showFiles, GetFileModel } 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';
@@ -78,7 +78,7 @@ class SK006ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, false);
                 }
 
             }
@@ -115,7 +115,7 @@ class SK006ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, 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..ee19578 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, false);
                 }
 
             }
@@ -103,21 +103,13 @@ 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..76a1de7 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, false);
                 }
 
             }
@@ -122,21 +122,12 @@ 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..1ba88fa 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, 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..1c4b328 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, 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..0c376a6 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, showUserSign, 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, 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..f0a80df 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, 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..6e74c2e 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, 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..f9c3ed9 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, 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..dc7c2f1 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, false);
           //归档才显示打印和导出按钮
           // if(ret.PRE_MEETING_STATUS==5){
           //     this.setState({ isFinished: 'inline' })
@@ -286,15 +286,7 @@ 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 +435,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..f4ebd38 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, 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..65054a5 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, 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/SK033ShowPrint.js b/src/components/CustomPages/SK/SK033ShowPrint.js
index bc1d601..a250c49 100644
--- a/src/components/CustomPages/SK/SK033ShowPrint.js
+++ b/src/components/CustomPages/SK/SK033ShowPrint.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, showUserSign, showFiles, GetFileModel } from "../../../utils/common";
+import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, showUserSign, showFiles, GetFileModel, approveView } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
 import config from "../../../config";
 import XLSX from 'xlsx';
@@ -78,7 +78,7 @@ class SK033ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(true);
+                    approveView(this, true);
                 }
 
             }
@@ -91,21 +91,12 @@ class SK033ShowPrint 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', TASK_ORGID: this.props.data?.TASK_ORGID },
-            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..3d38420 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, 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,
@@ -319,7 +310,7 @@ class SK035CheckLibrary 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/SK035ShowPrint.js b/src/components/CustomPages/SK/SK035ShowPrint.js
index 2ad4f2d..6142533 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, false);
                 }
 
             }
@@ -84,21 +84,13 @@ 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..828624b 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, 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..397afb0 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, 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..f3e053a 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, 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..3cea06a 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, 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;
@@ -96,7 +87,7 @@ class SK043ShowPrint extends React.Component {
         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.STATUS === 30 ? "inline" : "none" }} type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK045ShowPrint.js b/src/components/CustomPages/SK/SK045ShowPrint.js
index e1d1de0..0ea7bcb 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, 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;
@@ -100,7 +91,7 @@ class SK045ShowPrint extends React.Component {
         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.STATUS === 30 ? "inline" : "none" }} type={'default'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
diff --git a/src/components/CustomPages/SK/SK080ShowPrint.js b/src/components/CustomPages/SK/SK080ShowPrint.js
index b34e5c4..96cc4a9 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';
@@ -38,7 +38,7 @@ class SK080ShowPrint extends React.Component {
         if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
             this.props.data.onCancel();
     }
-  
+
     loadData = (dataId, taskID) => {
         let json = initFilter(this.props.login.OrgId);
         json.Parameter22 = this.props.data.ORG_ID_HV;
@@ -59,7 +59,7 @@ class SK080ShowPrint extends React.Component {
                     } else {
                         this.setState({ BtnAgreeDisplay: 'inline' })
                     }
-                    this.onClickApprove(false);
+                    approveView(this, false);
                 }
 
             }
@@ -72,21 +72,21 @@ class SK080ShowPrint extends React.Component {
         const wb = XLSX.utils.table_to_book(Table);
         XLSX.writeFile(wb, "重大事故隐患治理销号表.xlsx")
     }
-    onClickApprove = (appVisible) => {
-        const newtmpData = {
-            data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
-            formCode: "PF123",
-        }
-        this.setState({
-            tmpData: newtmpData,
-        });
-    }
+    // onClickApprove = (appVisible) => {
+    //     const newtmpData = {
+    //         data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+    //         formCode: "PF123",
+    //     }
+    //     this.setState({
+    //         tmpData: newtmpData,
+    //     });
+    // }
     render() {
         const { data } = this.state;
         const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
         return <div>
             <div style={{ padding: '10px' }}>
-                <Button onClick={() => 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}
@@ -104,20 +104,20 @@ class SK080ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起时间">{moment(data.CREATE_TIME).format('YYYY-MM-DD')}</Descriptions.Item>
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
-                                <Descriptions.Item label="整改记录单编号">{data.Nav_RectifyRecord?data.Nav_RectifyRecord?.CODE:''}</Descriptions.Item>
-                                <Descriptions.Item label="生产单元">{data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_ProductionUnit?data.Nav_RectifyRecord.Nav_ProductionUnit.NAME:''}</Descriptions.Item>
-                                <Descriptions.Item label="检查区域">{data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RiskArea?data.Nav_RectifyRecord.Nav_RiskArea.NAME:''}</Descriptions.Item>
-                                <Descriptions.Item label="隐患地点">{data.Nav_RectifyRecord?data.Nav_RectifyRecord.HIDDEN_PLACE:''}</Descriptions.Item>
+                                <Descriptions.Item label="整改记录单编号">{data.Nav_RectifyRecord ? data.Nav_RectifyRecord?.CODE : ''}</Descriptions.Item>
+                                <Descriptions.Item label="生产单元">{data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_ProductionUnit ? data.Nav_RectifyRecord.Nav_ProductionUnit.NAME : ''}</Descriptions.Item>
+                                <Descriptions.Item label="检查区域">{data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RiskArea ? data.Nav_RectifyRecord.Nav_RiskArea.NAME : ''}</Descriptions.Item>
+                                <Descriptions.Item label="隐患地点">{data.Nav_RectifyRecord ? data.Nav_RectifyRecord.HIDDEN_PLACE : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改前照片">{
-                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotoas ? data.Nav_RectifyRecord.Nav_RectifyPhotoas:null, config.picServerHost, this)
+                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotoas ? data.Nav_RectifyRecord.Nav_RectifyPhotoas : null, config.picServerHost, this)
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="整改前照片">{
-                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotobs ? data.Nav_RectifyRecord.Nav_RectifyPhotobs:null, config.picServerHost, this)
+                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotobs ? data.Nav_RectifyRecord.Nav_RectifyPhotobs : null, config.picServerHost, this)
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="重大事故隐患名称">{data.HIDDEN_DESCRIPTION}</Descriptions.Item>
                                 <Descriptions.Item label="重大事故隐患形成原因分析">{data.HIDDEN_REASON}</Descriptions.Item>
                                 <Descriptions.Item label="实地复查负责人">{data.Nav_ChargeUser ? data.Nav_ChargeUser.NAME : ''}</Descriptions.Item>
-                              
+
                                 <Descriptions.Item label="复查人员">{
                                     data?.Nav_Users && data?.Nav_Users.map((item2, i) => {
 
diff --git a/src/utils/customConfig1.js b/src/utils/customConfig1.js
index 8351dd0..176b8a0 100644
--- a/src/utils/customConfig1.js
+++ b/src/utils/customConfig1.js
@@ -20,6 +20,7 @@ const createLoadableComponent = (importFunc) => Loadable({
   timeout: 10000 // 10秒超�?
 })
 
+const SK018ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SK/SK018ShowPrint'));
 const SC022Import = createLoadableComponent(() => import('../components/CustomPages/SC/SC022Import'))
 const SC022ImportData = createLoadableComponent(() => import('../components/CustomPages/SC/SC022ImportData'))
 const FMUserEditPage = createLoadableComponent(() => import('../components/CustomPages/FM/UserEditPage'))
@@ -441,6 +442,7 @@ export default function (componentName, formId, formParam, data, formCode, formD
     // SK043ShowPrint: <SK043ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     // SK045ShowPrint: <SK045ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     BI00FullScreen: <BI00FullScreen formId={formId} formParam={formParam} data={data} formCode={formCode} />,
+    SK018ShowPrint: <SK018ShowPrint formId={formId} formParam={formParam} data={data} formCode={formCode} />,
     BI064FormRunAnalysis: (
       <BI064FormRunAnalysis formId={formId} formParam={formParam} data={data} formCode={formCode} />
     ),