Browse Source

修改个BUGG

dengzhiguo 6 years ago
parent
commit
efe7b24b50

+ 9 - 0
js/component/manageCenter/customer/content.jsx

@@ -167,6 +167,15 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+			//部门客户管理
+			case 'adminCustomerStatistics':
+			    require.ensure([], () => {
+			        const AdminCustomerStatistics = require('./customerManagement/adminCustomerStatistics').default;
+			        this.setState({
+			            component:<AdminCustomerStatistics ApiUrl={''}/>,	                    	                  
+			        });
+			    });
+			    break;	
           	//单位客户管理
           	case 'organizationManage':
                 require.ensure([], () => {

+ 562 - 0
js/component/manageCenter/customer/customerManagement/adminCustomerStatistics.1.jsx

@@ -0,0 +1,562 @@
+"use strict";
+import React from 'react';
+import ReactDom from 'react-dom';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import { Form, Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload, Popconfirm } from 'antd';
+import ManagementDetaile from "../../order/settlementOrder/settlementManage/managementDetaile.jsx";
+import moment from 'moment';
+import '../../order/userMangagement.less';
+import { orderState, orderChannel, orderType } from '../../../dataDic.js';
+import { getProjectState, getOrderChannel, getOrderType, getOrderState, getPaymentState, getApprovedState } from '../../../tools.js';
+
+const AdminCustomerStatistics = Form.create()(React.createClass({
+	loadData(pageNo) {
+		this.state.data = [];
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/listAllSettlement',
+			data: {
+				pageNo: pageNo || 1,
+				pageSize: this.state.pagination.pageSize,
+				buyerName: this.state.buyerNameSearch,
+				depId: this.state.departmenttSearch, //部门
+				salesmanName: this.state.salesmanNameSearch, //负责人
+				startDate: this.state.releaseDate[0],
+				endDate: this.state.releaseDate[1],
+				liquidationStatus: this.state.liquidationStatusSearch, //结算
+				orderStatus: this.state.orderStatusSearch,
+				orderChannel: this.state.orderChannelSearch,
+				financeName: this.state.financeNameSearchs,
+				orderType: this.state.orderTypeSearch,
+				orderNo: this.state.orderNoSearch,
+				isDistributionFinance: this.state.isDistributionFinance
+			},
+			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,
+							orderNo: thisdata.orderNo, //订单编号
+							orderType: thisdata.orderType, //订单类型
+							orderStatus: thisdata.orderStatus,
+							liquidationStatus: thisdata.liquidationStatus,
+							createTime: thisdata.createTime,
+							buyerName: thisdata.buyerName,
+							signTotalAmount: thisdata.signTotalAmount,
+							projectStage: thisdata.projectStage,
+							approval: thisdata.approval,
+							orderChannel: thisdata.orderChannel,
+							salesmanName: thisdata.salesmanName,
+							active: thisdata.active,
+							departmentName: thisdata.departmentName,
+							salesmanName: thisdata.salesmanName,
+							financeName: thisdata.financeName,
+							technicianName: thisdata.technicianName,
+						});
+					};
+					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));
+	},
+	//部门
+	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);
+					};
+					thedata = {};
+				} 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));
+	},
+	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 + '条数据';
+				}
+			},
+			columns: [{
+				title: '编号',
+				dataIndex: 'orderNo',
+				key: 'orderNo'
+			}, {
+				title: '营销员名称',
+				dataIndex: 'orderType',
+				key: 'orderType',
+				render: text => {
+					return getOrderType(text)
+				}
+			}, {
+				title: '部门名称',
+				dataIndex: 'createTime',
+				key: 'createTime'
+			}, {
+				title: '客户数',
+				dataIndex: 'buyerName',
+				key: 'buyerName',
+				render: (text) => {
+					return(text && text.length > 9 ? text.substr(0, 9) + '...' : text)
+				}
+			}, {
+				title: '时间内客户数',
+				dataIndex: 'signTotalAmount',
+				key: 'signTotalAmount'
+// 			}, {
+// 				title: '订单状态',
+// 				dataIndex: 'orderStatus',
+// 				key: 'orderStatus',
+// 				render: (text) => {
+// 					return getOrderState(text)
+// 				}
+// 			}, {
+// 				title: '结算状态',
+// 				dataIndex: 'liquidationStatus',
+// 				key: 'liquidationStatus',
+// 				render: text => {
+// 					return getPaymentState(text)
+// 				}
+// 			}, {
+// 				title: '项目状态',
+// 				dataIndex: 'projectStage',
+// 				key: 'projectStage',
+// 				render: text => {
+// 					return getProjectState(text)
+// 				}
+// 			}, {
+// 				title: '是否特批',
+// 				dataIndex: 'approval',
+// 				key: 'approval',
+// 				render: text => {
+// 					return getApprovedState(text)
+// 				}
+// 			}, {
+// 				title: '订单部门',
+// 				dataIndex: 'departmentName',
+// 				key: 'departmentName',
+// 			}, {
+// 				title: '订单负责人',
+// 				dataIndex: 'salesmanName',
+// 				key: 'salesmanName',
+// 			}, {
+// 				title: '财务负责人',
+// 				dataIndex: 'financeName',
+// 				key: 'financeName',
+// 			}, {
+// 				title: '项目负责人',
+// 				dataIndex: 'technicianName',
+// 				key: 'technicianName',
+// 			}, {
+// 				title: '操作',
+// 				dataIndex: 'operation',
+// 				key: 'operation',
+// 				render: (text, record, index) => {
+// 					return <div>
+// 							    	{!record.financeName&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>}                
+//                         	 </div>
+// 				}
+ 			}],
+			userList: [{
+				title: '用户编号',
+				dataIndex: 'userNo',
+				key: 'userNo'
+			}, {
+				title: '用户姓名',
+				dataIndex: 'name',
+				key: 'name'
+			}, {
+				title: '部门机构',
+				dataIndex: 'departmentName',
+				key: 'departmentName'
+			}, {
+				title: '职务',
+				dataIndex: 'position',
+				key: 'position'
+			}, {
+				title: '联系手机',
+				dataIndex: 'mobile',
+				key: 'mobile'
+			}, {
+				title: '操作',
+				dataIndex: 'abc',
+				key: 'abc',
+				render: (text, record, index) => {
+					return(
+						<Popconfirm title={'您确认将订单 【'+ this.state.orderNot+'】 分配给【'+record.departmentName+'-'+record.name+'】进行业务跟进?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
+							</Popconfirm>
+					)
+				}
+			}],
+			dataSource: [],
+		};
+	},
+	//操作分配
+	confirmDelet(index) {
+		this.setState({
+			orderNot: index.orderNo,
+			userDetaile: false,
+			distributionVisible: true
+		});
+	},
+	distributionCancel() {
+		this.setState({
+			distributionVisible: false
+		})
+	},
+	distributionOk() {
+		this.setState({
+			distributionVisible: false
+		})
+	},
+	//分配对象列表
+	contactList() {
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/superviser/adminList',
+			data: {
+				pageNo: 1,
+				pageSize: 99,
+				departmentId: this.state.departmenttList,
+				name: this.state.financeNameSearch,
+			},
+			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,
+							userNo: thisdata.userNo,
+							name: thisdata.name,
+							departmentName: thisdata.departmentName,
+							departmentId: thisdata.departmentId,
+							position: thisdata.position,
+							mobile: thisdata.mobile,
+						});
+					};
+
+				};
+
+				this.setState({
+					distributionList: theArr,
+				});
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
+	//选定对象
+	confirmSelect(record) {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/order/distributionOrder",
+			data: {
+				orderNo: this.state.orderNot,
+				financeId: record.id
+			}
+		}).done(function(data) {
+			if(!data.error.length) {
+				message.success('分派成功!');
+				this.setState({
+					loading: false,
+				});
+				this.distributionOk();
+			} else {
+				message.warning(data.error[0].message);
+			};
+			this.loadData(this.state.pageNo);
+		}.bind(this));
+	},
+	componentWillMount() {
+		this.departmentList();
+		this.loadData();
+	},
+	tableRowClick(record, index) {
+		this.state.userDetaile = true;
+		this.state.datauser = record;
+		this.setState({
+			showDesc: true
+		});
+	},
+	closeDesc(e, s) {
+		this.state.userDetaile = false;
+		this.state.showDesc = e;
+		if(s) {
+			this.loadData(this.state.pageNo);
+		};
+	},
+	searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+	search() {
+		this.loadData();
+	},
+	//分配时搜索
+	searchOrder() {
+		this.contactList();
+	},
+	//分配时重置
+	resetOrder() {
+		this.setState({
+			departmenttList: undefined,
+			financeNameSearch: ''
+		})
+	},
+	reset() {
+		this.state.buyerNameSearch = '';
+		this.state.financeNameSearchs = '';
+		this.state.orderNoSearch = '';
+		this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+		this.state.orderChannelSearch = undefined;
+		this.state.liquidationStatusSearch = undefined;
+		this.state.orderStatusSearch = undefined;
+		this.state.salesmanNameSearch = undefined;
+		this.state.departmenttSearch = undefined;
+		this.state.approved = undefined;
+		this.state.orderChannelSearch = undefined;
+		this.state.orderTypeSearch = undefined;
+		this.state.isDistributionFinance = undefined;
+		this.loadData();
+	},
+	render() {
+		const rowSelection = {
+			selectedRowKeys: this.state.selectedRowKeys,
+			onChange: (selectedRowKeys, selectedRows) => {
+				this.setState({
+					selectedRows: selectedRows.slice(-1),
+					selectedRowKeys: selectedRowKeys.slice(-1)
+				});
+			},
+			onSelectAll: (selected, selectedRows, changeRows) => {
+				this.setState({
+					selectedRowKeys: []
+				})
+			},
+		};
+		let departmentArr = this.state.departmentArr || [];
+		const hasSelected = this.state.selectedRowKeys.length > 0;
+		const {
+			RangePicker
+		} = DatePicker;
+		return(
+			<div className="user-content" >
+                <div className="content-title">
+                	<span style={{fontSize:'16px'}}>结算订单管理</span>	
+	                <div className="user-search">
+ 	                    {/*<Input placeholder="客户名称" style={{width:'150px'}}
+ 	                        value={this.state.buyerNameSearch}
+	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
+						*/}
+	                    <RangePicker
+		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} /> 
+		                <Select placeholder="订单部门"
+	                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
+	                            value={this.state.departmenttSearch}
+	                            onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
+	                            {
+                                    departmentArr.map(function (item) {
+                                            return <Select.Option key={item.id} >{item.name}</Select.Option>
+                                    })
+                                }
+	                    </Select> 
+	                    {/*<Input placeholder="订单负责人" style={{width:'150px'}}
+	                        value={this.state.salesmanNameSearch}
+	                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
+	                    <Input placeholder="财务负责人" style={{width:'150px'}}
+	                        value={this.state.financeNameSearchs}
+	                        onChange={(e) => { this.setState({ financeNameSearchs: e.target.value }); }} />
+							*/}  
+	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
+	                    <Button onClick={this.reset}>重置</Button>
+	                    {/*<span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+						*/}    
+	                </div>
+	                <div className='clearfix' style={{marginTop:'5px'}}>
+	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
+	                        <Input placeholder="订单编号" style={{width:'150px'}}
+	                        	value={this.state.orderNoSearch}
+	                        	onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
+	                        {/*<Select placeholder="订单类型"
+	                            style={{ width: 150 }}
+	                            value={this.state.orderTypeSearch}
+	                            onChange={(e) => { this.setState({ orderTypeSearch: e }) }}>
+	                            {
+                                    orderType.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        */}
+	                        <Select placeholder="订单状态"
+	                            style={{ width: 150 ,margin:'10px'}}
+	                            value={this.state.orderStatusSearch}
+	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
+	                            {
+                                    orderState.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="是否分配财务"
+	                            style={{ width: 150 }}
+	                            value={this.state.isDistributionFinance }
+	                            onChange={(e) => { this.setState({ isDistributionFinance: e }) }}>
+	                            <Select.Option value="1">已分配 </Select.Option>
+	                            <Select.Option value="0">未分配 </Select.Option>
+	                        </Select>
+	                    </div>
+	                </div>
+	                <div className="patent-table">
+	                    <Spin spinning={this.state.loading}>
+	                        <Table columns={this.state.columns}
+	                            dataSource={this.state.dataSource}
+	                            rowSelection={rowSelection}
+	                            pagination={this.state.pagination}
+	                            onRowClick={this.tableRowClick} />
+	                    </Spin>
+	                </div>
+	                <ManagementDetaile
+	                	confirmDelet={this.confirmDelet}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser}
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />
+	            </div >
+	            <Modal maskClosable={false} visible={this.state.distributionVisible}
+                        onOk={this.distributionOk} onCancel={this.distributionCancel}
+                        width='800px'
+                        title='分派财务订单'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
+			                <Spin spinning={this.state.loading}>
+			                	<div>
+			                		<Select placeholder="部门"
+				                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
+				                            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>
+				                    <Input placeholder="财务负责人" style={{width:'150px',marginLeft:'10px'}}
+				                        value={this.state.financeNameSearch}
+				                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />  
+				                    <Button type="primary" onClick={this.searchOrder} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+	                    			<Button onClick={this.resetOrder}>重置</Button>
+			                	</div>
+			                	 <div className="patent-table" style={{marginTop:'10px'}}>
+				                    <Spin spinning={this.state.loading}>
+				                        <Table columns={this.state.userList}
+				                            dataSource={this.state.distributionList}
+				                            pagination={false}
+				                             />
+				                    </Spin>
+				                </div>
+			                </Spin>
+			            </Form>
+			    </Modal>
+            </div>
+		);
+	}
+}));
+
+export default AdminCustomerStatistics;

