dengzhiguo 7 years ago
parent
commit
d643f68e36
1 changed files with 236 additions and 298 deletions
  1. 236 298
      js/component/manageCenter/customer/publicCustomer.jsx

+ 236 - 298
js/component/manageCenter/customer/publicCustomer.jsx

@@ -1,43 +1,22 @@
 import React from 'react';
-import { AutoComplete, Icon, Button, Input, InputNumber, Select, Spin, Table, message, Modal, Row, Col, DatePicker } from 'antd';
+import { AutoComplete, Icon, Button, Input, InputNumber, Select, Spin, Table, message, Modal, Row, Col, DatePicker,Switch,Upload} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { orderStatusList } from '../../dataDic.js';
-import { befoFile, getSearchUrl, getOrderStatus, companySearch } from '../../tools.js';
-import BatchImport from './batchImport';
-import throttle from '../../throttle.js';
+import { orderStatusList,cityArr,customerStatus } from '../../dataDic.js';
+import { beforeUploadFile,getOrderStatus, getSearchUrl,getcustomerTyp,getcityArr,getcustomerStatue,getCompanyIntention,getfllowSituation,getsex} from '../../tools.js';
+
 
 const AchievementDetail = React.createClass({
     getInitialState () {
         return {
             visible: false,
             loading: false,
-            columns: [
-                {
-                    title: '状态',
-                    dataIndex: 'status',
-                    key: 'status',
-                    render: text => { return getOrderStatus(text) }
-                }, {
-                    title: '操作时间',
-                    dataIndex: 'recordTimeFormattedDate',
-                    key: 'recordTimeFormattedDate',
-                }, {
-                    title: '管理员',
-                    dataIndex: 'operator',
-                    key: 'operator',
-                }, {
-                    title: '备注',
-                    dataIndex: 'comment',
-                    key: 'comment',
-                }
-            ],
             dataSource: [],
         };
     },
-    loadLogs (id) {
+    loadLogs (id) {   	
         this.setState({
             loading: true
         });
@@ -47,9 +26,9 @@ const AchievementDetail = React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/api/admin/portal/order/achievementOrderLog",
             data: {
-                achievementOrderId: id
+                id:id
             },
-            success: function (data) {
+            success: function (data) {          	
                 let theArr = [];
                 if (!data.data) {
                     if (data.error && data.error.length) {
@@ -64,7 +43,7 @@ const AchievementDetail = React.createClass({
                             status: thisdata.status,
                             comment: thisdata.comment,
                             operator: thisdata.operator,
-                            recordTimeFormattedDate: thisdata.recordTimeFormattedDate
+                            recordTimeFormattedDate: thisdata.recordTimeFormattedDate                           
                         });
                     };
                 };
@@ -79,14 +58,6 @@ const AchievementDetail = React.createClass({
         }.bind(this));
     },
     handleSubmit (e) {
-        //keyword长度判断
-        if (this.state.orderStatus || this.state.comment || this.state.recordTime) {
-            if (this.state.orderStatus && this.state.comment && this.state.recordTime) {
-            } else {
-                message.warning('请填写完整的状态流转记录!');
-                return;
-            };
-        };
         this.setState({
             loading: true
         });
@@ -97,14 +68,6 @@ const AchievementDetail = React.createClass({
             url: globalConfig.context + '/api/admin/portal/order/updateAchievementOrder',
             data: {
                 id: this.props.data.id,
-                achievementId: this.props.data.achievementId,
-                status: this.state.orderStatus || this.props.data.status,
-                recordTimeFormattedDate: this.state.recordTime ? this.state.recordTime.format("YYYY-MM-DD HH:mm:ss") : undefined,
-                comment: this.state.comment,
-                paymentId: this.state.paymentId,
-                paymentType: this.state.paymentType,
-                paymentValue: this.state.paymentValue,
-                transferPrice: this.state.transferPrice,
             }
         }).done(function (data) {
             this.setState({
@@ -143,121 +106,87 @@ const AchievementDetail = React.createClass({
         };
         this.state.visible = nextProps.showDesc;
     },
-    render () {
-        let theData = this.props.data;
-        if (theData) {
+    render () {       
+    	 const theData = this.props.data || {};    
             return (
                 <div className="patent-desc">
                     <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.checkPatentProcess} onCancel={this.handleCancel}
                         width='800px'
                         footer={null}
-                        title="订单详情"
+                        title="客户详情"
                         className="demand-order-content">
-                        <Spin spinning={this.state.loading}>
+                        <Spin spinning={this.state.loading}>                        	
                             <Row>
-                                <Col span={2}>订单编号:</Col>
-                                <Col span={10}>{theData.serialNumber}</Col>
-                                <Col span={2}>订单状态:</Col>
-                                <Col span={10}>{getOrderStatus(theData.status)}</Col>
+                                <Col span={2}>客户类型:</Col>
+                                <Col span={10}>{getcustomerTyp(theData.customerTyp)}</Col>
+                                <Col span={2}>编号:</Col>
+                                <Col span={10}>{theData.id}</Col>
                             </Row>
                             <Row>
-                                <Col span={2}>成果编号:</Col>
-                                <Col span={10}>{theData.achievementSerialNumber}</Col>
-                                <Col span={2}>成果名称:</Col>
-                                <Col span={10}>{theData.name}</Col>
+                                <Col span={2}>录入时间:</Col>
+                                <Col span={10}>{theData.createTime}</Col>
+                                <Col span={2}>跟单人:</Col>
+                                <Col span={10}>{theData.ownerId}</Col>
                             </Row>
+                            <Row>基本资料:</Row>
                             <Row>
-                                <Col span={2}>成果状态:</Col>
-                                <Col span={10}>{(() => {
-                                    if (theData.deletedSign == 1) {
-                                        return "已删除"
-                                    } else if (theData.auditStatus != 3) {
-                                        return "已下架"
-                                    } else {
-                                        return "正常"
-                                    }
-                                })()}</Col>
-                                <Col span={3}>订单所有人:</Col>
-                                <Col span={9}>{theData.theName}</Col>
+                                <Col span={2}>公司名称:</Col>
+                                <Col span={10}>{theData.companyName}</Col>
+                                <Col span={2}>公司行业:</Col>
+                                <Col span={10}>{theData.companyIndustry}</Col>
                             </Row>
                             <Row>
-                                <Col span={2}>接单时间:</Col>
-                                <Col span={10}>{theData.createTimeFormattedDate}</Col>
+                                <Col span={2}>意向服务:</Col>
+                                <Col span={10}>{getCompanyIntention(theData.companyIntention)}</Col>
+                                <Col span={2}>地区:</Col>
+                                <Col span={10}>{getcityArr(theData.province)}</Col>
                             </Row>
                             <Row>
-                                <Col span={2}>订单金额:</Col>
-                                <Col span={10}>
-                                    {theData.bargainingMode == 0 ? <div>
-                                        <span>价格面议</span>
-                                    </div> : <InputNumber
-                                            value={this.state.transferPrice}
-                                            onChange={(e) => { this.setState({ transferPrice: e }) }} />}
-                                    <span> 万元</span>
-                                </Col>
-                                <Col span={2}>支付金额:</Col>
-                                <Col span={10}>
-                                    <InputNumber style={{ width: '160px' }}
-                                        value={this.state.paymentValue}
-                                        onChange={(e) => { this.setState({ paymentValue: e }) }} />
-                                    <span> 元</span>
-                                </Col>
+                                <Col span={2}>最新跟进:</Col>
+                                <Col span={10}>{getfllowSituation(theData.fllowSituation)}</Col>
+                                <Col span={2}>客户状态:</Col>
+                                <Col span={10}>{getcustomerStatue(theData.customerStatue)}</Col>
                             </Row>
                             <Row>
-                                <Col span={2}>支付方式:</Col>
-                                <Col span={8}>
-                                    <Input
-                                        value={this.state.paymentType}
-                                        onChange={(e) => { this.setState({ paymentType: e.target.value }) }} />
-                                </Col>
-                                <Col span={2}></Col>
-                                <Col span={2}>订单流水:</Col>
-                                <Col span={8}>
-                                    <Input value={this.state.paymentId}
-                                        onChange={(e) => { this.setState({ paymentId: e.target.value }) }} />
-                                </Col>
+                                <Col span={2}>详细地址:</Col>                                
+                                <Col span={10}>{theData.adress}</Col>
+                                <Col span={2}>备注:</Col>
+                                <Col span={10}>{theData.remark}</Col>
                             </Row>
-                            <p>订单状态流转记录</p>
-                            <Table columns={this.state.columns}
-                                dataSource={this.state.dataSource}
-                                pagination={false} />
-                            <Row style={{ marginTop: '20px' }}>
-                                <Col span={2}>状态:</Col>
-                                <Col span={10}>
-                                    <Select style={{ width: 160 }}
-                                        value={this.state.orderStatus}
-                                        onChange={(e) => { this.setState({ orderStatus: e }); }}>
-                                        {(() => {
-                                            let theArr = [];
-                                            orderStatusList.map(function (item, i) {
-                                                theArr.push(<Select.Option key={item.value}>{item.key}</Select.Option>)
-                                            });
-                                            return theArr;
-                                        })()}
-                                    </Select>
-                                </Col>
-                                <Col span={2}>时间:</Col>
-                                <Col span={10}>
-                                    <DatePicker style={{ width: '150px' }}
-                                        showTime
-                                        format="YYYY-MM-DD HH:mm:ss"
-                                        placeholder="选择支付时间"
-                                        value={this.state.recordTime ? moment(this.state.recordTime, "YYYY-MM-DD HH:mm:ss") : undefined}
-                                        onChange={(t, str) => {
-                                            this.setState({ recordTime: t });
-                                        }} />
-                                </Col>
+                            <Row>联系资料:</Row>
+                            <Row>
+                                <Col span={2}>姓名:</Col>
+                                <Col span={10}>{theData.customerName}</Col>
+                                <Col span={2}>性别:</Col>
+                                <Col span={10}>{getsex(theData.sex)}</Col>
                             </Row>
                             <Row>
-                                <Col span={2}>备注:</Col>
-                                <Col span={20}>
-                                    <Input value={this.state.comment} onChange={(e) => { this.setState({ comment: e.target.value }); }} />
-                                </Col>
+                                <Col span={2}>手机号码:</Col>
+                                <Col span={10}>{theData.telNum}</Col>
+                                <Col span={2}>座机号:</Col>
+                                <Col span={10}>{theData.mobile}</Col>
+                            </Row>
+                            <Row>
+                                <Col span={2}>QQ号码:</Col>
+                                <Col span={10}>{theData.qq}</Col>
+                                <Col span={2}>邮箱号:</Col>
+                                <Col span={10}>{theData.email}</Col>
                             </Row>
                             <Row>
+                                <Col span={2}>微信:</Col>                                
+                                <Col span={10}>{theData.wechat}</Col>
+                                <Col span={2}>部门:</Col>
+                                <Col span={10}>{theData.department}</Col>
+                            </Row>
+                            <Row> 
+                                <Col span={2}>职位:</Col>
+                                <Col span={10}>{theData.customerPosition}</Col>
+                            </Row>                               
+                            <Row>
                                 <Col span={2}></Col>
                                 <Col span={20}>
-                                    <Button style={{ marginRight: '20px' }} type="primary" onClick={this.handleSubmit}>保存</Button>
+                                    <Button style={{ marginRight: '20px' }} type="primary" onClick={this.handleSubmit}>领取</Button>                                    
                                     <Button className="set-submit" type="ghost" onClick={this.handleCancel}>取消</Button>
                                 </Col>
                             </Row>
@@ -265,64 +194,57 @@ const AchievementDetail = React.createClass({
                     </Modal>
                 </div>
             );
-        } else {
-            return <div></div>
-        }
     },
 });
 
+
 const AchievementOrderList = React.createClass({
-    loadData (pageNo, apiUrl) {
+    loadData(pageNo, apiUrl) {
+        this.state.data = [];
         this.setState({
             loading: true
         });
         $.ajax({
             method: "get",
             dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + (apiUrl || this.props['data-listApiUrl']),
+            crossDomain: false,          
+            url:globalConfig.context + '/api/admin/customer/searchCustomerList',
             data: {
                 pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                status: this.state.status,
-                unitName: ((apiUrl || this.props['data-listApiUrl']).indexOf('org') != -1) ? null : this.state.searchName,
-                username: ((apiUrl || this.props['data-listApiUrl']).indexOf('org') != -1) ? this.state.searchName : null
+                pageSize: this.state.pagination.pageSize,               
+                companyName: this.state.companyName, //名称
+				customerTyp: this.state.customerTyp, //客户类型
+              	province:this.state.province,//地区
+				customerStatue:this.state.customerStatue,//客户状态
+				customerName:this.state.customerName,//联系人姓名
+				adminName:this.state.adminName,//跟单人
             },
-            success: function (data) {
+            success: function (data) {            	
                 let theArr = [];
                 if (!data.data || !data.data.list) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
-                    };
-                } else {
+                    };                   
+                } else {                	
                     for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
+                        let thisdata = data.data.list[i];                       
                         theArr.push({
                             key: i,
-                            id: thisdata.id,  //线索单/意向单ID
-                            serialNumber: thisdata.serialNumber,  //线索单/意向单编号
-                            achievementId: thisdata.achievementId, //科技需求ID
-                            createTime: thisdata.createTime,
-                            status: thisdata.status, 	//线索单/意向单状态
-                            paymentvalue: thisdata.paymentvalue,
-                            name: thisdata.name, //成果名称,
-                            achievementSerialNumber: thisdata.achievementSerialNumber, //科技成果编号
-                            deletedSign: thisdata.deletedSign, 	//科技成果删除标记
-                            auditStatus: thisdata.auditStatus, 	//科技成果审核状态 	//个人用户名称
-                            theName: thisdata.username || thisdata.unitName,
-                            uid: thisdata.uid,	//个人用户ID
-                            createTimeFormattedDate: thisdata.createTimeFormattedDate,	//接单时间
-                            paymentId: thisdata.paymentId,
-                            paymentTime: thisdata.paymentTime,
-                            paymentTimeFormattedDate: thisdata.paymentTimeFormattedDate,
-                            paymentType: thisdata.paymentType,
-                            paymentValue: thisdata.paymentValue,
-                            transferPrice: thisdata.transferPrice
+                            id: thisdata.id,
+                            companyName:thisdata.companyName,
+                            customerTyp:thisdata.customerTyp,
+                            province:thisdata.province,
+                            customerName:thisdata.customerName,
+                            telNum:thisdata.telNum,
+                            customerStatue:thisdata.customerStatue,
+                            companyIntention:thisdata.companyIntention,
+                            fllowSituation:thisdata.fllowSituation,
+                            adminName:thisdata.adminName                                                                                       
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.total = data.data.totalCount;
-                };
+                };               
                 this.setState({
                     dataSource: theArr,
                     pagination: this.state.pagination
@@ -333,65 +255,15 @@ const AchievementOrderList = React.createClass({
                 loading: false
             });
         }.bind(this));
-    },
-    handleSearch (e) {
-        if (this.props['data-detailApiUrl'].indexOf('org') != -1) {
-            $.ajax({
-                method: "get",
-                dataType: "json",
-                crossDomain: false,
-                url: globalConfig.context + "/api/admin/achievement/orgOwner",
-                data: { name: e },
-                success: function (data) {
-                    let theArr = [];
-                    let theObj = {};
-                    if (!data.data) {
-                        if (data.error && data.error.length) {
-                            message.warning(data.error[0].message);
-                        };
-                    } else if (!$.isEmptyObject(data.data)) {
-                        data.data.map(function (item) {
-                            theArr.push(item.unitName);
-                            theObj[item.unitName] = item.uid;
-                        });
-                    };
-                    this.setState({
-                        searchData: theArr,
-                        dataSourceObj: theObj
-                    });
-                }.bind(this),
-            });
-        } else {
-            $.ajax({
-                method: "get",
-                dataType: "json",
-                crossDomain: false,
-                url: globalConfig.context + "/api/admin/achievement/userOwner",
-                data: { name: e },
-                success: function (data) {
-                    let theArr = [];
-                    let theObj = {};
-                    if (!data.data) {
-                        if (data.error && data.error.length) {
-                            message.warning(data.error[0].message);
-                        };
-                    } else if (!$.isEmptyObject(data.data)) {
-                        for (let item in data.data) {
-                            theArr.push(data.data[item]);
-                            theObj[data.data[item]] = item;
-                        };
-                    };
-                    this.setState({
-                        dataSource: theArr,
-                        dataSourceObj: theObj
-                    });
-                }.bind(this),
-            });
-        };
-    },
-    getInitialState () {
+    },   
+    getInitialState() {
         return {
-            searchData: [],
+            searchMore: true,
+            searchType: 0,
+            validityPeriodDate: [],
+            releaseDate: [],
+            selectedRowKeys: [],
+            selectedRows: [],
             loading: false,
             pagination: {
                 defaultCurrent: 1,
@@ -405,112 +277,178 @@ const AchievementOrderList = React.createClass({
                     return '共' + total + '条数据';
                 }
             },
-            columns: [
+            columns: [               
                 {
-                    title: '编号',
-                    dataIndex: 'serialNumber',
-                    key: 'serialNumber',
-                }, {
-                    title: '成果名称',
-                    dataIndex: 'name',
-                    key: 'name',
-                }, {
-                    title: '成果编号',
-                    dataIndex: 'achievementSerialNumber',
-                    key: 'achievementSerialNumber',
+                    title: '公司名称',
+                    dataIndex: 'companyName',
+                    key: 'companyName',
                 }, {
-                    title: '订单所有人',
-                    dataIndex: 'theName',
-                    key: 'theName',
+                    title: '客户类型',
+                    dataIndex: 'customerTyp',
+                    key: 'customerTyp',
+                    render: text => { return getcustomerTyp(text); }
                 }, {
-                    title: '订单状态',
-                    dataIndex: 'status',
-                    key: 'status',
-                    render: (text, record) => { return getOrderStatus(text); }
+                    title: '地区',
+                    dataIndex: 'province',
+                    key: 'province',
+                    render: text => { return getcityArr(text); }
                 }, {
-                    title: '订单金额',
-                    dataIndex: 'paymentValue',
-                    key: 'paymentValue',
-                }, {
-                    title: '接单时间',
-                    dataIndex: 'createTimeFormattedDate',
-                    key: 'createTimeFormattedDate',
+                    title: '联系人姓名',
+                    dataIndex: 'customerName',
+                    key: 'customerName',                    
+                }, 
+                {
+                    title: '手机号',
+                    dataIndex: 'telNum',
+                    key:'telNum',                   
+                },
+                 {
+                    title: '客户状态',
+                    dataIndex: 'customerStatue',
+                    key: 'customerStatue',
+                    render: text => { return getcustomerStatue(text) }
+                },
+                {
+                    title: '意向服务',
+                    dataIndex: 'companyIntention',
+                    key: 'companyIntention',
+                    render: text => { return getCompanyIntention(text) }
+                },
+                 {
+                    title: '最新跟进',
+                    dataIndex: 'fllowSituation',
+                    key: 'fllowSituation',
+                    render: text => { return getfllowSituation(text) }
+                },
+                 {
+                    title: '跟单人',
+                    dataIndex: 'adminName',
+                    key: 'adminName',
                 }
             ],
             dataSource: [],
+            searchTime: [,]
         };
     },
-    componentWillMount () {
-        this.state.therottleSearch = throttle(this.handleSearch, 1000, { leading: false }).bind(this);
-        let theArr = [], typeArr = [];
-        orderStatusList.map(function (item) {
+    componentWillMount() {
+        let theArr = [];
+        customerStatus.map(function (item) {
             theArr.push(
                 <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
             )
         });
-        this.state.demandTypeOption = typeArr;
-        this.state.orderStatusOption = theArr;
-        this.loadData();
-    },
-    componentWillReceiveProps (nextProps) {
-        if (this.props['data-listApiUrl'] != nextProps['data-listApiUrl']) {
-            this.state.selectedRowKeys = [];
-            this.state.selectedRows = [];
-            this.state.status = undefined;
-            this.state.searchName = undefined;
-            this.state.searchData = [];
-            this.loadData(null, nextProps['data-listApiUrl']);
-        };
+        let auditArr = [];
+        cityArr.map(function (item) {
+            auditArr.push(
+                <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
+            )
+        });       
+        this.state.customerStatuarr = theArr;
+        this.state.auditStatusOption = auditArr;
+        if (window.location.search) {
+            let theObj = getSearchUrl(window.location.search);
+            if (theObj.rid) {
+                theObj.id = theObj.rid;
+                if (theObj.rid != 'null') {
+                    this.tableRowClick(theObj);
+                };
+            };
+        };       
+        this.loadData();        
     },
-    tableRowClick (record, index) {
+    tableRowClick(record, index) {
         this.state.RowData = record;
         this.setState({
             showDesc: true
         });
     },
-    closeDesc (e, s) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
             this.loadData();
         };
     },
-    search () {
+    search() {
         this.loadData();
     },
-    reset () {
-        this.state.uid = undefined;
-        this.state.searchName = undefined;
-        this.state.status = undefined;
-        this.loadData();
+    reset() {
+        this.state.id = undefined;
+        this.state.companyName = undefined;
+        this.state.customerTyp = undefined;
+        this.state.province = undefined;
+        this.state.ownerType = undefined;
+        this.state.customerStatue = undefined;
+        this.state.auditStatus = undefined;
+        this.state.ownerId = undefined;
+        this.state.customerName = undefined;  
+        this.state.releaseDate = [];
+        this.loadData(); 
     },
-    render () {
+    searchSwitch() {
+        this.setState({
+            searchMore: !this.state.searchMore
+        });
+    },
+    render() {
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+                this.setState({
+                    selectedRows: selectedRows.slice(-1),
+                    selectedRowKeys: selectedRowKeys.slice(-1)
+                });
+            }
+        };
+        const hasSelected = this.state.selectedRowKeys.length > 0;
+        const { RangePicker } = DatePicker;
         return (
             <div className="user-content" >
-                <div className="content-title">
-                    {this.props['data-listApiUrl'].indexOf('org') == -1 ? <span>个人成果订单管理</span> : <span>组织成果订单管理</span>}
+                <div className="content-title">                  
+                    <span>公共客户管理</span>                  
                 </div>
-                <div className="user-search">
-                    <Select placeholder="选择状态" style={{ width: 160 }}
-                        value={this.state.status}
-                        onChange={(e) => { this.setState({ status: e }) }}>
-                        {this.state.orderStatusOption}
+                <div className="user-search">                    
+                    <Input placeholder="公司名称"
+                        value={this.state.companyName}
+                        onChange={(e) => { this.setState({ companyName: e.target.value }); }} /> 
+                    <Select placeholder="客户类型" style={{ width: 120 }}
+                            value={this.state.customerTyp }
+                            onChange={(e) => { this.setState({ customerTyp : e }) }}>
+                            <Select.Option value="0" >个人客户</Select.Option>
+                            <Select.Option value="1" >公司客户</Select.Option>
+                    </Select>                                        
+                    <Select placeholder="地区"
+                            style={{ width: 160 }}
+                            value={this.state.province}
+                            onChange={(e) => { this.setState({ province: e }) }}>
+                            {this.state.auditStatusOption}
+                    </Select>
+                    <Select placeholder="客户状态" style={{ width: 120 }}
+                            value={this.state.customerStatue}
+                            onChange={(e) => { this.setState({ customerStatue: e }) }}>                           
+                            {this.state.customerStatuarr}
                     </Select>
-                    <AutoComplete
-                        dataSource={this.state.searchData}
-                        style={{ width: 200 }}
-                        value={this.state.searchName}
-                        onSearch={this.state.therottleSearch}
-                        placeholder="输入订单所有人"
-                        onChange={(e) => {
-                            this.setState({ searchName: e });
-                        }} />
                     <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>
+                    <Button onClick={this.reset}>重置</Button>                    
+                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                    	<Input placeholder="跟单人" style={{width:'140px',marginRight:'10px'}}
+		                    value={this.state.ownerId}
+		                    onChange={(e) => { this.setState({ ownerId: e.target.value }); }} />
+		                <Input placeholder="联系人姓名" style={{width:'140px',marginRight:'10px'}}
+		                    value={this.state.customerName}
+		                    onChange={(e) => { this.setState({ customerName: e.target.value }); }} />                                        	
+                        <span>发布时间 :</span>
+                        <RangePicker
+                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />                            
+                    </div>
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns} class="no-all-select"
+                        <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}
+                            rowSelection={rowSelection}
                             pagination={this.state.pagination}
                             onRowClick={this.tableRowClick} />
                     </Spin>
@@ -524,4 +462,4 @@ const AchievementOrderList = React.createClass({
     }
 });
 
-export default AchievementOrderList;
+export default AchievementOrderList;