|
@@ -67,7 +67,9 @@ const JsBonus = React.createClass({
|
|
orderNo:this.state.orderNoSearch,
|
|
orderNo:this.state.orderNoSearch,
|
|
startTime: this.state.releaseDate[0],
|
|
startTime: this.state.releaseDate[0],
|
|
endTime: this.state.releaseDate[1],
|
|
endTime: this.state.releaseDate[1],
|
|
- grantStatus: this.state.grantStatus
|
|
|
|
|
|
+ grantStatus: this.state.grantStatus,
|
|
|
|
+ startTime1: this.state.createDate[0],
|
|
|
|
+ endTime1: this.state.createDate[1],
|
|
},
|
|
},
|
|
success: function (data) {
|
|
success: function (data) {
|
|
let theArr = [];
|
|
let theArr = [];
|
|
@@ -122,6 +124,7 @@ const JsBonus = React.createClass({
|
|
return {
|
|
return {
|
|
searchMore: true,
|
|
searchMore: true,
|
|
releaseDate: [],
|
|
releaseDate: [],
|
|
|
|
+ createDate:[],
|
|
RowData:{},
|
|
RowData:{},
|
|
execState:false,
|
|
execState:false,
|
|
selectedRowKeys: [],
|
|
selectedRowKeys: [],
|
|
@@ -288,7 +291,9 @@ const JsBonus = React.createClass({
|
|
targetName: this.state.projectMenSearch,//项目负责人
|
|
targetName: this.state.projectMenSearch,//项目负责人
|
|
startTime: this.state.releaseDate[0],
|
|
startTime: this.state.releaseDate[0],
|
|
endTime: this.state.releaseDate[1],
|
|
endTime: this.state.releaseDate[1],
|
|
- grantStatus: this.state.grantStatus
|
|
|
|
|
|
+ grantStatus: this.state.grantStatus,
|
|
|
|
+ startTime1: this.state.createDate[0],
|
|
|
|
+ endTime1: this.state.createDate[1],
|
|
}
|
|
}
|
|
window.location.href=(globalConfig.context+'/api/admin/bonus/exportTechnicianBonusData?'+$.param(data));
|
|
window.location.href=(globalConfig.context+'/api/admin/bonus/exportTechnicianBonusData?'+$.param(data));
|
|
},
|
|
},
|
|
@@ -322,6 +327,7 @@ const JsBonus = React.createClass({
|
|
this.state.orderRefundSearch='';
|
|
this.state.orderRefundSearch='';
|
|
this.state.projectMenSearch='';
|
|
this.state.projectMenSearch='';
|
|
this.state.releaseDate = [];
|
|
this.state.releaseDate = [];
|
|
|
|
+ this.state.createDate=[];
|
|
this.state.orderNoSearch='';
|
|
this.state.orderNoSearch='';
|
|
this.state.grantStatus=undefined;
|
|
this.state.grantStatus=undefined;
|
|
this.state.departmenttList=undefined;
|
|
this.state.departmenttList=undefined;
|
|
@@ -386,6 +392,12 @@ const JsBonus = React.createClass({
|
|
value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
|
|
value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
|
|
this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
|
|
this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
|
|
onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
|
|
onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
|
|
|
|
+ <span>创建时间 :</span>
|
|
|
|
+ <RangePicker
|
|
|
|
+ format="YYYY-MM-DD"
|
|
|
|
+ value={[this.state.createDate[0] ? moment(this.state.createDate[0]) : null,
|
|
|
|
+ this.state.createDate[1] ? moment(this.state.createDate[1]) : null]}
|
|
|
|
+ onChange={(data, dataString) => { this.setState({ createDate: dataString }); }} />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div className="patent-table" id="table">
|
|
<div className="patent-table" id="table">
|