|
@@ -11,19 +11,11 @@ import {orderState,orderChannel,orderType} from '../../../../dataDic.js';
|
|
|
import {getProjectState,getOrderChannel,getOrderType,getOrderState,getPaymentState,getApprovedState} from '../../../../tools.js';
|
|
|
|
|
|
const SettlementManage=Form.create()(React.createClass({
|
|
|
- loadData(pageNo,depart) {
|
|
|
+ loadData(pageNo) {
|
|
|
this.state.data = [];
|
|
|
this.setState({
|
|
|
loading: true
|
|
|
});
|
|
|
- let departArr=depart!=undefined?depart:this.state.departmentArr;
|
|
|
- let depIdList=[];
|
|
|
- if(this.state.departmenttSearch==undefined){
|
|
|
- departArr.map(function(item){
|
|
|
- depIdList.push(item.id)
|
|
|
- })
|
|
|
- }
|
|
|
- let depNoList=depIdList.join(',');
|
|
|
$.ajax({
|
|
|
method: "post",
|
|
|
dataType: "json",
|
|
@@ -33,7 +25,7 @@ const SettlementManage=Form.create()(React.createClass({
|
|
|
pageNo: pageNo || 1,
|
|
|
pageSize: this.state.pagination.pageSize,
|
|
|
buyerName:this.state.buyerNameSearch,
|
|
|
- depId:this.state.departmenttSearch==undefined?depNoList:this.state.departmenttSearch,//部门
|
|
|
+ depId:this.state.departmenttSearch,//部门
|
|
|
salesmanName:this.state.salesmanNameSearch,//负责人
|
|
|
startDate: this.state.releaseDate[0],
|
|
|
endDate: this.state.releaseDate[1],
|
|
@@ -127,7 +119,6 @@ const SettlementManage=Form.create()(React.createClass({
|
|
|
this.setState({
|
|
|
departmentArr:theArr,
|
|
|
})
|
|
|
- this.loadData(1,theArr);
|
|
|
}.bind(this),
|
|
|
}).always(function() {
|
|
|
this.setState({
|
|
@@ -361,6 +352,7 @@ const SettlementManage=Form.create()(React.createClass({
|
|
|
},
|
|
|
componentWillMount() {
|
|
|
this.departmentList();
|
|
|
+ this.loadData();
|
|
|
},
|
|
|
tableRowClick(record, index) {
|
|
|
this.state.userDetaile=true;
|