增加筛选

js/component/account/demand/techDemand.jsx

@@ -25,6 +25,9 @@ const DemandList = React.createClass({
                 name: this.state.name, //需求名称
                 startDate: this.state.releaseDate[0],
                 endDate: this.state.releaseDate[1],
+                auditStatus: this.state.searchAuditStatus,
+                createStartDate: this.state.releaseCreateTime[0],
+                createEndDate: this.state.releaseCreateTime[1],
             },
             success: function (data) {
                 let theArr = [];
@@ -72,6 +75,8 @@ const DemandList = React.createClass({
             searchMore: true,
             validityPeriodDate: [],
             releaseDate: [],
+            releaseCreateTime: '',
+            searchAuditStatus: '',
             selectedRowKeys: [],
             selectedRows: [],
             loading: false,
@@ -293,9 +298,14 @@ const DemandList = React.createClass({
         this.loadData();
     },
     reset() {
-        this.state.name = '';
-        this.state.releaseDate = [];
-        this.loadData();
+        this.setState({
+            name: '',
+            releaseDate: [],
+            releaseCreateTime: [],
+            searchAuditStatus: '',
+        },()=>{
+            this.loadData();
+        })
     },
     searchSwitch() {
         this.setState({
@@ -381,12 +391,33 @@ const DemandList = React.createClass({
                         删除<Icon type="minus" />
                     </Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                        <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 style={{display:'flex'}}>
+                        <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                            <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 className="search-more" style={this.state.searchMore ? { display: 'none' } : {marginLeft:'10px',marginRight:'10px'}}>
+                            <span>创建时间 :</span>
+                            <RangePicker
+                                value={[this.state.releaseCreateTime[0] ? moment(this.state.releaseCreateTime[0]) : null,
+                                    this.state.releaseCreateTime[1] ? moment(this.state.releaseCreateTime[1]) : null]}
+                                onChange={(data, dataString) => { this.setState({ releaseCreateTime: dataString }); }} />
+                        </div>
+                        {/*0--草稿,1--审核中,2--审核通过,3--审核未通过，4-已撤销*/}
+                        <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                            <span>审核状态 :</span>
+                            <Select  style={{ width: 120,marginTop:'0px' }} value={this.state.searchAuditStatus}
+                                onChange={(e) => { this.setState({ searchAuditStatus: e }) }}>
+                                    <Select.Option value={0}>草稿</Select.Option>
+                                    <Select.Option value={1}>审核中</Select.Option>
+                                    <Select.Option value={2}>审核通过</Select.Option>
+                                    <Select.Option value={3}>审核未通过</Select.Option>
+                                    <Select.Option value={4}>已撤销</Select.Option>
+                            </Select>
+                        </div>
                     </div>
                 </div>
                 <div className="patent-table">

package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "",
   "main": "index.js",
   "scripts": {