liting2017 7 years ago
parent
commit
5e31b7e04f

+ 0 - 5
js/component/manageCenter/order/flowSettlement/billManage/myBillDetaile.jsx

@@ -51,10 +51,6 @@ const MyBillDetaile = Form.create()(React.createClass({
     },
     //保存确认流水
     handleSubmit(state){
-    	if(!this.state.financialPayNo){
-        	message.warning('请输入财务流水号');
-        	return false;
-        };
         if(this.state.selTime==undefined){
         	message.warning('请选择财务流水时间');
         	return false;
@@ -268,7 +264,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 				                            label="财务流水号" >   
 				                            <Input value={this.state.financialPayNo}  style={{width:'240px'}} placeholder="请输入财务流水号"
 				                                 onChange={(e)=>{this.setState({financialPayNo:e.target.value})}} required="required" />
-									        <span className="mandatory">*</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}

+ 0 - 5
js/component/manageCenter/order/flowSettlement/billManagement/myBillDetaile.jsx

@@ -54,10 +54,6 @@ const MyBillDetaile = Form.create()(React.createClass({
     },
     //保存确认流水
     handleSubmit(state){
-    	if(!this.state.financialPayNo){
-        	message.warning('请输入财务流水号');
-        	return false;
-        };
         if(!this.state.times){
         	if(this.state.selTime==undefined){
         		message.warning('请选择财务流水时间');
@@ -269,7 +265,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 				                            label="财务流水号" >   
 				                            <Input value={this.state.financialPayNo}  style={{width:'240px'}} placeholder="请输入财务流水号"
 				                                 onChange={(e)=>{this.setState({financialPayNo:e.target.value})}} required="required" />
-									        <span className="mandatory">*</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}

+ 0 - 5
js/component/manageCenter/order/flowSettlement/billQuery/myBillDetaile.jsx

@@ -51,10 +51,6 @@ const MyBillDetaile = Form.create()(React.createClass({
     },
     //保存确认流水
     handleSubmit(state){
-    	if(!this.state.financialPayNo){
-        	message.warning('请输入财务流水号');
-        	return false;
-        };
         if(this.state.selTime==undefined){
         	message.warning('请选择财务流水时间');
         	return false;
@@ -268,7 +264,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 				                            label="财务流水号" >   
 				                            <Input value={this.state.financialPayNo}  style={{width:'240px'}} placeholder="请输入财务流水号"
 				                                 onChange={(e)=>{this.setState({financialPayNo:e.target.value})}} required="required" />
-									        <span className="mandatory">*</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}

+ 0 - 5
js/component/manageCenter/order/flowSettlement/myBill/myBillDetaile.jsx

@@ -54,10 +54,6 @@ const MyBillDetaile = Form.create()(React.createClass({
     },
     //保存确认流水
     handleSubmit(state){
-    	if(!this.state.financialPayNo){
-        	message.warning('请输入财务流水号');
-        	return false;
-        };
         if(this.state.selTime==undefined){
         	message.warning('请选择财务流水时间');
         	return false;
@@ -271,7 +267,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 				                            label="财务流水号" >   
 				                            <Input value={this.state.financialPayNo}  style={{width:'240px'}} placeholder="请输入财务流水号"
 				                                 onChange={(e)=>{this.setState({financialPayNo:e.target.value})}} required="required" />
-									        <span className="mandatory">*</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}

+ 2 - 2
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlement.jsx

@@ -205,8 +205,8 @@ const MySettlement=Form.create()(React.createClass({
                     key: 'zhifu',
                     render:(text,record)=>{
 						return 	<div>
-									<Button onClick={(e) =>{ e.stopPropagation(),this.paymentMoney(record)}} type="primary">支付</Button>
-							    	<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">转交</Button>               
+									<Button onClick={(e) =>{ e.stopPropagation(),this.paymentMoney(record)}} type="dashed">支付</Button>
+							    	<Button style={{marginLeft:'5px',}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">转交</Button>               
 								</div>
                     			
                     }

+ 390 - 374
js/component/manageCenter/order/settlementOrder/settlementManage/settlementManagement.jsx

@@ -3,91 +3,92 @@ 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 { Form, Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload, Popconfirm } from 'antd';
 import ManagementDetaile from "./managementDetaile.jsx";
 import moment from 'moment';
 import '../../userMangagement.less';
-import {orderState,orderChannel,orderType} from '../../../../dataDic.js';
-import {getProjectState,getOrderChannel,getOrderType,getOrderState,getPaymentState,getApprovedState} from '../../../../tools.js';
+import { orderState, orderChannel, orderType } from '../../../../dataDic.js';
+import { getProjectState, getOrderChannel, getOrderType, getOrderState, getPaymentState, getApprovedState } from '../../../../tools.js';
 
-const SettlementManage=Form.create()(React.createClass({
+const SettlementManage = 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],
+		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
-            },
-            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
+				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));
-    },
-    //部门
+				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
@@ -98,301 +99,307 @@ const SettlementManage=Form.create()(React.createClass({
 			crossDomain: false,
 			url: globalConfig.context + "/api/admin/organization/selectSuperId",
 			data: {
-				
+
 			},
 			success: function(data) {
 				let thedata = data.data;
-				let theArr=[];
+				let theArr = [];
 				if(!thedata) {
 					if(data.error && data.error.length) {
 						message.warning(data.error[0].message);
 					};
 					thedata = {};
-				}else{
-					thedata.map(function(item,index){
+				} else {
+					thedata.map(function(item, index) {
 						theArr.push({
-							key:index,
-							name:item.name,
-							id:item.id,
+							key: index,
+							name: item.name,
+							id: item.id,
 						})
 					})
 				}
 				this.setState({
-					departmentArr:theArr,
+					departmentArr: theArr,
 				})
 			}.bind(this),
-			}).always(function() {
-				this.setState({
-					loading: false
-				});
-			}.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>
+	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="取消">
+				}
+			}],
+			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() {
+					)
+				}
+			}],
+			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;
+	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;
@@ -402,28 +409,31 @@ const SettlementManage=Form.create()(React.createClass({
 		this.state.approved = undefined;
 		this.state.orderChannelSearch = undefined;
 		this.state.orderTypeSearch = 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:[]
-			   })
+		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" >
+		};
+		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">
@@ -480,6 +490,13 @@ const SettlementManage=Form.create()(React.createClass({
                                     })
                                 }
 	                        </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">
@@ -535,9 +552,8 @@ const SettlementManage=Form.create()(React.createClass({
 			            </Form>
 			    </Modal>
             </div>
-        );
-    }
+		);
+	}
 }));
 
-export default SettlementManage;
-
+export default SettlementManage;

+ 1 - 1
js/component/manageCenter/servicesManage/technology/websiteChange.jsx

@@ -157,7 +157,7 @@ const WebsiteChangeFrom = Form.create()(React.createClass({
                             <Input />
                             )}
                     </FormItem>
-                    <FormItem style={{ marginTop: '20px' }}>
+                    <FormItem style={{ marginTop: '20px' }} style={{textAlign:"center"}}>
                         <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                         <Button type="ghost" style={{ marginLeft: '20px' }} onClick={this.props.closeModal}>取消</Button>
                     </FormItem>

+ 26 - 6
js/component/manageCenter/set/userManagementS/newUser.jsx

@@ -1,12 +1,12 @@
 import React from 'react';
-import { Icon,  Modal, message,  AutoComplete,Spin, Input, Select, Button, Form,Upload,Popconfirm } from 'antd';
+import { Icon,  Modal, message,  AutoComplete,Spin, Input, Select, Button, Form,Upload,Popconfirm ,DatePicker} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import './userMangagement.less';
 import {socialAttribute,cityArr,station,post} from '../../../dataDic.js';
 import {splitUrl} from '../../../tools.js';
 const Option = AutoComplete.Option;
-
+import moment from 'moment';
 
 //图片组件
 const PicturesWall = React.createClass({
@@ -133,8 +133,8 @@ const Newuser = Form.create()(React.createClass({
 					superiorId:this.state.theTypes?this.state.theTypes:this.state.superiorId,
 					district:this.state.district,
 					headPortraitUrl:theorgCodeUrl.length?theorgCodeUrl:'',
+					entryTime:this.state.selTime
             	})
-            	
             }
         }).done(function (data) { 
             this.setState({
@@ -243,7 +243,9 @@ const Newuser = Form.create()(React.createClass({
                     userNo:thisdata.userNo,
                 	orgCodeUrl: thisdata.headPortraitUrl? splitUrl(thisdata.headPortraitUrl, ',', globalConfig.avatarHost + '/upload') : [],
                 	role:roleArr,
-                	theTypes:''
+                	theTypes:'',
+	                entryTime:thisdata.entryTime?moment(thisdata.entryTime,'YYYY-MM-DD'):undefined,
+	                selTime:thisdata.entryTime
                 });
             }.bind(this),
        }).always(function () {
@@ -290,6 +292,13 @@ const Newuser = Form.create()(React.createClass({
         });
         this.props.closeDesc(false);
     },
+    //入职时间选择
+    selTime(e,index){
+    	this.setState({
+    		entryTime:e,
+    		selTime:index
+    	})
+    },
     getOrgCodeUrl(e) {
         this.setState({ orgCodeUrl: e });
     },
@@ -302,7 +311,6 @@ const Newuser = Form.create()(React.createClass({
         });
         this.state.cityOption=cityArrs;
     },
-   
     componentWillReceiveProps(nextProps) {    	
 		if(nextProps.userDetaile&&nextProps.datauser.id){
 			this.loaduser(nextProps.datauser)
@@ -324,6 +332,7 @@ const Newuser = Form.create()(React.createClass({
 			this.state.orgCodeUrl=[];
 			this.state.id='';
 			this.state.rolek=[];
+			this.state.entryTime=undefined;
     	   } 
 		   this.state.visible = nextProps.showDesc;
 		   
@@ -411,7 +420,18 @@ const Newuser = Form.create()(React.createClass({
 					                                    onChange={(e)=>{this.setState({name:e.target.value})}} required="required"/> 
 				                                    <span className="mandatory">*</span>
 					                    </FormItem>
-					                    
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="入职时间" >   
+				                            <DatePicker
+				                              style={{marginTop:'0',width:'200px',height:'32px'}}
+										      showTime
+										      format="YYYY-MM-DD"
+										      placeholder="选择入职时间"
+										      value={this.state.entryTime}
+										      onChange={(e,time)=>{this.selTime(e,time)}}
+										    />
+			                    		</FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="组织部门" >