| 
					
				 | 
			
			
				@@ -3,7 +3,7 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import ajax from 'jquery/src/ajax/xhr.js'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import $ from 'jquery/src/ajax'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import '../../userMangagement.less'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType} from '../../../../tools.js'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //图片组件 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 const PicturesWall = React.createClass({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     getInitialState() { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -152,41 +152,56 @@ const MySettlementDetaile = Form.create()(React.createClass({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			projectList:[ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			flowList:[ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    title: '项目名称', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    dataIndex: 'commodityName', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    key: 'commodityName' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    title: '平台流水号', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    dataIndex: 'billNo', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    key: 'billNo', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }, { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    title: '项目类别', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    dataIndex: 'commodityType', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    key: 'commodityType', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    render:(text)=>{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    	return (getOrderType(text)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    title: '平台流水时间', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    dataIndex: 'createTime', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    key: 'createTime' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }, { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    title: '流水金额', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    dataIndex: 'transactionAmount', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    key: 'transactionAmount' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 },{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    title: '项目数量', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    dataIndex: 'commodityQuantity', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    key: 'commodityQuantity' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    title: '付款人名称', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    dataIndex: 'payerName', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    key: 'payerName' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }, { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    title: '收款人名称', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    dataIndex: 'payeeName', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    key: 'payeeName' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			flowList:[ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    title: '流水名称', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    dataIndex: 'commodityName', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    key: 'commodityName' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    title: '流水科目', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    dataIndex: 'transactionSubject', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    key: 'transactionSubject', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    render:(text)=>{return getTransactionProject(text) } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }, { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    title: '流水类别', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    dataIndex: 'commodityType', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    key: 'commodityType', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    render:(text)=>{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    	return (getOrderType(text)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    title: '流水渠道', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    dataIndex: 'transactionChannel', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    key: 'transactionChannel', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    render:(text)=>{return getTransactionChannel(text) } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 },{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    title: '流水数量', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    dataIndex: 'commodityQuantity', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    key: 'commodityQuantity' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    title: '财务流水号', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    dataIndex: 'financialPayNo', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    key: 'financialPayNo', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }, { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    title: '财务流水时间', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    dataIndex: 'financialPayTime', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    key: 'financialPayTime', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }, { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    title: '流水确认', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    dataIndex: 'confirmSign', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    key: 'confirmSign', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    render:(text)=>{return text?'已确认':'待确认' } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                },{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    title: '确认时间', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    dataIndex: 'confirmTime', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    key: 'confirmTime', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	}, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -559,7 +574,7 @@ const MySettlementDetaile = Form.create()(React.createClass({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			        </Modal> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			         <Modal maskClosable={false} visible={this.state.lookVisible} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         onOk={this.lookCancel} onCancel={this.lookCancel} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        width='1200px' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        width='1300px' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         title= '查看流水'                    
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         footer='' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         className="admin-desc-content"> 
			 |