+ 571 - 0
js/component/manageCenter/customer/customerManagement/adminCustomerStatistics.jsx

@@ -0,0 +1,571 @@
+"use strict";
+import React from 'react';
+import ReactDom from 'react-dom';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import { Form, Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload, Popconfirm } from 'antd';
+import ManagementDetaile from "../../order/settlementOrder/settlementManage/managementDetaile.2.jsx";
+import moment from 'moment';
+import '../../order/userMangagement.less';
+import { orderState, orderChannel, orderType } from '../../../dataDic.js';
+import { getProjectState, getOrderChannel, getOrderType, getOrderState, getPaymentState, getApprovedState } from '../../../tools.js';
+
+const AdminCustomerStatistics = Form.create()(React.createClass({
+	loadData(pageNo) {
+		this.state.data = [];
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/customer/selectAdminCustomerStatistics',
+			data: {
+				pageNo: pageNo || 1,
+				pageSize: this.state.pagination.pageSize,
+				buyerName: this.state.buyerNameSearch,
+				depId: this.state.departmenttSearch, //部门
+				salesmanName: this.state.salesmanNameSearch, //负责人
+				startTime: this.state.releaseDate[0],
+				endTime: this.state.releaseDate[1],
+				liquidationStatus: this.state.liquidationStatusSearch, //结算
+				orderStatus: this.state.orderStatusSearch,
+				orderChannel: this.state.orderChannelSearch,
+				financeName: this.state.financeNameSearchs,
+				orderType: this.state.orderTypeSearch,
+				orderNo: this.state.orderNoSearch,
+				isDistributionFinance: this.state.isDistributionFinance
+			},
+			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+1,
+							aid:thisdata.aid,		 
+							aName:thisdata.aName,		
+							depName:thisdata.depName,		
+							userCount:thisdata.userCount,			
+							timeCount:thisdata.timeCount,
+// 							key: i,
+// 							id: thisdata.id,
+// 							orderNo: thisdata.orderNo, //订单编号
+// 							orderType: thisdata.orderType, //订单类型
+// 							orderStatus: thisdata.orderStatus,
+// 							liquidationStatus: thisdata.liquidationStatus,
+// 							createTime: thisdata.createTime,
+// 							buyerName: thisdata.buyerName,
+// 							signTotalAmount: thisdata.signTotalAmount,
+// 							projectStage: thisdata.projectStage,
+// 							approval: thisdata.approval,
+// 							orderChannel: thisdata.orderChannel,
+// 							salesmanName: thisdata.salesmanName,
+// 							active: thisdata.active,
+// 							departmentName: thisdata.departmentName,
+// 							salesmanName: thisdata.salesmanName,
+// 							financeName: thisdata.financeName,
+// 							technicianName: thisdata.technicianName,
+						});
+					};
+					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));
+	},
+	//部门
+	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);
+					};
+					thedata = {};
+				} 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));
+	},
+	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 + '条数据';
+				}
+			},
+			columns: [{
+				title: '编号',
+				dataIndex: 'key',
+				key: 'key'
+			}, {
+				title: '营销员名称',
+				dataIndex: 'aName',
+				key: 'aName',
+// 				render: text => {
+// 					return getOrderType(text)
+// 				}
+			}, {
+				title: '部门名称',
+				dataIndex: 'depName',
+				key: 'depName',
+// 				render: (text) => {
+// 					return(text && text.length > 9 ? text.substr(0, 9) + '...' : text)
+// 				}
+			}, {
+				title: '客户数',
+				dataIndex: 'userCount',
+				key: 'userCount',
+// 				render: (text) => {
+// 					return(text && text.length > 9 ? text.substr(0, 9) + '...' : text)
+// 				}
+			}, {
+				title: '时间内客户数',
+				dataIndex: 'timeCount',
+				key: 'timeCount'
+// 			}, {
+// 				title: '订单状态',
+// 				dataIndex: 'orderStatus',
+// 				key: 'orderStatus',
+// 				render: (text) => {
+// 					return getOrderState(text)
+// 				}
+// 			}, {
+// 				title: '结算状态',
+// 				dataIndex: 'liquidationStatus',
+// 				key: 'liquidationStatus',
+// 				render: text => {
+// 					return getPaymentState(text)
+// 				}
+// 			}, {
+// 				title: '项目状态',
+// 				dataIndex: 'projectStage',
+// 				key: 'projectStage',
+// 				render: text => {
+// 					return getProjectState(text)
+// 				}
+// 			}, {
+// 				title: '是否特批',
+// 				dataIndex: 'approval',
+// 				key: 'approval',
+// 				render: text => {
+// 					return getApprovedState(text)
+// 				}
+// 			}, {
+// 				title: '订单部门',
+// 				dataIndex: 'departmentName',
+// 				key: 'departmentName',
+// 			}, {
+// 				title: '订单负责人',
+// 				dataIndex: 'salesmanName',
+// 				key: 'salesmanName',
+// 			}, {
+// 				title: '财务负责人',
+// 				dataIndex: 'financeName',
+// 				key: 'financeName',
+// 			}, {
+// 				title: '项目负责人',
+// 				dataIndex: 'technicianName',
+// 				key: 'technicianName',
+// 			}, {
+// 				title: '操作',
+// 				dataIndex: 'operation',
+// 				key: 'operation',
+// 				render: (text, record, index) => {
+// 					return <div>
+// 							    	{!record.financeName&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>}                
+//                         	 </div>
+// 				}
+ 			}],
+			userList: [{
+				title: '用户编号',
+				dataIndex: 'userNo',
+				key: 'userNo'
+			}, {
+				title: '用户姓名',
+				dataIndex: 'name',
+				key: 'name'
+			}, {
+				title: '部门机构',
+				dataIndex: 'departmentName',
+				key: 'departmentName'
+			}, {
+				title: '职务',
+				dataIndex: 'position',
+				key: 'position'
+			}, {
+				title: '联系手机',
+				dataIndex: 'mobile',
+				key: 'mobile'
+			}, {
+				title: '操作',
+				dataIndex: 'abc',
+				key: 'abc',
+				render: (text, record, index) => {
+					return(
+						<Popconfirm title={'您确认将订单 【'+ this.state.orderNot+'】 分配给【'+record.departmentName+'-'+record.name+'】进行业务跟进?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
+							</Popconfirm>
+					)
+				}
+			}],
+			dataSource: [],
+		};
+	},
+	//操作分配
+	confirmDelet(index) {
+		this.setState({
+			orderNot: index.orderNo,
+			userDetaile: false,
+			distributionVisible: true
+		});
+	},
+	distributionCancel() {
+		this.setState({
+			distributionVisible: false
+		})
+	},
+	distributionOk() {
+		this.setState({
+			distributionVisible: false
+		})
+	},
+	//分配对象列表
+	contactList() {
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/superviser/adminList',
+			data: {
+				pageNo: 1,
+				pageSize: 99,
+				departmentId: this.state.departmenttList,
+				name: this.state.financeNameSearch,
+			},
+			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,
+							userNo: thisdata.userNo,
+							name: thisdata.name,
+							departmentName: thisdata.departmentName,
+							departmentId: thisdata.departmentId,
+							position: thisdata.position,
+							mobile: thisdata.mobile,
+						});
+					};
+
+				};
+
+				this.setState({
+					distributionList: theArr,
+				});
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
+	//选定对象
+	confirmSelect(record) {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/order/distributionOrder",
+			data: {
+				orderNo: this.state.orderNot,
+				financeId: record.id
+			}
+		}).done(function(data) {
+			if(!data.error.length) {
+				message.success('分派成功!');
+				this.setState({
+					loading: false,
+				});
+				this.distributionOk();
+			} else {
+				message.warning(data.error[0].message);
+			};
+			this.loadData(this.state.pageNo);
+		}.bind(this));
+	},
+	componentWillMount() {
+		this.departmentList();
+		this.loadData();
+	},
+	tableRowClick(record, index) {
+		this.state.userDetaile = true;
+		this.state.datauser = record;
+		this.setState({
+			showDesc: true
+		});
+	},
+	closeDesc(e, s) {
+		this.state.userDetaile = false;
+		this.state.showDesc = e;
+		if(s) {
+			this.loadData(this.state.pageNo);
+		};
+	},
+	searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+	search() {
+		this.loadData();
+	},
+	//分配时搜索
+	searchOrder() {
+		this.contactList();
+	},
+	//分配时重置
+	resetOrder() {
+		this.setState({
+			departmenttList: undefined,
+			financeNameSearch: ''
+		})
+	},
+	reset() {
+		this.state.buyerNameSearch = '';
+		this.state.financeNameSearchs = '';
+		this.state.orderNoSearch = '';
+		this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+		this.state.orderChannelSearch = undefined;
+		this.state.liquidationStatusSearch = undefined;
+		this.state.orderStatusSearch = undefined;
+		this.state.salesmanNameSearch = undefined;
+		this.state.departmenttSearch = undefined;
+		this.state.approved = undefined;
+		this.state.orderChannelSearch = undefined;
+		this.state.orderTypeSearch = undefined;
+		this.state.isDistributionFinance = undefined;
+		this.loadData();
+	},
+	render() {
+		const rowSelection = {
+			selectedRowKeys: this.state.selectedRowKeys,
+			onChange: (selectedRowKeys, selectedRows) => {
+				this.setState({
+					selectedRows: selectedRows.slice(-1),
+					selectedRowKeys: selectedRowKeys.slice(-1)
+				});
+			},
+			onSelectAll: (selected, selectedRows, changeRows) => {
+				this.setState({
+					selectedRowKeys: []
+				})
+			},
+		};
+		let departmentArr = this.state.departmentArr || [];
+		const hasSelected = this.state.selectedRowKeys.length > 0;
+		const {
+			RangePicker
+		} = DatePicker;
+		return(
+			<div className="user-content" >
+                <div className="content-title">
+                	<span style={{fontSize:'16px'}}>结算订单管理</span>	
+	                <div className="user-search">
+ 	                    {/*<Input placeholder="客户名称" style={{width:'150px'}}
+ 	                        value={this.state.buyerNameSearch}
+	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
+						*/}
+	                    <RangePicker
+		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} /> 
+		                <Select placeholder="订单部门"
+	                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
+	                            value={this.state.departmenttSearch}
+	                            onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
+	                            {
+                                    departmentArr.map(function (item) {
+                                            return <Select.Option key={item.id} >{item.name}</Select.Option>
+                                    })
+                                }
+	                    </Select>
+	                    {/*<Input placeholder="订单负责人" style={{width:'150px'}}
+	                        value={this.state.salesmanNameSearch}
+	                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
+	                    <Input placeholder="财务负责人" style={{width:'150px'}}
+	                        value={this.state.financeNameSearchs}
+	                        onChange={(e) => { this.setState({ financeNameSearchs: e.target.value }); }} />
+							*/}  
+	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
+	                    <Button onClick={this.reset}>重置</Button>
+	                    {/*<span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+						*/}    
+	                </div>
+	                {/*<div className='clearfix' style={{marginTop:'5px'}}>
+	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
+	                        <Input placeholder="订单编号" style={{width:'150px'}}
+	                        	value={this.state.orderNoSearch}
+	                        	onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
+	                        <Select placeholder="订单类型"
+	                            style={{ width: 150 }}
+	                            value={this.state.orderTypeSearch}
+	                            onChange={(e) => { this.setState({ orderTypeSearch: e }) }}>
+	                            {
+                                    orderType.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        
+	                        <Select placeholder="订单状态"
+	                            style={{ width: 150 ,margin:'10px'}}
+	                            value={this.state.orderStatusSearch}
+	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
+	                            {
+                                    orderState.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="是否分配财务"
+	                            style={{ width: 150 }}
+	                            value={this.state.isDistributionFinance }
+	                            onChange={(e) => { this.setState({ isDistributionFinance: e }) }}>
+	                            <Select.Option value="1">已分配 </Select.Option>
+	                            <Select.Option value="0">未分配 </Select.Option>
+	                        </Select>
+	                    </div>
+	                </div>*/}
+	                {<div className="patent-table">
+	                    <Spin spinning={this.state.loading}>
+	                        <Table columns={this.state.columns}
+	                            dataSource={this.state.dataSource}
+	                            rowSelection={rowSelection}
+	                            pagination={this.state.pagination}
+	                            onRowClick={this.tableRowClick} />
+	                    </Spin>
+	                </div>}
+	                {<ManagementDetaile
+	                	confirmDelet={this.confirmDelet}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser} 
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />}
+	            </div >
+	            {/*<Modal maskClosable={false} visible={this.state.distributionVisible}
+                        onOk={this.distributionOk} onCancel={this.distributionCancel}
+                        width='800px'
+                        title='分派财务订单'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
+			                <Spin spinning={this.state.loading}>
+			                	<div>
+			                		<Select placeholder="部门"
+				                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
+				                            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>
+				                    <Input placeholder="财务负责人" style={{width:'150px',marginLeft:'10px'}}
+				                        value={this.state.financeNameSearch}
+				                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />  
+				                    <Button type="primary" onClick={this.searchOrder} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+	                    			<Button onClick={this.resetOrder}>重置</Button>
+			                	</div>
+			                	 <div className="patent-table" style={{marginTop:'10px'}}>
+				                    <Spin spinning={this.state.loading}>
+				                        <Table columns={this.state.userList}
+				                            dataSource={this.state.distributionList}
+				                            pagination={false}
+				                             />
+				                    </Spin>
+				                </div>
+			                </Spin>
+			            </Form>
+			    </Modal>*/}
+            </div>
+		);
+	}
+}));
+
+export default AdminCustomerStatistics;

