dengzhiguo 6 years ago
parent
commit
b795c154c5
1 changed files with 10 additions and 12 deletions
  1. 10 12
      js/component/manageCenter/statistics/order/index.jsx

+ 10 - 12
js/component/manageCenter/statistics/order/index.jsx

@@ -309,10 +309,16 @@ const Order = React.createClass({
                             })
                         }
                     </Select>   
-                    <Button type="primary" onClick={this.search}>搜索</Button>
+                    <span>起止时间 :</span>
+                    <RangePicker
+                        format="YYYY-MM"
+                        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 }); }} />
+                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <div style={{float:'right'}}>
-                    <Button type="primary" onClick={this.loadExcel} style={{margin:'0 10px'}}>下载导入模板</Button>
+                    {/*<Button type="primary" onClick={this.loadExcel} style={{margin:'0 10px'}}>下载导入模板</Button>
                     <Upload
                             action={globalConfig.context + "/api/admin/bonus/uploadOrderExcel"}
                             data={{ 'sign': '' }}
@@ -335,18 +341,10 @@ const Order = React.createClass({
                                 };
                             }} >
                             <Button>导入年度销售数据</Button>
-                        </Upload>
+                        </Upload>*/}
                         <Button type="primary" onClick={this.exec} style={{margin:'0 10px'}}>导出到excel</Button>
                     </div>
-                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                        <span>起止时间 :</span>
-                        <RangePicker
-                            format="YYYY-MM"
-                            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 clearfix" id="table">
                     <Spin spinning={this.state.loading}>