From a2d1b9886b00b5f4d4722c3379d3bd4f2f94b421 Mon Sep 17 00:00:00 2001
From: LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
Date: Mon, 09 Mar 2020 17:02:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

---
 SunshineIns/src/page/UnderAgeList.jsx |   69 ++++++++++++++++++++++++++++++----
 1 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/SunshineIns/src/page/UnderAgeList.jsx b/SunshineIns/src/page/UnderAgeList.jsx
index 272a96d..4cc1ae6 100644
--- a/SunshineIns/src/page/UnderAgeList.jsx
+++ b/SunshineIns/src/page/UnderAgeList.jsx
@@ -2,6 +2,7 @@
 
 import HeadView from '../view/HeadView';
 import TableBtnView from '../view/TableBtnView';
+import CommonSearchForm from '../view/CommonSearchForm';
 import { Input, Button, DatePicker, Divider, Modal, message } from 'antd'
 import moment from 'moment'
 import Fetch from '../fetch';
@@ -15,7 +16,12 @@
       loading: false,
       visible: false,
       savedate: {},
-      formdata: {},
+      formData: {
+        __key: Date.now(),
+        companyName: '',
+        companyLegal: '',
+        companyTel: '',
+    },
       resetKey: Date.now(),
       closeKey: Date.now()
     };
@@ -25,15 +31,42 @@
     document.title = '涉未成年负责部门组织';
     this.getData();
   }
-  getData = () => {
-    const { formdata } = this.state;
-    Fetch.socialCompany(formdata)
+
+  setFormData = data => {
+    console.log('form', data);
+    this.setState({
+      formData: data,
+    });
+  }
+
+  searchonClick = data => {
+    console.log('form', data);
+    this.setState({
+      formData: data,
+    });
+    this.setState({ loading: true })
+    Fetch.socialCompany({...data})
       .then(res => {
         for (var i = 0; i < res.length; i++) {
           res[i]['index'] = i + 1;
         }
         this.setState({
-          data: res
+          data: res,
+          loading: false
+        });
+      });
+  }
+  getData = () => {
+    const { formdata } = this.state;
+    this.setState({ loading: true })
+    Fetch.socialCompany({formdata})
+      .then(res => {
+        for (var i = 0; i < res.length; i++) {
+          res[i]['index'] = i + 1;
+        }
+        this.setState({
+          data: res,
+          loading: false
         });
       });
   }
@@ -186,12 +219,32 @@
         </span>
       ),
     }];
-    const { data, resetKey, visible, loading, savedate, closeKey } = this.state;
+    const { data, resetKey, visible, loading, savedate, closeKey, formData } = this.state;
     return (
 
       <div className="app-page">
         <HeadView history={this.props.history} />
-        <TableBtnView key={-resetKey} type="infoManage" name='涉未成年负责部门组织' btnName='新建公司' onClick={() => this.showModal('new')}>
+        <div style={{ background: '#fff', margin: 20 }}>
+          <CommonSearchForm
+            {...this.props}
+            formData={formData}
+            setFormData={this.setFormData}
+            searchonClick={this.searchonClick}
+            pathName={this.props.location.pathname}
+            data={[
+              {
+                type: 'input', name: '公司名称', label: '公司名称', key: 'companyName'
+              },
+              {
+                type: 'input', name: '法人姓名', label: '法人姓名', key: 'companyLegal'
+              },
+              {
+                type: 'input', name: '联系电话', label: '联系电话', key: 'companyTel'
+              },
+            ]} />
+          <TableView columns={columns} data={data} pageSize='10' size='default' loading={loading} />
+        </div>
+        {/* <TableBtnView key={-resetKey} type="infoManage" name='涉未成年负责部门组织' btnName='新建公司' onClick={() => this.showModal('new')}>
           <Input placeholder="根据公司名称模糊查询" style={{ width: "200px" }} name='companyName' onChange={this.onInputChange} />
           <Input placeholder="根据法人姓名模糊查询" style={{ width: "200px" }} name='companyLegal' onChange={this.onInputChange} />
           <Input placeholder="根据联系电话模糊查询" style={{ width: "200px" }} name='companyTel' onChange={this.onInputChange} />
@@ -200,7 +253,7 @@
           <Button type="primary" onClick={this.Seaech}>查询</Button>
           <Button onClick={this.Reset}>重置</Button>
         </TableBtnView>
-        <TableView columns={columns} data={data} pageSize='10' size='default' />
+        <TableView columns={columns} data={data} pageSize='10' size='default' /> */}
         <Modal
           key={closeKey}
           confirmLoading={loading}

--
Gitblit v1.8.0