From 57cd6df84e4fb388b159d201f585520c40ba0b26 Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Wed, 27 May 2020 17:45:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

---
 SunshineIns/src/page/CriminalExecution.jsx |   43 +++++++++++++++++++++++++++++++------------
 1 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/SunshineIns/src/page/CriminalExecution.jsx b/SunshineIns/src/page/CriminalExecution.jsx
index 560de49..222b641 100644
--- a/SunshineIns/src/page/CriminalExecution.jsx
+++ b/SunshineIns/src/page/CriminalExecution.jsx
@@ -188,6 +188,22 @@
         }, '*');
     }
 
+    //确认提交按钮
+    handleOk = () => {
+        this.setState({
+            zIndex: '-1',
+            fingerCode: "",
+        })
+    }
+
+    //取消按钮
+    handleCancel = () => {
+        this.setState({
+            fingerCode: "",
+            zIndex: '-1',
+        });
+    }
+
     render() {
         const { data, resetKey, visible, loading, savedate, closeKey, formData, zIndex, display, fingerCode, iframeKey } = this.state;
         return (
@@ -222,7 +238,8 @@
                     confirmLoading={loading}
                     visible={true}
                     title="指纹录入"
-                    onCancel={() => { this.setState({ visible: false, zIndex: '-1', }) }}
+                    onOk={this.handleOk}
+                    onCancel={this.handleCancel}
                     bodyStyle={{ lineHeight: 4 }}
                     // footer={null}
                     width={'60%'}
@@ -235,17 +252,19 @@
                             录入指纹
                         </Col>
                     </Row>} />
-                    <Divider style={{ margin: '2px 0' }} />
-                    <iframe
-                        key={iframeKey}
-                        style={{ width: '100%', height: '550px', display: display }}
-                        onLoad={() => { }}
-                        ref="iframe"
-                        src='./fingerprint/指纹登记.html'
-                        width="100%"
-                        scrolling="no"
-                        frameBorder="0"
-                    />
+                    <div style={{ display: display }}>
+                        <Divider style={{ margin: '2px 0' }} />
+                        <iframe
+                            key={iframeKey}
+                            style={{ width: '100%', height: '550px' }}
+                            onLoad={() => { }}
+                            ref="iframe"
+                            src='./fingerprint/指纹登记.html'
+                            width="100%"
+                            scrolling="no"
+                            frameBorder="0"
+                        />
+                    </div>
                 </Modal>
 
                 {/* </div> */}

--
Gitblit v1.8.0