|
@@ -4,7 +4,7 @@ import $ from 'jquery/src/ajax';
|
|
import moment from 'moment';
|
|
import moment from 'moment';
|
|
import '../distribute/public.less';
|
|
import '../distribute/public.less';
|
|
import { Button, Input, Spin, Table,Select, Switch, message, DatePicker } from 'antd';
|
|
import { Button, Input, Spin, Table,Select, Switch, message, DatePicker } from 'antd';
|
|
-import {getLiquidationStatus} from '@/tools';
|
|
|
|
|
|
+import {getTransactionProject } from '@/tools';
|
|
import WaterDesc from './waterDetail';
|
|
import WaterDesc from './waterDetail';
|
|
|
|
|
|
const MyWater = React.createClass({
|
|
const MyWater = React.createClass({
|
|
@@ -13,17 +13,13 @@ const MyWater = React.createClass({
|
|
loading: true
|
|
loading: true
|
|
});
|
|
});
|
|
$.ajax({
|
|
$.ajax({
|
|
- method: "post",
|
|
|
|
|
|
+ method: "get",
|
|
dataType: "json",
|
|
dataType: "json",
|
|
crossDomain: false,
|
|
crossDomain: false,
|
|
- url: globalConfig.context + "/api/admin/organization/listOrganizationManagement",
|
|
|
|
- data: {
|
|
|
|
- pageNo:1,
|
|
|
|
- pageSize:999,
|
|
|
|
- type:1
|
|
|
|
- },
|
|
|
|
|
|
+ url: globalConfig.context + "/api/admin/organization/selectSuperId",
|
|
|
|
+ data: {},
|
|
success: function(data) {
|
|
success: function(data) {
|
|
- let thedata = data.data.list;
|
|
|
|
|
|
+ let thedata = data.data;
|
|
let theArr=[];
|
|
let theArr=[];
|
|
if(!thedata) {
|
|
if(!thedata) {
|
|
if(data.error && data.error.length) {
|
|
if(data.error && data.error.length) {
|
|
@@ -52,6 +48,8 @@ const MyWater = React.createClass({
|
|
loadData(pageNo) {
|
|
loadData(pageNo) {
|
|
this.state.data = [];
|
|
this.state.data = [];
|
|
this.setState({
|
|
this.setState({
|
|
|
|
+ selectedRowKeys:[],
|
|
|
|
+ selectedRowKey:[],
|
|
page:pageNo,
|
|
page:pageNo,
|
|
loading: true
|
|
loading: true
|
|
});
|
|
});
|
|
@@ -63,10 +61,11 @@ const MyWater = React.createClass({
|
|
data: {
|
|
data: {
|
|
pageNo: pageNo || 1,
|
|
pageNo: pageNo || 1,
|
|
pageSize: this.state.pagination.pageSize,
|
|
pageSize: this.state.pagination.pageSize,
|
|
- ownerName: this.state.nameSearch,//客户名称
|
|
|
|
- departmentId:this.state.departmenttList,
|
|
|
|
- startDate: this.state.releaseDate[0],
|
|
|
|
- endDate: this.state.releaseDate[1],
|
|
|
|
|
|
+ departmentId:this.state.departmentId,
|
|
|
|
+ payeeName: this.state.payeeNameSearch,
|
|
|
|
+ payerName:this.state.payerNameSearch,
|
|
|
|
+ startTime: this.state.releaseDate[0],
|
|
|
|
+ endTime: this.state.releaseDate[1],
|
|
},
|
|
},
|
|
success: function (data) {
|
|
success: function (data) {
|
|
let theArr = [];
|
|
let theArr = [];
|
|
@@ -80,14 +79,16 @@ const MyWater = React.createClass({
|
|
theArr.push({
|
|
theArr.push({
|
|
key: i,
|
|
key: i,
|
|
orderNo: thisdata.orderNo,
|
|
orderNo: thisdata.orderNo,
|
|
- orderType:thisdata.orderType,
|
|
|
|
- orderStatus:thisdata.orderStatus,
|
|
|
|
- processStatus:thisdata.processStatus,
|
|
|
|
- projectStage:thisdata.projectStage,
|
|
|
|
- approval:thisdata.approval,
|
|
|
|
- creater:thisdata.creater,
|
|
|
|
- createTime:thisdata.createTime?(new Date(thisdata.createTime)).toLocaleString():'',
|
|
|
|
- signTime:thisdata.releaseDate?(new Date(thisdata.releaseDate)).toLocaleString():''
|
|
|
|
|
|
+ billNo:thisdata.billNo,
|
|
|
|
+ transactionAmount:thisdata.transactionAmount,
|
|
|
|
+ payeeName:thisdata.payeeName,
|
|
|
|
+ payerName:thisdata.payerName,
|
|
|
|
+ transactionSubject:thisdata.transactionSubject,
|
|
|
|
+ transactionChannel:thisdata.transactionChannel,
|
|
|
|
+ financialPayTimes:thisdata.createTime?(new Date(thisdata.createTime)).toLocaleString():'',
|
|
|
|
+ financialPayNo:thisdata.financialPayNo,
|
|
|
|
+ createrName:thisdata.createrName,
|
|
|
|
+ saleName:thisdata.saleName,
|
|
});
|
|
});
|
|
};
|
|
};
|
|
}
|
|
}
|
|
@@ -131,62 +132,47 @@ const MyWater = React.createClass({
|
|
columns: [
|
|
columns: [
|
|
{
|
|
{
|
|
title: '平台流水号',
|
|
title: '平台流水号',
|
|
- dataIndex: 'id',
|
|
|
|
- key: 'id',
|
|
|
|
|
|
+ dataIndex: 'billNo',
|
|
|
|
+ key: 'billNo',
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- title: '平台流水时间',
|
|
|
|
- dataIndex: 'createTime',
|
|
|
|
- key: 'createTime',
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
title: '金额',
|
|
title: '金额',
|
|
- dataIndex: 'orderNo',
|
|
|
|
- key: 'orderNo',
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- title: '付款方',
|
|
|
|
- dataIndex: 'category',
|
|
|
|
- key: 'category',
|
|
|
|
- render:text=>{
|
|
|
|
- return text&&text>8?text.substr(0,8)+'...':text
|
|
|
|
- }
|
|
|
|
|
|
+ dataIndex: 'transactionAmount',
|
|
|
|
+ key: 'transactionAmount',
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '收款方',
|
|
title: '收款方',
|
|
- dataIndex: 'orderStatus',
|
|
|
|
- key: 'orderStatus',
|
|
|
|
- render:text=>{
|
|
|
|
- return text&&text>8?text.substr(0,8)+'...':text
|
|
|
|
- }
|
|
|
|
|
|
+ dataIndex: 'payeeName',
|
|
|
|
+ key: 'payeeName',
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ title: '付款方',
|
|
|
|
+ dataIndex: 'payerName',
|
|
|
|
+ key: 'payerName',
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '流水科目',
|
|
title: '流水科目',
|
|
- dataIndex: 'creater',
|
|
|
|
- key: 'creater'
|
|
|
|
|
|
+ dataIndex: 'transactionSubject',
|
|
|
|
+ key: 'transactionSubject',
|
|
|
|
+ render: text => { return getTransactionProject(text)}
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- title: '交易渠道',
|
|
|
|
- dataIndex: 'liquidationStatus',
|
|
|
|
- key: 'liquidationStatus',
|
|
|
|
- render: text => { return getLiquidationStatus(text)}
|
|
|
|
- },{
|
|
|
|
- title: '交易时间',
|
|
|
|
- dataIndex: 'liquidationStatus1',
|
|
|
|
- key: 'liquidationStatus1',
|
|
|
|
|
|
+ title: '财务流水时间',
|
|
|
|
+ dataIndex: 'financialPayTimes',
|
|
|
|
+ key: 'financialPayTimes',
|
|
}, {
|
|
}, {
|
|
title: '财务流水号',
|
|
title: '财务流水号',
|
|
- dataIndex: 'creater1',
|
|
|
|
- key: 'creater1'
|
|
|
|
|
|
+ dataIndex: 'financialPayNo',
|
|
|
|
+ key: 'financialPayNo'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '订单编号',
|
|
title: '订单编号',
|
|
- dataIndex: 'creater2',
|
|
|
|
- key: 'creater2'
|
|
|
|
|
|
+ dataIndex: 'orderNo',
|
|
|
|
+ key: 'orderNo'
|
|
},{
|
|
},{
|
|
title: '订单负责人',
|
|
title: '订单负责人',
|
|
- dataIndex: 'creater3',
|
|
|
|
- key: 'creater3'
|
|
|
|
|
|
+ dataIndex: 'saleName',
|
|
|
|
+ key: 'saleName'
|
|
},
|
|
},
|
|
],
|
|
],
|
|
dataSource: [],
|
|
dataSource: [],
|
|
@@ -213,10 +199,10 @@ const MyWater = React.createClass({
|
|
this.loadData();
|
|
this.loadData();
|
|
},
|
|
},
|
|
reset() {
|
|
reset() {
|
|
- this.state.orderRefundSearch='';
|
|
|
|
|
|
+ this.state.payeeNameSearch='';
|
|
this.state.releaseDate = [];
|
|
this.state.releaseDate = [];
|
|
- this.state.departmenttList=undefined;
|
|
|
|
- this.state.orderNoSearch='';
|
|
|
|
|
|
+ this.state.payerNameSearch='';
|
|
|
|
+ this.state.departmentId=undefined;
|
|
this.loadData();
|
|
this.loadData();
|
|
},
|
|
},
|
|
searchSwitch() {
|
|
searchSwitch() {
|
|
@@ -244,8 +230,8 @@ const MyWater = React.createClass({
|
|
<div className="user-search">
|
|
<div className="user-search">
|
|
<Select placeholder="订单部门"
|
|
<Select placeholder="订单部门"
|
|
style={{ width: 150 ,marginRight:10}}
|
|
style={{ width: 150 ,marginRight:10}}
|
|
- value={this.state.departmenttList}
|
|
|
|
- onChange={(e) => { this.setState({ departmenttList: e }) }}>
|
|
|
|
|
|
+ value={this.state.departmentId}
|
|
|
|
+ onChange={(e) => { this.setState({ departmentId: e }) }}>
|
|
{
|
|
{
|
|
departmentArr.map(function (item) {
|
|
departmentArr.map(function (item) {
|
|
return <Select.Option key={item.id} >{item.name}</Select.Option>
|
|
return <Select.Option key={item.id} >{item.name}</Select.Option>
|
|
@@ -253,11 +239,11 @@ const MyWater = React.createClass({
|
|
}
|
|
}
|
|
</Select>
|
|
</Select>
|
|
<Input placeholder="收款方"
|
|
<Input placeholder="收款方"
|
|
- value={this.state.orderRefundSearch}
|
|
|
|
- onChange={(e) => { this.setState({ orderRefundSearch: e.target.value }); }} />
|
|
|
|
|
|
+ value={this.state.payeeNameSearch}
|
|
|
|
+ onChange={(e) => { this.setState({ payeeNameSearch: e.target.value }); }} />
|
|
<Input placeholder="付款方"
|
|
<Input placeholder="付款方"
|
|
- value={this.state.orderNoSearch}
|
|
|
|
- onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
|
|
|
|
|
|
+ value={this.state.payerNameSearch}
|
|
|
|
+ onChange={(e) => { this.setState({ payerNameSearch: e.target.value }); }} />
|
|
<Button type="primary" onClick={this.search}>搜索</Button>
|
|
<Button type="primary" onClick={this.search}>搜索</Button>
|
|
<Button onClick={this.reset}>重置</Button>
|
|
<Button onClick={this.reset}>重置</Button>
|
|
<span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
|
|
<span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
|