+ 1 - 1
js/component/manageCenter/order/orderNew/addService.jsx

@@ -316,7 +316,7 @@ const NewService = Form.create()(React.createClass({
 	        	return false;
 	        };
 	        if(!theorgCodeUrl){
-	        	message.warning('企业负责人不能为空');
+	        	message.warning('图片过大,上传失败');
 	        	this.refs.signFirstPayment.focus()
 	        	return false;
 	        };

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

@@ -0,0 +1,345 @@
+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;

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

@@ -0,0 +1,326 @@
+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,
+                        });
+                    };
+                   }
+                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:[],
+			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>
+            <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={false}
+					                            onRowClick={this.tableRowClick} 
+					                            />
+					                    </Spin>
+						            </div>
+			                </Spin>
+			            </Form >
+			        </Modal> 
+    	    </div>
+		)
+	}
+}));
+
+export default ManagementDetaile;

+ 2 - 3
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -160,7 +160,7 @@ const PaiDan = React.createClass({
                     key: 'caouzo',
                     render:(text,record)=>{
                         return <div>
-                        	{record.settlementAmount==0&&record.processStatus<5?
+                        	{record.settlementAmount==0?
                             <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.examNo(record)}}>驳回</Button>
                         	:''}
                         </div>
@@ -177,8 +177,7 @@ const PaiDan = React.createClass({
                 }, {
                     title: '项目类别',
                     dataIndex: 'cname',
-                    key: 'cname',
-                    
+                    key: 'cname'
                 },{
                     title: '项目数量',
                     dataIndex: 'commodityQuantity',

+ 3 - 3
webpack.config.js

@@ -1,4 +1,4 @@
-const webpack = require('webpack');
+const webpack = require('webpack');
 const path = require('path');
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 const HtmlWebpackPlugin = require('html-webpack-plugin');
@@ -304,7 +304,7 @@ module.exports = (function () {
     }
 
     //let staticHost = 'http://afts.hnzhiming.com';
-    let staticHost = 'http://192.168.0.190';
+    let staticHost = 'http://192.168.1.222';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://static.kedexinxi.com';
@@ -343,7 +343,7 @@ module.exports = (function () {
         // }
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.190',
+            host: '192.168.1.222',
             port: 80,
             allowedHosts: ['127.0.0.1','192.168.0.20','192.168.0.99'],
             headers: {