|
@@ -4,7 +4,7 @@ import $ from 'jquery/src/ajax';
|
|
|
import moment from 'moment';
|
|
|
import '../distribute/public.less';
|
|
|
import { Button, Input, Spin, Table,Select, Switch,InputNumber, message, DatePicker,Modal ,Form } from 'antd';
|
|
|
-import {getNewOrderStatus,getProjectStatus,getPaymentType,getTransactionProject,getBonusState} from '@/tools';
|
|
|
+import {getNewOrderStatus,getProjectStatus,getJsyPaymentType,getBonusState} from '@/tools';
|
|
|
import BonuseDetail from './bonusDetail';
|
|
|
const FormItem= Form.Item;
|
|
|
|
|
@@ -63,6 +63,7 @@ const YxBonus = React.createClass({
|
|
|
pageSize:this.state.pagination.pageSize,
|
|
|
salesName: this.state.orderRefundSearch,//订单负责人
|
|
|
departmentId:this.state.departmenttList,
|
|
|
+ orderNo:this.state.orderNoSearch,
|
|
|
startTime: this.state.releaseDate[0],
|
|
|
endTime: this.state.releaseDate[1],
|
|
|
grantStatus:this.state.grantStatus
|
|
@@ -121,6 +122,14 @@ const YxBonus = React.createClass({
|
|
|
key: 'orderNo',
|
|
|
},
|
|
|
{
|
|
|
+ title: '客户名称',
|
|
|
+ dataIndex: 'buyName',
|
|
|
+ key: 'buyName',
|
|
|
+ render:text=>{
|
|
|
+ return text&&text>8?text.substr(0,8)+'...':text
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
title: '订单负责人',
|
|
|
dataIndex: 'salesName',
|
|
|
key: 'salesName',
|
|
@@ -131,14 +140,6 @@ const YxBonus = React.createClass({
|
|
|
key: 'signTime',
|
|
|
},
|
|
|
{
|
|
|
- title: '客户名称',
|
|
|
- dataIndex: 'buyName',
|
|
|
- key: 'buyName',
|
|
|
- render:text=>{
|
|
|
- return text&&text>8?text.substr(0,8)+'...':text
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
title: '订单金额(万元)',
|
|
|
dataIndex: 'totalAmount',
|
|
|
key: 'totalAmount'
|
|
@@ -172,7 +173,7 @@ const YxBonus = React.createClass({
|
|
|
dataIndex: 'bonusSubject',
|
|
|
key: 'bonusSubject',
|
|
|
render:text=>{
|
|
|
- return getPaymentType(text)
|
|
|
+ return getJsyPaymentType(text)
|
|
|
}
|
|
|
},
|
|
|
{
|
|
@@ -303,6 +304,7 @@ const YxBonus = React.createClass({
|
|
|
reset() {
|
|
|
this.state.orderRefundSearch='';
|
|
|
this.state.releaseDate = [];
|
|
|
+ this.state.orderNoSearch='';
|
|
|
this.state.departmenttList=undefined;
|
|
|
this.state.grantStatus=undefined
|
|
|
this.loadData();
|
|
@@ -340,6 +342,9 @@ const YxBonus = React.createClass({
|
|
|
})
|
|
|
}
|
|
|
</Select>
|
|
|
+ <Input placeholder="订单编号"
|
|
|
+ value={this.state.orderNoSearch}
|
|
|
+ onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
|
|
|
<Input placeholder="订单负责人"
|
|
|
value={this.state.orderRefundSearch}
|
|
|
onChange={(e) => { this.setState({ orderRefundSearch: e.target.value }); }} />
|