|
@@ -155,7 +155,11 @@ class AccountDetails extends React.Component {
|
|
|
startTime: str + ' 00:00',
|
|
|
endTime: str + ' 00:00',
|
|
|
startTimeStamp: moment(str).valueOf(),
|
|
|
- endtTimeStamp: moment(str).valueOf()
|
|
|
+ endtTimeStamp: moment(str).valueOf(),
|
|
|
+ orderStartTime: str + ' 00:00',
|
|
|
+ orderEndTime: str + ' 00:00',
|
|
|
+ orderStartTimeStamp: moment(str).valueOf(),
|
|
|
+ orderEndtTimeStamp: moment(str).valueOf()
|
|
|
},() => { this.loadDataList() })
|
|
|
}
|
|
|
})
|
|
@@ -186,8 +190,10 @@ class AccountDetails extends React.Component {
|
|
|
|
|
|
formatSearch() {
|
|
|
let filters = [
|
|
|
- { field:"beginDate", operate: "equal",value: this.state.startTime },
|
|
|
+ { field:"beginDate", operate: "equal",value: this.state.startTime }, //beginSynOrderTime
|
|
|
{ field:"endDate", operate: "equal",value: this.state.endTime },
|
|
|
+ { field:"beginSynOrderTime", operate: "equal",value: this.state.orderStartTime },
|
|
|
+ { field:"endSynOrderTime", operate: "equal",value: this.state.orderEndTime },
|
|
|
{ field:"type", operate: "equal",value: this.state.searchTypeValue },
|
|
|
{ field:"status", operate: "equal",value: this.state.searchStatusValue },
|
|
|
]
|
|
@@ -444,13 +450,13 @@ class AccountDetails extends React.Component {
|
|
|
<div style={{lineHeight: '40px'}}>{ this.state.userRoleName } : { this.state.idPhone }</div>
|
|
|
<Row>
|
|
|
<Col span={10}>
|
|
|
- 开始时间:
|
|
|
+ 收益开始时间:
|
|
|
<DatePicker
|
|
|
allowClear={false}
|
|
|
showNow={true}
|
|
|
value={moment(this.state.startTime)}
|
|
|
- defaultValue={ moment(this.state.startTime, 'YYYY-MM-DD hh:mm')}
|
|
|
- format={['YYYY-MM-DD hh:mm']}
|
|
|
+ defaultValue={ moment(this.state.startTime, 'YYYY-MM-DD')}
|
|
|
+ // format={['YYYY-MM-DD hh:mm']}
|
|
|
onChange={(date, dateStr) => {
|
|
|
if(moment(dateStr).valueOf() > this.state.endtTimeStamp) {
|
|
|
message.error('开始时间不能大于结束时间')
|
|
@@ -458,20 +464,20 @@ class AccountDetails extends React.Component {
|
|
|
}
|
|
|
this.setState({
|
|
|
startTimeStamp: moment(dateStr).valueOf(),
|
|
|
- startTime: dateStr
|
|
|
+ startTime: dateStr + ' 00:00'
|
|
|
})
|
|
|
}}
|
|
|
>
|
|
|
</DatePicker>
|
|
|
</Col>
|
|
|
<Col span={10}>
|
|
|
- 结束时间:
|
|
|
+ 收益结束时间:
|
|
|
<DatePicker
|
|
|
allowClear={false}
|
|
|
showNow={true}
|
|
|
value={moment(this.state.endTime)}
|
|
|
- defaultValue={moment(this.state.endTime, 'YYYY-MM-DD hh:mm')}
|
|
|
- format={['YYYY-MM-DD hh:mm']}
|
|
|
+ defaultValue={moment(this.state.endTime, 'YYYY-MM-DD')}
|
|
|
+ // format={['YYYY-MM-DD hh:mm']}
|
|
|
onChange={(date, dateStr) => {
|
|
|
if(moment(dateStr).valueOf() < this.state.startTimeStamp) {
|
|
|
message.error('结束时间不能小于开始时间')
|
|
@@ -479,13 +485,57 @@ class AccountDetails extends React.Component {
|
|
|
}
|
|
|
this.setState({
|
|
|
endtTimeStamp: moment(dateStr).valueOf(),
|
|
|
- endTime: dateStr
|
|
|
+ endTime: dateStr + ' 00:00'
|
|
|
})
|
|
|
}}
|
|
|
>
|
|
|
</DatePicker>
|
|
|
</Col>
|
|
|
</Row>
|
|
|
+
|
|
|
+ <Row style={{margin: '15px 0'}}>
|
|
|
+ <Col span={10}>
|
|
|
+ 下单开始时间:
|
|
|
+ <DatePicker
|
|
|
+ allowClear={false}
|
|
|
+ showNow={true}
|
|
|
+ value={moment(this.state.orderStartTime)}
|
|
|
+ defaultValue={ moment(this.state.orderStartTime, 'YYYY-MM-DD')}
|
|
|
+ onChange={(date, dateStr) => {
|
|
|
+ if(moment(dateStr).valueOf() > this.state.orderEndtTimeStamp) {
|
|
|
+ message.error('开始时间不能大于结束时间')
|
|
|
+ return
|
|
|
+ }
|
|
|
+ this.setState({
|
|
|
+ orderStartTimeStamp: moment(dateStr).valueOf(),
|
|
|
+ orderStartTime: dateStr + ' 00:00'
|
|
|
+ })
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ </DatePicker>
|
|
|
+ </Col>
|
|
|
+ <Col span={10}>
|
|
|
+ 下单结束时间:
|
|
|
+ <DatePicker
|
|
|
+ allowClear={false}
|
|
|
+ showNow={true}
|
|
|
+ value={moment(this.state.orderEndTime)}
|
|
|
+ defaultValue={moment(this.state.orderEndTime, 'YYYY-MM-DD')}
|
|
|
+ onChange={(date, dateStr) => {
|
|
|
+ if(moment(dateStr).valueOf() < this.state.orderStartTimeStamp) {
|
|
|
+ message.error('结束时间不能小于开始时间')
|
|
|
+ return
|
|
|
+ }
|
|
|
+ this.setState({
|
|
|
+ orderEndtTimeStamp: moment(dateStr).valueOf(),
|
|
|
+ orderEndTime: dateStr + ' 00:00'
|
|
|
+ })
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ </DatePicker>
|
|
|
+ </Col>
|
|
|
+ </Row>
|
|
|
+
|
|
|
<Row style={{margin: '15px 0'}}>
|
|
|
<Col span={10}>业务场景:
|
|
|
<Select
|