dengzhiguo il y a 6 ans
Parent
commit
f6fb1c49ee

+ 103 - 102
js/component/manageCenter/customer/customerManagement/adminCustomerStatistics.jsx

@@ -29,7 +29,6 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 				endTime: this.state.releaseDate[1],
 			},
 			success: function(data) {
-				console.log(data);
 				let theArr = [];
 				if(!data.data) {
 					if(data.error && data.error.length) {
@@ -58,8 +57,8 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 					pageNo: pageNo,
 					dataSource: theArr,
 					pagination: this.state.pagination,
-					selectedRowKeys: [],
-					signBillVisible: false
+// 					selectedRowKeys: [],
+// 					signBillVisible: false
 				});
 			}.bind(this),
 		}).always(function() {
@@ -108,97 +107,7 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
-	getInitialState() {
-		return {
-			datauser: {},
-			selectedRowKeys: [],
-			releaseDate: [],
-			selectedRows: [],
-			departmentArr: [],
-			searchMore: true,
-			loading: false,
-			distributionVisible: false,
-			visible: false,
-			showDesc: false,
-			pagination: {
-				defaultCurrent: 1,
-				defaultPageSize: 10,
-				showQuickJumper: true,
-				pageSize: 10,
-				onChange: function(page) {
-					this.loadData(page);
-				}.bind(this),
-				showTotal: function(total) {
-					return '共' + total + '条数据';
-				}
-			},
-			paginationX: {
-				defaultCurrent: 1,
-				defaultPageSize: 10,
-				showQuickJumper: true,
-				pageSize: 10,
-				onChange: function(page) {
-					this.xiangmu(page);
-				}.bind(this),
-				showTotal: function(total) {
-					return '共' + total + '条数据';
-				}
-			},
-			columns: [{
-				title: '编号',
-				dataIndex: 'key',
-				key: 'key'
-			}, {
-				title: '营销员名称',
-				dataIndex: 'aName',
-				key: 'aName',
-			}, {
-				title: '部门名称',
-				dataIndex: 'depName',
-				key: 'depName',
-			}, {
-				title: '客户数',
-				dataIndex: 'userCount',
-				key: 'userCount',
-			}, {
-				title: '时间内客户数',
-				dataIndex: 'timeCount',
-				key: 'timeCount'
- 			}],
-			dataSource: [],
-			dataSourceX: [],
-			columnsX: [{
-				title: '客户ID',
-				dataIndex: 'id',
-				key: 'id'
-			}, {
-				title: '客户名称',
-				dataIndex: 'name',
-				key: 'name'
-			}, {
-				title: '来源',
-				dataIndex: 'sourceName',
-				key: 'sourceName'
-			}, {
-				title: '联系人',
-				dataIndex: 'contacts',
-				key: 'contacts'
-			}, {
-				title: '联系人电话',
-				dataIndex: 'contactMobile',
-				key: 'contactMobile'
-			}, {
-				title: '创建时间',
-				dataIndex: 'createTime',
-				key: 'createTime',
-			}, {
-				title: '跟进时间',
-				dataIndex: 'followTime',
-				key: 'followTime',
-			}]
-			
-		};
-	},
+	
 	//操作分配
 	confirmDelet(index) {
 		this.setState({
@@ -294,11 +203,102 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 		this.departmentList();
 		this.loadData();
 	},
+	
+	getInitialState() {
+		return {
+			rowKey : 0,
+			datauser: {},
+			selectedRowKeys: [],
+			releaseDate: [],
+			selectedRows: [],
+			departmentArr: [],
+			searchMore: true,
+			loading: false,
+			distributionVisible: false,
+			visible: false,
+			showDesc: false,
+			pagination: {
+				defaultCurrent: 1,
+				defaultPageSize: 10,
+				showQuickJumper: true,
+				pageSize: 10,
+				onChange: function(page) {
+					this.loadData(page);
+				}.bind(this),
+				showTotal: function(total) {
+					return '共' + total + '条数据';
+				}
+			},
+			paginationX: {
+				defaultCurrent: 1,
+				defaultPageSize: 10,
+				showQuickJumper: true,
+				pageSize: 10,
+				onChange: function(page) {
+					this.xiangmu(page,this.state.dataSource[this.state.rowKey-1].aid);
+				}.bind(this),
+				showTotal: function(total) {
+					return '共' + total + '条数据';
+				}
+			},
+			columns: [{
+				title: '编号',
+				dataIndex: 'key',
+				key: 'key'
+			}, {
+				title: '营销员名称',
+				dataIndex: 'aName',
+				key: 'aName',
+			}, {
+				title: '部门名称',
+				dataIndex: 'depName',
+				key: 'depName',
+			}, {
+				title: '客户数',
+				dataIndex: 'userCount',
+				key: 'userCount',
+			}, {
+				title: '时间内客户数',
+				dataIndex: 'timeCount',
+				key: 'timeCount'
+			}],
+			dataSource: [],
+			dataSourceX: [],
+			columnsX: [{
+				title: '客户名称',
+				dataIndex: 'name',
+				key: 'name'
+			}, {
+				title: '来源',
+				dataIndex: 'sourceName',
+				key: 'sourceName'
+			}, {
+				title: '联系人',
+				dataIndex: 'contacts',
+				key: 'contacts'
+			}, {
+				title: '联系人电话',
+				dataIndex: 'contactMobile',
+				key: 'contactMobile'
+			}, {
+				title: '创建时间',
+				dataIndex: 'createTime',
+				key: 'createTime',
+			}, {
+				title: '跟进时间',
+				dataIndex: 'followTime',
+				key: 'followTime',
+			}]
+			
+		};
+	},
+	
 	tableRowClick(record, index) {
+		this.xiangmu(1,record.aid);
 		this.setState({
 		    visible: true,
+			rowKey: record.key
 		});
-		this.xiangmu(record.aid);
 	},
 	xiangmu(pageNo,aids) {
 		this.state.data = [];
@@ -311,10 +311,11 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 			crossDomain: false,
 			url: globalConfig.context +"/api/admin/customer/selectAdminCustomerList",
 			data: {
+				pageNo:pageNo || 1,
+				pageSize:this.state.pagination.pageSizeX,
 				aid:aids,
 			},
 			success: function(data) {
-				console.log(data);
 				let theArr = [];
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {
@@ -334,7 +335,8 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 	                         followTime:thisdata.followTime,
 	                    });
 	                };
-					this.state.paginationX.current = data.data.pageNo;
+					this.state.paginationX.current = pageNo;
+					console.log();
 					this.state.paginationX.total = data.data.totalCount;
 				};
 				if(!data.data.list.length) {
@@ -342,11 +344,10 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 					this.state.paginationX.total = 0
 				}
 				this.setState({
-					pageNo: pageNo,
 					dataSourceX: theArr,
 					paginationX: this.state.paginationX,
-					selectedRowKeys: [],
-					signBillVisible: false
+// 					selectedRowKeys: [],
+// 					signBillVisible: false
 				});
 			}.bind(this),
 		}).always(function() {
@@ -422,7 +423,7 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">
-                	<span style={{fontSize:'16px'}}>结算订单管理</span>	
+                	<span style={{fontSize:'16px'}}>部门客户统计</span>	
 	                <div className="user-search">
  	                    {/*<Input placeholder="客户名称" style={{width:'150px'}}
  	                        value={this.state.buyerNameSearch}
@@ -460,7 +461,7 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 						<Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.visitOk} onCancel={this.visitCancel}
                         width='1000px'
-                        title='订单详情'
+                        title='客户详情'
                         footer=''
                         className="admin-desc-content">
 							<div className="patent-table">

+ 1 - 1
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -147,7 +147,7 @@ const PaiDan = React.createClass({
                     key: 'caouzo',
                     render:(text,recard)=>{
                         return <div>
-                            <Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>分派</Button>
+                            {recard.processStatus>2||<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>分派</Button>}
                         </div>
                     }
                 }

+ 0 - 19
js/component/manageCenter/order/orderNew/examine.jsx

@@ -146,10 +146,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			orgCodeUrl:[],
 			paginations:false,
 			confirmLoading: false,
-<<<<<<< HEAD
-=======
 			aloading:false,
->>>>>>> master
 			pagination: {
 				defaultCurrent: 1,
 				defaultPageSize: 10,
@@ -530,22 +527,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 		})
 	},
 	
-<<<<<<< HEAD
-	handleOk(){
-		this.setState({
-			reason:'',
-			confirmLoading: true,
-		});
-		setTimeout(() => {
-			this.setState({
-			noVisible: false,
-			confirmLoading: false,
-		});
-		}, 2000);
-    },
-	
-=======
->>>>>>> master
 	//关闭输入理由框
 	noCancel(){
 		this.setState({

+ 0 - 345
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.1.jsx

@@ -1,345 +0,0 @@
-import React from 'react';
-import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
-import ajax from 'jquery/src/ajax/xhr.js';
-import $ from 'jquery/src/ajax';
-import '../../userMangagement.less';
-import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
-
-const ManagementDetaile = Form.create()(React.createClass({
-	loadData(record) {
-        this.state.data = [];
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/customer/selectAdminCustomerList',
-            data: {
-            	orderNo:record?record.orderNo:this.props.datauser.orderNo
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
-                        theArr.push({
-                             key: i,
-                             id:thisdata.id,
-                             name:thisdata.name,
-                             sourceName:thisdata.sourceName,
-                             contacts:thisdata.contacts,
-                             contactMobile:thisdata.contactMobile,
-                             createTime:thisdata.createTime,
-                             followTime:thisdata.followTime,
-							 orderNo:thisdata.orderNo,
-// 							 commodityName:thisdata.commodityName,
-// 							 commodityType:thisdata.commodityType,
-// 							 commodityMode:thisdata.commodityMode,
-// 							 commodityQuantity:thisdata.commodityQuantity,
-// 							 commodityPrice:thisdata.commodityPrice,
-// 							 discountPrice:thisdata.discountPrice,
-// 							 commodityFirstPayment:thisdata.commodityFirstPayment,
-// 							 createTimes:thisdata.createTimes,
-// 							 discountFirstPayment:thisdata.discountFirstPayment,
-// 							 remarks:thisdata.remarks,
-//                              discountPrice:thisdata.discountPrice,
-//                              commodityFirstPayment:thisdata.commodityFirstPayment,
-//                              createTimes:thisdata.createTimes,
-//                              discountFirstPayment:thisdata.discountFirstPayment,
-//                              remarks:thisdata.remarks,
-                        });
-                    };
-					this.state.pagination.current = data.data.pageNo;
-					this.state.pagination.total = data.data.totalCount;
-                   }
-				   if(!data.data.list.length) {
-				   	this.state.pagination.current = 0
-				   	this.state.pagination.total = 0
-				   }
-                this.setState({
-                    pageNo: pageNo,
-                    dataSource: theArr,
-                    pagination: this.state.pagination,
-                    selectedRowKeys: [],
-                    signBillVisible: false
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
-	getInitialState() {
-		return {
-			loading: false,
-			visible: false,
-			lookState:true,
-			orgCodeUrl:[],
-			checkedKeys: [],
-			lookflowList:[],
-			columns: [
-				{
-                    title: '客户名称',
-                    dataIndex: 'name',
-                    key: 'name'
-                }, {
-                    title: '来源',
-                    dataIndex: 'sourceName',
-                    key: 'sourceName',
-                    render:(text)=>{
-                    	return (getOrderType(text))
-                    }
-                },{
-                    title: '联系人',
-                    dataIndex: 'contacts',
-                    key: 'contacts'
-                }, {
-                    title: '联系人电话',
-                    dataIndex: 'contactMobile',
-                    key: 'contactMobile'
-                }, {
-                    title: '创建时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime'
-                }, {
-                    title: '跟进时间',
-                    dataIndex: 'followTime',
-                    key: 'followTime'
-                }, 
-// 				{
-//                     title: '项目说明',
-//                     dataIndex: 'remarks',
-//                     key: 'remarks',
-// 					render:(text)=>{
-// 						return (text&&text.length>8?text.substr(0,8)+'…':text)
-// 					}
-//                 }
-			],
-			flowList:[
-				{
-                    title: '平台流水号',
-                    dataIndex: 'billNo',
-                    key: 'billNo',
-                }, {
-                    title: '平台流水时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime'
-                }, {
-                    title: '流水金额(万元)',
-                    dataIndex: 'transactionAmount',
-                    key: 'transactionAmount'
-                },{
-                    title: '付款人名称',
-                    dataIndex: 'payerName',
-                    key: 'payerName'
-                }, {
-                    title: '收款人名称',
-                    dataIndex: 'payeeName',
-                    key: 'payeeName'
-                },
-                {
-                    title: '流水科目',
-                    dataIndex: 'transactionSubject',
-                    key: 'transactionSubject',
-                    render:(text)=>{return getTransactionProject(text) }
-                }, {
-                    title: '流水渠道',
-                    dataIndex: 'transactionChannel',
-                    key: 'transactionChannel',
-                    render:(text)=>{return getTransactionChannel(text) }
-                },{
-                    title: '财务流水号',
-                    dataIndex: 'financialPayNo',
-                    key: 'financialPayNo',
-                }, {
-                    title: '财务流水时间',
-                    dataIndex: 'financialPayTime',
-                    key: 'financialPayTime',
-                }, {
-                    title: '流水确认',
-                    dataIndex: 'confirmSign',
-                    key: 'confirmSign',
-                    render:(text)=>{return text?'已确认':'待确认' }
-                },{
-                    title: '确认时间',
-                    dataIndex: 'confirmTime',
-                    key: 'confirmTime',
-                }
-			]
-		};
-	},
-	//查看基本详情基本信息
-    loaduser(record){
-    	if(record){
-    	this.state.orderList=[]
-    	$.ajax({
-            method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
-            data: {
-              orderNo: record.orderNo
-            },
-            success: function (data) {
-                let thisData = data.data;                
-                if (!thisData) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                    thisData = {};
-                };
-                this.setState({
-					id:thisData.id,
-					orderList:thisData,
-					orderAmount:thisData.orderAmount,
-					firstPayment:thisData.firstPayment,
-					signTotalAmount:thisData.signTotalAmount,
-					signFirstPayment:thisData.signFirstPayment,
-					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
-					orderRemarks:thisData.orderRemarks,
-                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
-               		//签单
-               		orderNo:thisData.orderNo,//订单编号
-               		buyerName:thisData.buyerName,
-                });
-            }.bind(this),
-       }).always(function () {
-            this.setState({            	
-                loading: false
-            });
-        }.bind(this));  
-       }
-    },
-	handleOk(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false, true);
-	},
-	handleCancel(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false);
-	},
-	nextCancel() {
-		this.setState({
-			addnextVisible: false
-		})
-	},
-	lookflow(){
-		this.setState({
-			loading: true,
-			lookVisible:true,
-		})
-		this.state.lookSource=[];
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
-            data: {
-            	orderNo:this.props.datauser.orderNo,
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.length; i++) {
-                        let thisdata = data.data[i];
-                        theArr.push({
-                             key: i,
-	                         billNo: thisdata.billNo,
-	                         transactionAmount:thisdata.transactionAmount,
-	                         createTime:thisdata.createTime, 
-	                         transactionAmount:thisdata.transactionAmount,
-	                         payerName:thisdata.payerName,
-	                         payeeName:thisdata.payeeName,
-	                         transactionSubject:thisdata.transactionSubject,
-	                         transactionChannel:thisdata.transactionChannel,
-	                         financialPayNo:thisdata.financialPayNo,
-	                         financialPayTime:thisdata.financialPayTime,
-	                         orderNo:thisdata.orderNo,
-	                         departmentName:thisdata.departmentName,
-	                         salesmanName:thisdata.salesmanName,
-	                         financeName:thisdata.financeName,
-	                         confirmSign:thisdata.confirmSign,
-	                         deleteSign:thisdata.deleteSign,
-	                         confirmTime:thisdata.confirmTime
-                        });
-                    };
-                };
-                this.setState({
-                    lookflowList: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-	},
-	lookCancel(){
-		this.setState({
-			lookVisible:false
-		})
-	},
-	tableRowClick(record, index) {
-       this.setState({
-        	editFw:record,
-        	addnextVisible:true,
-        });
-    },
-	componentWillMount() {
-		
-	},
-	componentWillReceiveProps(nextProps) { //props改变时触发
-		this.state.visible = nextProps.showDesc;
-		if(nextProps.userDetaile && nextProps.showDesc ) {
-			this.loaduser(nextProps.datauser);
-			this.loadData(nextProps.datauser);
-		}
-	},
-	render() {
-		const FormItem = Form.Item
-		const formItemLayout = {
-			labelCol: { span: 8 },
-			wrapperCol: { span: 14 },
-		};
-		const editFws=this.state.editFw || [];
-		const orderDetaiel=this.state.orderList || [];
-		return(
-			<div className="user-content" >
-			<Modal maskClosable={false} visible={this.state.visible}
-			            onOk={this.handleOk} onCancel={this.handleCancel}
-			            width='1000px'
-			            title='订单详情'                     
-			            footer=''
-			            className="admin-desc-content">
-			                <div className="content-title">
-				                {<div className="patent-table">
-				                    <Spin spinning={this.state.loading}>
-				                        <Table columns={this.state.columns}
-				                            dataSource={this.state.dataSource}
-				                            pagination={this.state.pagination}
-				                            onRowClick={this.tableRowClick} />
-				                    </Spin>
-				                </div>}
-				            </div >
-							</Modal>
-			            </div>
-		)
-	}
-}));
-
-export default ManagementDetaile;

+ 0 - 328
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.2.jsx

@@ -1,328 +0,0 @@
-import React from 'react';
-import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
-import ajax from 'jquery/src/ajax/xhr.js';
-import $ from 'jquery/src/ajax';
-import '../../userMangagement.less';
-import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
-import AdminCustomerStatistics from '../../../customer/customerManagement/adminCustomerStatistics.jsx'
-
-const ManagementDetaile = Form.create()(React.createClass({
-	loadData(record) {
-        this.state.data = [];
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/customer/selectAdminCustomerList',
-            data: {
-            	depId:this.state.name,
-				startTime:this.state.startTime,
-				end:this.state.end
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.length; i++) {
-                        let thisdata = data.data[i];
-                        theArr.push({
-                            key: i,
-                            id:thisdata.id,
-                            name:thisdata.name,
-                            sourceName:thisdata.sourceName,
-                            contacts:thisdata.contacts,
-                            contactMobile:thisdata.contactMobile,
-                            createTime:thisdata.createTime,
-                            followTime:thisdata.followTime,
-                            orderNo:thisdata.orderNo,
-                        });
-                    };
-                   }
-				console.log(theArr)
-                this.setState({
-                    dataSource: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
-	getInitialState() {
-		return {
-			loading: false,
-			visible: false,
-			lookState:true,
-			orgCodeUrl:[],
-			checkedKeys: [],
-			lookflowList:[],
-			dataSource:[],
-			columns: [
-							{
-			                    title: '客户名称',
-			                    dataIndex: 'name',
-			                    key: 'name'
-			                }, {
-			                    title: '来源',
-			                    dataIndex: 'sourceName',
-			                    key: 'sourceName',
-			                    render:(text)=>{
-			                    	return (getOrderType(text))
-			                    }
-			                },{
-			                    title: '联系人',
-			                    dataIndex: 'contacts',
-			                    key: 'contacts'
-			                }, {
-			                    title: '联系人电话',
-			                    dataIndex: 'contactMobile',
-			                    key: 'contactMobile'
-			                }, {
-			                    title: '创建时间',
-			                    dataIndex: 'createTime',
-			                    key: 'createTime'
-			                }, {
-			                    title: '跟进时间',
-			                    dataIndex: 'followTime',
-			                    key: 'followTime'
-			                }, 
-			// 				{
-			//                     title: '项目说明',
-			//                     dataIndex: 'remarks',
-			//                     key: 'remarks',
-			// 					render:(text)=>{
-			// 						return (text&&text.length>8?text.substr(0,8)+'…':text)
-			// 					}
-			//                 }
-						],
-			flowList:[
-				{
-                    title: '平台流水号',
-                    dataIndex: 'billNo',
-                    key: 'billNo',
-                }, {
-                    title: '平台流水时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime'
-                }, {
-                    title: '流水金额(万元)',
-                    dataIndex: 'transactionAmount',
-                    key: 'transactionAmount'
-                },{
-                    title: '付款人名称',
-                    dataIndex: 'payerName',
-                    key: 'payerName'
-                }, {
-                    title: '收款人名称',
-                    dataIndex: 'payeeName',
-                    key: 'payeeName'
-                },
-                {
-                    title: '流水科目',
-                    dataIndex: 'transactionSubject',
-                    key: 'transactionSubject',
-                    render:(text)=>{return getTransactionProject(text) }
-                }, {
-                    title: '流水渠道',
-                    dataIndex: 'transactionChannel',
-                    key: 'transactionChannel',
-                    render:(text)=>{return getTransactionChannel(text) }
-                },{
-                    title: '财务流水号',
-                    dataIndex: 'financialPayNo',
-                    key: 'financialPayNo',
-                }, {
-                    title: '财务流水时间',
-                    dataIndex: 'financialPayTime',
-                    key: 'financialPayTime',
-                }, {
-                    title: '流水确认',
-                    dataIndex: 'confirmSign',
-                    key: 'confirmSign',
-                    render:(text)=>{return text?'已确认':'待确认' }
-                },{
-                    title: '确认时间',
-                    dataIndex: 'confirmTime',
-                    key: 'confirmTime',
-                }
-			]
-		};
-	},
-	//查看基本详情基本信息
-    loaduser(record){
-    	if(record){
-    	this.state.orderList=[]
-    	$.ajax({
-            method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
-            data: {
-              orderNo: record.orderNo
-            },
-            success: function (data) {
-                let thisData = data.data;                
-                if (!thisData) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                    thisData = {};
-                };
-                this.setState({
-					id:thisData.id,
-					orderList:thisData,
-					orderAmount:thisData.orderAmount,
-					firstPayment:thisData.firstPayment,
-					signTotalAmount:thisData.signTotalAmount,
-					signFirstPayment:thisData.signFirstPayment,
-					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
-					orderRemarks:thisData.orderRemarks,
-                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
-               		//签单
-               		orderNo:thisData.orderNo,//订单编号
-               		buyerName:thisData.buyerName,
-                });
-            }.bind(this),
-       }).always(function () {
-            this.setState({            	
-                loading: false
-            });
-        }.bind(this));  
-       }
-    },
-	handleOk(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false, true);
-	},
-	handleCancel(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false);
-	},
-	nextCancel() {
-		this.setState({
-			addnextVisible: false
-		})
-	},
-	lookflow(){
-		this.setState({
-			loading: true,
-			lookVisible:true,
-		})
-		this.state.lookSource=[];
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
-            data: {
-            	orderNo:this.props.datauser.orderNo,
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.length; i++) {
-                        let thisdata = data.data[i];
-                        theArr.push({
-                             key: i,
-	                         billNo: thisdata.billNo,
-	                         transactionAmount:thisdata.transactionAmount,
-	                         createTime:thisdata.createTime, 
-	                         transactionAmount:thisdata.transactionAmount,
-	                         payerName:thisdata.payerName,
-	                         payeeName:thisdata.payeeName,
-	                         transactionSubject:thisdata.transactionSubject,
-	                         transactionChannel:thisdata.transactionChannel,
-	                         financialPayNo:thisdata.financialPayNo,
-	                         financialPayTime:thisdata.financialPayTime,
-	                         orderNo:thisdata.orderNo,
-	                         departmentName:thisdata.departmentName,
-	                         salesmanName:thisdata.salesmanName,
-	                         financeName:thisdata.financeName,
-	                         confirmSign:thisdata.confirmSign,
-	                         deleteSign:thisdata.deleteSign,
-	                         confirmTime:thisdata.confirmTime
-                        });
-                    };
-                };
-                this.setState({
-                    lookflowList: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-	},
-	lookCancel(){
-		this.setState({
-			lookVisible:false
-		})
-	},
-	tableRowClick(record, index) {
-       this.setState({
-        	editFw:record,
-        	addnextVisible:true,
-        });
-    },
-	componentWillMount() {
-		this.loadData();
-	},
-	componentWillReceiveProps(nextProps) { //props改变时触发
-		this.state.visible = nextProps.showDesc;
-		if(nextProps.userDetaile && nextProps.showDesc ) {
-			this.loaduser(nextProps.datauser);
-			this.loadData(nextProps.datauser);
-		}
-	},
-	render() {
-		const FormItem = Form.Item
-		const formItemLayout = {
-			labelCol: { span: 8 },
-			wrapperCol: { span: 14 },
-		};
-		const editFws=this.state.editFw || [];
-		const orderDetaiel=this.state.orderList || [];
-		return(
-			<div>
-				<Modal maskClosable={false} visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        title='订单详情'
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}  >
-			                <Spin spinning={this.state.loading}>
-					                <div className="patent-table">
-					                    <Spin spinning={this.state.loading}>
-					                        <Table columns={this.state.columns}
-					                            dataSource={this.state.dataSource}
-					                            pagination={true}
-					                            onRowClick={this.tableRowClick} 
-					                            />
-					                    </Spin>
-						            </div>
-			                </Spin>
-			            </Form >
-				</Modal> 
-    	    </div>
-		)
-	}
-}));
-
-export default ManagementDetaile;

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.0.51",
+  "version": "1.0.95",
   "description": "",
   "main": "index.js",
   "scripts": {