|
@@ -3,13 +3,49 @@ import ajax from 'jquery/src/ajax/xhr.js';
|
|
|
import $ from 'jquery/src/ajax';
|
|
|
import moment from 'moment';
|
|
|
import './public.less';
|
|
|
-import { Button,Form, Input, Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
|
|
|
+import { Button,Form, Input, Spin, Table, Select,Switch, message, DatePicker, Modal } from 'antd';
|
|
|
import OrderDesc from '../orderDetail/orderDesc'
|
|
|
import Receivable from './receivable';
|
|
|
import {getLiquidationStatus,getNewOrderStatus} from '@/tools';
|
|
|
const FormItem = Form.Item;
|
|
|
|
|
|
const ShouKuang = React.createClass({
|
|
|
+ departmentList() {
|
|
|
+ this.setState({
|
|
|
+ loading: true
|
|
|
+ });
|
|
|
+ $.ajax({
|
|
|
+ method: "get",
|
|
|
+ dataType: "json",
|
|
|
+ crossDomain: false,
|
|
|
+ url: globalConfig.context + "/api/admin/organization/selectSuperId",
|
|
|
+ data: {},
|
|
|
+ success: function(data) {
|
|
|
+ let thedata = data.data;
|
|
|
+ let theArr=[];
|
|
|
+ if(!thedata) {
|
|
|
+ if(data.error && data.error.length) {
|
|
|
+ message.warning(data.error[0].message);
|
|
|
+ };
|
|
|
+ }else{
|
|
|
+ thedata.map(function(item,index){
|
|
|
+ theArr.push({
|
|
|
+ key:index,
|
|
|
+ name:item.name,
|
|
|
+ id:item.id,
|
|
|
+ })
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.setState({
|
|
|
+ departmentArr:theArr,
|
|
|
+ })
|
|
|
+ }.bind(this),
|
|
|
+ }).always(function() {
|
|
|
+ this.setState({
|
|
|
+ loading: false
|
|
|
+ });
|
|
|
+ }.bind(this));
|
|
|
+ },
|
|
|
loadData(pageNo) {
|
|
|
this.state.data = [];
|
|
|
this.setState({
|
|
@@ -30,6 +66,7 @@ const ShouKuang = React.createClass({
|
|
|
orderNo:this.state.orderNoSearch,
|
|
|
startTime: this.state.releaseDate[0],
|
|
|
endTime: this.state.releaseDate[1],
|
|
|
+ departmentId:this.state.departmenttList
|
|
|
},
|
|
|
success: function (data) {
|
|
|
let theArr = [];
|
|
@@ -186,6 +223,7 @@ const ShouKuang = React.createClass({
|
|
|
},
|
|
|
componentWillMount() {
|
|
|
this.loadData();
|
|
|
+ this.departmentList();
|
|
|
},
|
|
|
tableRowClick(record, index) {
|
|
|
this.state.RowData = record;
|
|
@@ -213,6 +251,7 @@ const ShouKuang = React.createClass({
|
|
|
this.state.nameSearch = '';
|
|
|
this.state.releaseDate = [];
|
|
|
this.state.orderNoSearch='';
|
|
|
+ this.state.departmenttList=undefined;
|
|
|
this.loadData();
|
|
|
},
|
|
|
//驳回
|
|
@@ -261,9 +300,9 @@ const ShouKuang = React.createClass({
|
|
|
});
|
|
|
}
|
|
|
};
|
|
|
- const hasSelected = this.state.selectedRowKeys.length > 0;
|
|
|
const { RangePicker } = DatePicker;
|
|
|
const hasSelect = this.state.selectedRowKeys.length;
|
|
|
+ var departmentArr = this.state.departmentArr ||[];
|
|
|
return ( <div className="user-content">
|
|
|
<div className="content-title">
|
|
|
<span>收款结算</span>
|
|
@@ -275,6 +314,16 @@ const ShouKuang = React.createClass({
|
|
|
<Input placeholder="客户名称"
|
|
|
value={this.state.nameSearch}
|
|
|
onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
|
|
|
+ <Select placeholder="订单部门"
|
|
|
+ style={{ width: 150 ,marginRight:10}}
|
|
|
+ value={this.state.departmenttList}
|
|
|
+ onChange={(e) => { this.setState({ departmenttList: e }) }}>
|
|
|
+ {
|
|
|
+ departmentArr.map(function (item) {
|
|
|
+ return <Select.Option key={item.id} >{item.name}</Select.Option>
|
|
|
+ })
|
|
|
+ }
|
|
|
+ </Select>
|
|
|
<Button type="primary" onClick={this.search}>搜索</Button>
|
|
|
<Button onClick={this.reset}>重置</Button>
|
|
|
<span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
|