Browse Source

合代码

liting2017 7 years ago
parent
commit
7a561e91bb
23 changed files with 6736 additions and 15 deletions
  1. 58 1
      js/component/dataDic.js
  2. 0 1
      js/component/manageCenter/leftTab.jsx
  3. 53 4
      js/component/manageCenter/order/content.jsx
  4. 2 1
      js/component/manageCenter/order/content.less
  5. 12 0
      js/component/manageCenter/order/departmentOrder/serviceManage.jsx
  6. 313 0
      js/component/manageCenter/order/flowSettlement/myBill.jsx
  7. 293 0
      js/component/manageCenter/order/flowSettlement/myBillDetaile.jsx
  8. 988 0
      js/component/manageCenter/order/myOrder/addService.jsx
  9. 432 0
      js/component/manageCenter/order/myOrder/myService.jsx
  10. 371 0
      js/component/manageCenter/order/orderManagement/approveOrder.jsx
  11. 462 0
      js/component/manageCenter/order/orderManagement/approveOrderDetaile.jsx
  12. 462 0
      js/component/manageCenter/order/orderManagement/publicOrder.jsx
  13. 523 0
      js/component/manageCenter/order/orderManagement/publicOrderDetaile.jsx
  14. 515 0
      js/component/manageCenter/order/settlementOrder/managementDetaile.jsx
  15. 349 0
      js/component/manageCenter/order/settlementOrder/mySettlement.jsx
  16. 462 0
      js/component/manageCenter/order/settlementOrder/mySettlementDetaile.jsx
  17. 512 0
      js/component/manageCenter/order/settlementOrder/settlementManagement.jsx
  18. 84 0
      js/component/manageCenter/order/userMangagement.less
  19. 5 4
      js/component/manageCenter/servicesManage/projectOrder/content.jsx
  20. 335 0
      js/component/manageCenter/servicesManage/projectOrder/projectOrder.jsx
  21. 365 0
      js/component/manageCenter/servicesManage/projectOrder/projectOrderDetaile.jsx
  22. 84 0
      js/component/manageCenter/servicesManage/projectOrder/userMangagement.less
  23. 56 4
      js/component/tools.js

+ 58 - 1
js/component/dataDic.js

@@ -1766,6 +1766,7 @@ module.exports = {
 	        key: "二级菜单"
 	    }
     ],
+    //导航
     actives:[
 		    {value:'客户管理',key:'myClient'},
 			{value:'科技服务项目',key:'services'},
@@ -1776,5 +1777,61 @@ module.exports = {
 			{value:'系统设置',key:'system'},
 			{value:'订单管理',key:'order'},
 			{value:'平台管理',key:'operate'}
-		]
+		],
+	//意向进度		
+    intentProgress:[
+    	 {
+	        value: "0",
+	        key: "待确认"
+	    }, {
+	        value: "1",
+	        key: "已确认"
+	    }, {
+	        value: "2",
+	        key: "意向已撤销"
+	    }
+    ],
+    //交易进度		
+    transactionProgress:[
+    	 {
+	        value: "0",
+	        key: "跟单中"
+	    }, {
+	        value: "1",
+	        key: "已成交"
+	    }, {
+	        value: "2",
+	        key: "成交已撤销"
+	    }
+    ],
+    //合同进度		
+    contractProgress:[
+    	 {
+	        value: "0",
+	        key: "未签订合同"
+	    }, {
+	        value: "1",
+	        key: "已签订合同"
+	    }, {
+	        value: "2",
+	        key: "合同已撤销"
+	    }
+    ],
+    //项目进度		
+    projectProgress:[
+    	 {
+	        value: "0",
+	        key: "未立项"
+	    }, {
+	        value: "1",
+	        key: "已立项"
+	    }, {
+	        value: "2",
+	        key: "已结项"
+	    }, {
+	        value: "3",
+	        key: "立项已撤销"
+	    }
+	    
+    ],
 };

+ 0 - 1
js/component/manageCenter/leftTab.jsx

@@ -28,7 +28,6 @@ const LeftTab = React.createClass({
         if(rid.length>1){
         	for(var h=0;h<menu.length;h++){
         		if(menu[h].subMenus.length){
-        			console.log(menu[h].subMenus)
         			menu[h].subMenus.map(function(atem){
         				let urls=atem.url.split('#')
         				if(rid[1]==urls[1]){

+ 53 - 4
js/component/manageCenter/order/content.jsx

@@ -4,6 +4,7 @@ import './content.less';
 import LeftTab from '../leftTab';
 import {getMenu} from '../publicMenu.jsx'
 
+
 class Content extends Component {
     constructor() {
         super();
@@ -31,18 +32,66 @@ class Content extends Component {
     }
     getKey (key) {
         switch (key) {
-            case 'membership':
+            case 'myService':
+                require.ensure([], () => {
+                    const MyService = require('./myOrder/myService').default;
+                    this.setState({
+                        component: <MyService />
+                    });
+                });
+                break;
+            case 'serviceManage':
                 require.ensure([], () => {
-                    const Membership = require('./memberOrderList').default;
+                    const ServiceManage = require('./departmentOrder/serviceManage').default;
                     this.setState({
-                        component: <Membership />
+                        component: <ServiceManage />
                     });
                 });
                 break;
-            
+            case 'public':
+                require.ensure([], () => {
+                    const PublicOrder = require('./orderManagement/publicOrder').default;
+                    this.setState({
+                        component: <PublicOrder />
+                    });
+                });
+                break;
+            case 'approved':
+                require.ensure([], () => {
+                    const ApproveOrder = require('./orderManagement/approveOrder').default;
+                    this.setState({
+                        component: <ApproveOrder />
+                    });
+                });
+                break;
+            case 'mySettlement':
+                require.ensure([], () => {
+                    const MySettlement = require('./settlementOrder/mySettlement').default;
+                    this.setState({
+                        component: <MySettlement />
+                    });
+                });
+                break;    
+           	case 'settlementManage':
+                require.ensure([], () => {
+                    const SettlementManage = require('./settlementOrder/settlementManagement').default;
+                    this.setState({
+                        component: <SettlementManage />
+                    });
+                });
+                break;
+            case 'myBill':
+                require.ensure([], () => {
+                    const MyBill = require('./flowSettlement/myBill.jsx').default;
+                    this.setState({
+                        component: <MyBill />
+                    });
+                });
+                break;    
             //订单新增空白
             default:
             require.ensure([], () => {
+            	
                 const Module = require('../module').default;
                 this.setState({
                     component:<Module />	    

+ 2 - 1
js/component/manageCenter/order/content.less

@@ -60,4 +60,5 @@
             display: none;
         }
     }
-}
+}
+.addButton{float: right;margin-right: 50px!important;}

+ 12 - 0
js/component/manageCenter/order/departmentOrder/serviceManage.jsx

@@ -0,0 +1,12 @@
+import React from 'react';
+import '../userMangagement.less';
+
+const ServiceManage=React.createClass({
+	render(){
+		return(
+			<div className='user-content'>部门订单-科技服务订单</div>
+		)
+	}
+});
+
+export default ServiceManage;

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

@@ -0,0 +1,313 @@
+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, Modal, Upload ,Popconfirm,Checkbox} from 'antd';
+import MyBillDetaile from "./myBillDetaile.jsx";
+import moment from 'moment';
+import '../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+
+const MyBill=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/roles',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                draweeName:this.state.draweeName,//付款人名称
+                payeeName:this.state.payeeName,//付款人名称
+                term:this.state.term,//是否有效
+                orderNumber:this.state.orderNumber,//订单编号
+                orderDepartment:this.state.orderDepartment,//订单部门
+                orderLeader:this.state.orderLeader,//订单负责人
+            },
+            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,
+	                         roleName: thisdata.roleName,
+	                         creater:thisdata.creater,
+	                         createTime:thisdata.createTimez,
+                        });
+                    };
+                    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({
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            selectedRows: [],
+            searchMore: true,
+            loading: 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: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '平台流水时间',
+                    dataIndex: 'creater',
+                    key: 'creater'
+                }, {
+                    title: '流水金额',
+                    dataIndex: 'creater7',
+                    key: 'creater7'
+                },{
+                    title: '付款人名称',
+                    dataIndex: 'roleName1',
+                    key: 'roleName1'
+                }, {
+                    title: '收款人名称',
+                    dataIndex: 'c',
+                    key: 'c'
+                },
+                {
+                    title: '流水科目',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                }, {
+                    title: '流水方式',
+                    dataIndex: 'createTime1',
+                    key: 'createTime1',
+                    render:(text)=>{return getIntentProgress(text) }
+                },{
+                    title: '财务流水号',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2',
+                    render:(text)=>{return getTransactionProgress(text) }
+                }, {
+                    title: '财务流水时间',
+                    dataIndex: 'creater2',
+                    key: 'creater2',
+                    render:(text)=>{return getContractProgress(text) }
+                }, {
+                    title: '流水确认',
+                    dataIndex: 'creatu',
+                    key: 'creatu',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '确认时间',
+                    dataIndex: 'cre',
+                    key: 'cre',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '订单编号',
+                    dataIndex: 'crea1tu',
+                    key: 'crea1tu',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '订单负责人',
+                    dataIndex: 'c2re',
+                    key: 'c2re',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '是否有效',
+                    dataIndex: 'c22re',
+                    key: 'c22re',
+                    render:(text)=>{return getProjectProgress(text) }
+                },
+                {
+                    title: '操作',
+                    dataIndex: 'operation',
+                    key: 'operation',
+                    render: (text, record, index) => {
+						return <div>
+								    <Button style={{marginRight:'5px'}} type="danger" onClick={(e) =>{this.reject(record) }}>作废</Button>                 
+								    <Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{this.reject(record) }}>确认</Button>                 
+                        	   </div>
+					}
+                }
+            ],
+            dataSource: [],
+        };
+    },
+    //操作分配
+    confirmDelet(index){
+    	this.setState({
+    		userDetaile:false,
+    	});
+    	this.contactList(1,index.id)
+    },
+    //驳回
+    reject(record){
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+            showDesc: true
+        });
+    },
+    componentWillMount() {
+        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();
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+        this.loadData();
+    },
+    //分配时搜索
+    searchOrder() {
+        this.contactList();
+    },
+    //分配时重置
+    resetOrder() {
+        this.contactList();
+    },
+    reset() {
+    	this.state.draweeName='';
+    	this.state.payeeName='';
+		this.state.pipelining = undefined;
+		this.state.term = undefined;
+		this.state.orderNumber = '';
+		this.state.orderDepartment = '';
+		this.state.orderLeader = '';
+        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:[]
+			   })
+			},
+        };
+        const hasSelected = this.state.selectedRowKeys.length > 0;
+        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.draweeName}
+	                        onChange={(e) => { this.setState({ draweeName: e.target.value }); }} />
+	                    <Input placeholder="收款人名称" style={{width:'150px'}}
+	                        value={this.state.payeeName}
+	                        onChange={(e) => { this.setState({ payeeName: e.target.value }); }} />    
+                        <Select placeholder="流水确认"
+	                        style={{ width: 150 ,marginRight:'10px'}}
+	                        value={this.state.pipelining}
+	                        onChange={(e) => { this.setState({ pipelining: e }) }}>
+	                        {
+	                            lvl.map(function (item) {
+	                                    return <Select.Option key={item.value} >{item.key}</Select.Option>
+	                            })
+	                        }
+                  		</Select>
+                  		<Select placeholder="是否有效"
+	                        style={{ width: 150 ,marginRight:'10px'}}
+	                        value={this.state.term}
+	                        onChange={(e) => { this.setState({ term: e }) }}>
+	                        <Select.Option value='0'>无效</Select.Option>
+	                        <Select.Option value='1'>有效</Select.Option>
+                  		</Select>
+	                    <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.orderNumber}
+		                        onChange={(e) => { this.setState({ orderNumber: e.target.value }); }} />
+		                    <Input placeholder="订单部门" style={{width:'150px',marginLeft:'10px',marginRight:'10px'}}
+		                        value={this.state.orderDepartment}
+		                        onChange={(e) => { this.setState({ orderDepartment: e.target.value }); }} />
+		                    <Input placeholder="订单负责人" style={{width:'150px'}}
+		                        value={this.state.orderLeader}
+		                        onChange={(e) => { this.setState({ orderLeader: e.target.value }); }} />    
+	                    </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}
+                            />
+	                    </Spin>
+	                </div>
+	                <MyBillDetaile
+	                	confirmDelet={this.confirmDelet}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser}
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />
+	            </div >
+            </div>
+        );
+    }
+}));
+
+export default MyBill;
+

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

@@ -0,0 +1,293 @@
+import React from 'react';
+import { Icon, Table, Modal, message, 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 {lvl} from '../../../dataDic.js';
+
+
+const MyBillDetaile = Form.create()(React.createClass({
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+		};
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+    	$.ajax({
+            method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/role/rolePermission',
+            data: {
+              id: record.id
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                
+                this.setState({
+                	orderList:thisData[0],
+					ids:record.id,
+                });                  
+            }.bind(this),
+       }).always(function () {
+            this.setState({            	
+                loading: false
+            });
+        }.bind(this));  
+       }
+    },
+    //保存确认流水
+    handleSubmit(e){
+    	e.preventDefault();
+    	console.log(this.state.selTime)
+        if(this.state.selTime==undefined){
+        	message.warning('请选择财务流水时间');
+        	return false;
+        };
+		this.props.form.validateFields((err, values) => {
+			if(!err) {
+				this.setState({
+					loading: true
+				});
+				$.ajax({
+					method: "POST",
+					dataType: "json",
+					crossDomain: false,
+					url: globalConfig.context + 'api/baocun',
+					data: {
+						time:this.state.selTime
+					}
+				}).done(function(data) {
+					this.setState({
+						loading: false
+					});
+					if(!data.error.length) {
+						message.success('已确认!');
+						this.handleOk()
+					} else {
+						message.warning(data.error[0].message);
+					}
+				}.bind(this));
+			}
+		});
+    },
+    //时间选择
+    selTime(e,index){
+    	this.setState({
+    		selectTime:e,
+    		selTime:index
+    	})
+    },
+    //作废流水
+    toVoid(){
+    	if(!this.props.datauser.id){
+    		return false;
+    	}
+    	this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + 'api/zuofei',
+			data: {
+				id:this.props.datauser.id
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('已作废!');
+				this.handleOk()
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+    },
+	handleOk(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false, true);
+	},
+	handleCancel(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false);
+	},
+	componentWillMount() {
+		
+	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			if(nextProps.datauser && nextProps.datauser.id ) {
+				this.loaduser(nextProps.datauser);
+			}
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		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'}} onSubmit={this.handleSubmit}>
+		                <Spin spinning={this.state.loading}>
+	                        <div className="clearfix">
+	                            <div className="clearfix">
+		                       		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="平台流水号" >
+			                            <span>{orderDetaiel.rname}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="平台流水时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水金额" >  
+			                            <span>{orderDetaiel.rname}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水科目" >  
+			                            <span>{orderDetaiel.rname}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水状态" >  
+			                            <span>{orderDetaiel.rname}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="付款人名称" >  
+			                            <span>{orderDetaiel.rname}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="收款人名称" >  
+			                            <span>{orderDetaiel.rname}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="交易方式" >  
+			                            <span>{orderDetaiel.rname}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="交易渠道" >    
+		                            	<span>{orderDetaiel.roleName}</span>
+				                    </FormItem>
+				                    <div className='clearfix'>
+							        	<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="附言" >
+							        		<span>{orderDetaiel.roleName}</span>
+								        </FormItem>
+							        </div>
+				                    <div className='clearfix'>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >   
+				                            <span>{orderDetaiel.roleName}</span>
+					                    </FormItem>
+					               	</div>    
+				                    <div className='clearfix'>
+							        	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >   
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="下单时间" >   
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >   
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="流水确认时间" >   
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+		                    		</div>
+		                    		<div className='clearfix'>
+				                        <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水号" >   
+				                            <Input value={this.state.timet}  style={{width:'240px'}} placeholder="请输入财务流水号"
+				                                 onChange={(e)=>{this.setState({timet: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 HH:mm:ss"
+										      placeholder="选择时间"
+										      value={this.state.selectTime}
+										      onChange={(e,time)=>{this.selTime(e,time)}}
+										    />
+									        <span className="mandatory">*</span>
+			                    		</FormItem>
+			                    	</div>
+			                    	<div className='clearfix'>
+			                    		<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="财务备注" >
+								                <Input type="textarea" placeholder="请输入财务备注" rows={4}  value={this.state.introduction} 
+									    			onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+								        </FormItem>
+								    </div> 
+								    <div className='btnSave'>
+							            <Button className="setSave" type="primary" htmlType="submit">确认流水</Button> 
+							            <Button className="toVoid" type="danger" onClick={this.toVoid}>作废流水</Button> 
+							        	<Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
+							        </div>
+		                        </div>
+		                    </div>
+		                </Spin>
+		            </Form >
+		        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default MyBillDetaile;

+ 988 - 0
js/component/manageCenter/order/myOrder/addService.jsx

@@ -0,0 +1,988 @@
+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 {lvl} from '../../../dataDic.js';  
+import {splitUrl} from '../../../tools.js';
+const Option = AutoComplete.Option;
+
+//图片组件
+const PicturesWall = React.createClass({
+    getInitialState() {
+        return {
+            previewVisible: false,
+            previewImage: '',
+            fileList: [],
+        }
+    },
+    handleCancel() {
+        this.setState({ previewVisible: false })
+    },
+    handlePreview(file) {
+        this.setState({
+            previewImage: file.url || file.thumbUrl,
+            previewVisible: true,
+        });
+    },
+    handleChange(info) {
+        let fileList = info.fileList;
+        this.setState({ fileList });
+        this.props.fileList(fileList);
+    },
+    componentWillReceiveProps(nextProps) {
+        this.state.fileList = nextProps.pictureUrl; 
+    },
+    render() {
+        const { previewVisible, previewImage, fileList } = this.state;
+        const uploadButton = (
+            <div>
+                <Icon type="plus" />
+                <div className="ant-upload-text">点击上传</div>
+            </div>
+        );
+        return (
+            <div style={{display:"inline-block"}}>
+                <Upload
+                    action={globalConfig.context + "/api/admin/superviser/uploadAdminImg"}
+                    data={{ 'sign': this.props.pictureSign }}
+                    listType="picture-card"
+                    fileList={fileList}
+                    onPreview={this.handlePreview}
+                    onChange={this.handleChange} >
+                    {fileList.length >= 4 ? null : uploadButton}
+                </Upload>
+                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
+                </Modal>
+            </div>
+        );
+    }
+});
+const NewService = Form.create()(React.createClass({
+	loadData() {
+        this.state.data = [];
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/roles',
+            data: {
+            },
+            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,
+                        });
+                    };
+                   }
+                this.setState({
+                    dataSource: theArr,
+                    pagination: false,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			orgCodeUrl:[],
+			checkedKeys: [],
+			signBillVisible:false,
+			columns: [
+				{
+                    title: '业务项目名称',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                },{
+                    title: '项目数量',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2'
+                }, {
+                    title: '服务市价',
+                    dataIndex: 'creater2',
+                    key: 'creater2'
+                }, {
+                    title: '实签价格',
+                    dataIndex: 'roleName3',
+                    key: 'roleName3'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater4',
+                    key: 'creater4'
+                }, {
+                    title: '项目说明',
+                    dataIndex: 'roleName5',
+                    key: 'roleName5'
+                }, {
+                    title: '操作',
+                    dataIndex: 'ABC',
+                    key: 'ABC',
+                    render: (text, record, index) => {
+						return <div style={{display:true?'block':'none'}}>
+								<Popconfirm title="是否删除?" onConfirm={(e)=>{this.delectRow(record)}} okText="是" cancelText="否">
+								    <Button onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>                 
+								</Popconfirm>
+							</div>
+							}
+                },
+			]
+		};
+	},
+	//新建订单、编辑订单保存
+	handleSubmit(e) {
+		e.preventDefault();
+		let theorgCodeUrl = [];
+        if (this.state.orgCodeUrl.length) {
+            let picArr = [];
+            this.state.orgCodeUrl.map(function (item) {
+				if ( item.response && item.response.data && item.response.data.length ){
+					picArr.push(item.response.data);
+				}
+            });
+            theorgCodeUrl = picArr.join(",");
+        };
+        if(this.state.orderType==undefined){
+        	message.warning('请选择订单类型');
+        	return false;
+        };
+        if(!this.state.customerName){
+        	message.warning('请输入客户名称');
+        	this.refs.customerName.focus();
+        	return false;
+        };
+		this.props.form.validateFields((err, values) => {
+			if(!err) {
+				this.setState({
+					loading: true
+				});
+				let api=this.props.userDetaile?'/api/bianji':'/api/xinjian'
+				$.ajax({
+					method: "POST",
+					dataType: "json",
+					crossDomain: false,
+					url: globalConfig.context + api,
+					data: {
+						
+					}
+				}).done(function(data) {
+					this.setState({
+						loading: false
+					});
+					if(!data.error.length) {
+						message.success('保存成功!');
+						this.handleOk()
+					} else {
+						message.warning(data.error[0].message);
+					}
+				}.bind(this));
+			}
+		});
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+    	this.state.orderList=[]
+    	$.ajax({
+            method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/role/rolePermission',
+            data: {
+              id: record.id
+            },
+            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,
+                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
+                });                  
+            }.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);
+	},
+	//删除
+    delectRow(record) {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "",
+            data: {
+            	id:record.id
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('删除成功!');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+	//添加明细
+	addDetailed(){
+		this.setState({
+			name:'',
+			url:'',
+			addState:1,
+			addnextVisible: true
+		})
+	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//查看订单明细
+	orderDetails(record){
+		if(record){
+	    	$.ajax({
+	            method: "post",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/role/rolePermission',
+	            data: {
+	              id: record.id
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                let idList=[];
+	                thisData.map(function(item){
+	                	idList.push(
+	                		item.pid
+	                	)
+	                })
+	                this.setState({
+						ids:record.id,
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+	            });
+	        }.bind(this));  
+	    }
+	},
+	tableRowClick(record, index) {
+        this.setState({
+        	addnextVisible:true,
+        	addState:0,
+        });
+        this.orderDetails(record)
+    },
+	getOrgCodeUrl(e) {
+        this.setState({ orgCodeUrl: e });
+    },
+	componentWillMount() {
+		
+	},
+	//查看订单详情里面的各种骚操作
+	//受理订单
+    admissibleOrder(){
+    	let idArr=this.props.datauser;
+    	this.props.operation(idArr,'admissibleOrder')
+    },
+    //取消订单
+    cancelOrder(){
+    	let idArr=this.props.datauser;
+    	this.props.operation(idArr,'cancelOrder')
+    },
+    //作废订单
+    scrapOrder(){
+    	let idArr=this.props.datauser;
+    	this.props.operation(idArr,'scrapOrder')
+    },
+    //锁定订单
+    lockOrder(){
+    	let idArr=this.props.datauser;
+    	this.props.operation(idArr,'lockOrder')
+    },
+    //解锁订单
+    unlockOrder(){
+    	let idArr=this.props.datauser;
+    	this.props.operation(idArr,'unlockOrder')
+    },
+    //签单
+    signBill(){
+    	let idArr=this.props.datauser;
+    	this.setState({
+    		signBillVisible:true
+    	})
+    	this.signBillDetaiel(idArr)
+    },
+    signBillOk(){
+    	this.setState({
+    		signBillVisible:false
+    	})
+    },
+    //点击签单获取数据函数
+    signBillDetaiel(idArr){
+    	if(idArr){
+	    	$.ajax({
+	            method: "post",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/role/rolePermission',
+	            data: {
+	              id: idArr.id
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                this.setState({
+						roleName:thisData.roleName,
+                    	orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+	            });
+	        }.bind(this));  
+	    }
+    },
+	//加载(自动补全)
+	supervisor(e){ 
+		$.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/selectName",
+            data:{
+            	name:e
+            },
+            success: function (data) {                	  
+				       let thedata=data.data;
+				    if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };	
+                    thedata = {}; 
+              }; 
+					this.setState({
+						customerArr:thedata,	
+                    });
+				}.bind(this),
+			}).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));  
+	},
+	//上级主管输入框失去焦点是判断客户是否存在
+	selectAuto(value,options){
+		this.setState({
+			auto:value
+		})
+	},
+	blurChange(e){
+		let theType;
+		let contactLists=this.state.customerArr||[];
+			if (e) {
+            contactLists.map(function (item) {
+                if (item.name == e.toString()) {
+                    theType=item.id
+                }
+           });     
+   	    }
+		this.setState({
+			theTypes:theType
+		})
+	},
+	//值改变时请求客户名称
+	httpChange(e){
+		if(e.length>=1){
+			this.supervisor(e); 
+		}	
+		this.setState({
+			auto:e
+		})
+	},
+	//新建明细保存
+	nextSubmit(e) {
+		e.preventDefault();
+		this.setState({
+			loading: true
+		});
+		let api=this.state.addState?'/api/admin/addPermission':'/api/bianji';
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +api ,
+			data: {
+				
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('保存成功!');
+				this.signBillOk()
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	//签单保存
+	signOk(e){
+		e.preventDefault();
+		this.temporarySave(false)
+	},
+	//暂存信息
+	temporary(){
+		this.temporarySave(true)
+	},
+	//签单保存与暂存函数
+	temporarySave(e){
+		this.setState({
+			loading: true
+		});
+		let api=e?'/api/admin/zancun':'/api/quedingqiandan';
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +api ,
+			data: {
+				id:this.props.uid?this.props.uid.id:this.props.datauser.id
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('保存成功!');
+				this.signBillOk()
+				this.props.closeDesc(false,true)
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		this.state.signBillVisible=nextProps.signBillVisible;
+		if(this.state.signBillVisible){
+			this.signBillDetaiel(nextProps.uid)
+		};
+		if(nextProps.userDetaile && nextProps.showDesc) {
+			if(nextProps.datauser && nextProps.datauser.id&&nextProps.signBillState) {
+				this.loaduser(nextProps.datauser);
+				this.loadData();
+			}
+		}else{
+			this.setState({
+				orderType:undefined,
+				customerName:'',
+			})
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		const orderDetaiel=this.state.orderList || []
+		const dataSources=this.state.customerArr || [];
+        const options = dataSources.map((group,index) =>
+				      <Option key={index} value={group.name}>{group.name}</Option>
+				     )
+		return(
+			<div>
+            <Modal maskClosable={false} visible={this.state.visible}
+                        onOk={this.handleOk} onCancel={this.handleCancel}
+                        width={!this.props.userDetaile?'600px':'1000px'}  
+                        title={!this.props.userDetaile?'创建订单':'编辑订单'}                      
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
+			                <Spin spinning={this.state.loading}>
+			                        <div className="clearfix">
+			                            {!this.props.userDetaile?
+			                            <div className="clearfix">
+			                            	<div className="clearfix">
+						                    	<FormItem 
+							                            {...formItemLayout}
+							                            label="订单类型" > 
+							                            <Select placeholder="请输入订单类型"
+								                            style={{ width:'240px'}}
+								                            value={this.state.orderType}
+								                            onChange={(e) => { this.setState({ orderType: e }) }}>
+								                            {
+							                                    lvl.map(function (item) {
+							                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+							                                    })
+							                                }
+								                        </Select>
+							                    		<span className="mandatory">*</span>
+							                    </FormItem>
+							                </div>
+							                <div className="clearfix">
+							                    <FormItem 
+							                            {...formItemLayout}
+							                            label="客户名称" >                             
+						                                    <Input placeholder="请输入客户名称" ref='customerName' value={this.state.customerName} onChange={(e)=>{this.setState({customerName:e.target.value})}} style={{width:'240px'}}/>
+							                    		<span className="mandatory">*</span>
+							                    </FormItem>
+							                </div>    
+						                </div>:<div className="clearfix">
+						                       		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="订单编号" >
+							                            <span>{orderDetaiel.roleName}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="下单时间" >  
+							                            <span>{orderDetaiel.createTimez}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="客户名称" >  
+							                            <span>{orderDetaiel.roleName}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="订单类型" >  
+							                            <span>{orderDetaiel.roleName}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="订单渠道" >  
+							                            <span>{orderDetaiel.roleName}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="订单状态" >  
+							                            <span>{orderDetaiel.roleName}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="已收款项" >  
+							                            <span>{orderDetaiel.roleName}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="结算状态" >  
+							                            <span>{orderDetaiel.roleName}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="市价订单金额" >    
+						                            	<span>{orderDetaiel.roleName}</span>
+								                    </FormItem>
+								                    <FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="市价首款金额" >   
+							                            <span>{orderDetaiel.roleName}</span>
+								                    </FormItem>
+								                    {true?
+							                    	<div className='clearfix'>
+									                    <FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="实签订单金额" >                             
+							                                    <Input placeholder="实签订单金额" value={this.state.roleName} onChange={(e)=>{this.setState({roleName:e.target.value})}} style={{width:'240px'}} required="required"/>
+									                   			<span className="mandatory">*</span>
+									                    </FormItem>
+									                    <FormItem className="half-item"
+									                            {...formItemLayout}
+									                            label="实签首款金额" >                             
+								                                    <Input placeholder="请输入实签首款金额" value={this.state.roleName} onChange={(e)=>{this.setState({roleName:e.target.value})}} style={{width:'240px'}} required="required"/>
+									                    		<span className="mandatory">*</span>
+									                    </FormItem>
+							                    		<FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="特批立项" >  
+								                            <Select placeholder="选择特批立项类型"
+									                            style={{ width:'240px'}}
+									                            value={this.state.orderType}
+									                            onChange={(e) => { this.setState({ orderType: e }) }}>
+									                            <Select.Option value='0'>不特批</Select.Option>
+									                            <Select.Option value='1'>申请特批</Select.Option>
+									                            <Select.Option value='2'>特批通过</Select.Option>
+									                            <Select.Option value='3'>特批驳回</Select.Option>
+									                        </Select>
+								                    		<span className="mandatory">*</span>
+							                    		</FormItem>
+							                    		<div className='clearfix'>
+												            <FormItem
+												                labelCol={{ span: 4 }}
+												                wrapperCol={{ span: 18 }}
+												                label="合同扫描件" >
+												                <PicturesWall
+												                    pictureSign="customer_sys_file"
+												                    fileList={this.getOrgCodeUrl}
+												                    pictureUrl={this.state.orgCodeUrl} />
+												                    <p>图片建议:要清晰。</p>
+												            </FormItem>
+												        </div>
+												        <div className='clearfix'>
+												        	<FormItem
+													            labelCol={{ span: 4 }}
+													            wrapperCol={{ span: 16 }}
+													            label="订单留言" >
+													                <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.introduction} 
+														    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+													        </FormItem>
+												        </div>
+											        </div>:
+											        <div className='clearfix'>
+											        	<FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="实签订单金额" >   
+								                            <span>{orderDetaiel.roleName}</span>
+							                    		</FormItem>
+							                    		<FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="实签首款金额" >   
+								                            <span>{orderDetaiel.roleName}</span>
+							                    		</FormItem>
+							                    		<FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="特批立项" >   
+								                            <span>{orderDetaiel.roleName}</span>
+							                    		</FormItem>
+														<div className="clearfix">
+															<FormItem
+										                        labelCol={{ span: 4 }}
+										                        wrapperCol={{ span: 18 }}
+										                        label="合同扫描件" >
+									                            <Upload className="demandDetailShow-upload"
+									                                listType="customer_sys_file"
+									                                fileList={this.state.orgCodeUrl}
+									                                onPreview={(file) => {
+									                                    this.setState({
+									                                        previewImage: file.url || file.thumbUrl,
+									                                        previewVisible: true,
+									                                    });
+									                                }} >
+									                            </Upload>
+									                            <Modal maskClosable={false} footer={null}
+									                                visible={this.state.previewVisible}
+									                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+									                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+									                            </Modal>
+									                        </FormItem>    
+								                        </div>
+								                        <div className='clearfix'>
+												        	<FormItem
+													            labelCol={{ span: 4 }}
+													            wrapperCol={{ span: 16 }}
+													            label="订单留言" >
+												        		<span>{orderDetaiel.roleName}</span>
+													        </FormItem>
+												        </div>
+											        </div>}
+										        <div className='clearfix'>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="订单负责人" >  
+							                            <span>{orderDetaiel.roleName}</span>
+						                    		</FormItem>
+						                    	</div>
+						                    	<div className='clearfix'>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="意向时间" >  
+							                            <span>{orderDetaiel.createTimez}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="签单时间" >  
+							                            <span>{orderDetaiel.createTimez}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="财务负责人" >  
+							                            <span>{orderDetaiel.createTimez}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="首付时间" >  
+							                            <span>{orderDetaiel.createTimez}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="项目负责人" >  
+							                            <span>{orderDetaiel.roleName}</span>
+						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="立项时间" >  
+							                            <span>{orderDetaiel.createTimez}</span>
+						                    		</FormItem>
+					                    		</div>
+					                    		<div>
+								                	<span style={{marginLeft:'50px',fontSize:'20px'}}>订单明细</span>
+								                	<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px',display:true?'block':'none'}}>添加明细</Button>
+								                </div>
+								                <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>}
+						               		<div className='btnSave'>
+							                    <Button className="setSave" type="primary" htmlType="submit">保存</Button>  
+				                                {this.props.userDetaile?<div className='operations'>
+						                            <Popconfirm title={'请确认您是否受理来自【'+this.props.datauser.roleName+'】发起的服务意向订单?'} onConfirm={(e)=>{this.admissibleOrder()}} okText="确认" cancelText="取消">
+													    <Button style={{marginRight:'10px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">受理意向</Button>                 
+													</Popconfirm>
+													<Button style={{marginRight:'10px'}} onClick={(e) =>{this.signBill()}} type="primary">签单</Button>                 
+													<Popconfirm title={'请确认您是否取消客户【'+this.props.datauser.roleName+'】的服务订单,订单取消将导致业务终止!'} onConfirm={(e)=>{this.cancelOrder()}} okText="确认" cancelText="取消">
+													    <Button style={{marginRight:'10px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">取消订单</Button>                 
+													</Popconfirm>
+													<Popconfirm title={'请确认您是否作废客户【'+this.props.datauser.roleName+'】的服务订单,订单作废将导致订单失效!'} onConfirm={(e)=>{this.scrapOrder()}} okText="确认" cancelText="取消">
+													    <Button style={{marginRight:'10px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>                 
+													</Popconfirm>
+													<Popconfirm title={'请确认您是否锁定客户【'+this.props.datauser.roleName+'】的服务订单,订单锁定将导致订单暂停!'} onConfirm={(e)=>{this.lockOrder()}} okText="确认" cancelText="取消">
+													    <Button style={{marginRight:'10px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">锁定</Button>                 
+													</Popconfirm>
+													<Popconfirm title={'请确认您是否解锁客户【'+this.props.datauser.roleName+'】的服务订单,订单解锁将导致订单正常!'} onConfirm={(e)=>{this.unlockOrder()}} okText="确认" cancelText="取消">
+													    <Button style={{marginRight:'10px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">解锁</Button>                 
+													</Popconfirm>	
+				                                </div>:''}
+				                                <Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
+			                            </div>
+				                    </div>
+			                </Spin>
+			            </Form >
+			        </Modal> 
+			        <Modal maskClosable={false} visible={this.state.addnextVisible}
+                        onOk={this.nextCancel} onCancel={this.nextCancel}
+                        width='550px'
+                        title={this.state.addState?'添加订单明细服务':'查看订单明细服务'}                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
+			                <Spin spinning={this.state.loading}>
+			                        {true?<div className="clearfix">
+				                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务名称" >   
+			                                    <AutoComplete
+										        className="certain-category-search"
+										        dropdownClassName="certain-category-search-dropdown"
+										        dropdownMatchSelectWidth={false}
+										        dropdownStyle={{ width: 230 }}
+										        style={{ width: '230px' }}
+										        dataSource={options}
+										        placeholder="输入服务名称"
+										        value={this.state.auto}
+										        onChange={this.httpChange}
+										        filterOption={true}
+										        onBlur={this.blurChange}
+										        onSelect={this.selectAuto}
+										      >
+										        <Input/>
+										      </AutoComplete> 
+					                    </FormItem>
+					                    <FormItem className="half-middle"
+					                            {...formItemLayout}
+					                            label="市场价格" >   
+				                                    <Input placeholder="输入市场价格" value={this.state.url} style={{width:'230px'}}
+				                                    onChange={(e)=>{this.setState({url:e.target.value})}} />
+					                    </FormItem>
+					                    <FormItem className="half-middle"
+					                            {...formItemLayout}
+					                            label="实签价格" >   
+				                                    <Input placeholder="请输入实签价格" value={this.state.url} style={{width:'230px'}}
+				                                    onChange={(e)=>{this.setState({url:e.target.value})}} />
+					                    </FormItem>
+					                    <FormItem className="half-middle"
+					                            {...formItemLayout}
+					                            label="服务数量" >   
+				                                    <Input placeholder="请输入服务数量" value={this.state.url} style={{width:'230px'}}
+				                                    onChange={(e)=>{this.setState({url:e.target.value})}} />
+					                    </FormItem>
+					                    <FormItem className="half-middle"
+					                            {...formItemLayout}
+					                            label="服务说明" >   
+				                                    <Input placeholder="请输入服务说明" value={this.state.url} style={{width:'230px'}}
+				                                    onChange={(e)=>{this.setState({url:e.target.value})}} />
+					                    </FormItem>
+					                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
+					                        <Button className="submitSave" type="primary" htmlType="submit">保存</Button>  
+					                        <Button className="submitSave" type="ghost" onClick={this.nextCancel}>取消</Button>
+					                    </FormItem> 
+				                    </div>:
+				                    <div className='clearfix'>
+				                    	<FormItem className="half-middle"
+					                            {...formItemLayout}
+					                            label="服务名称" >
+				                    			<span>{this.state.aaa}</span>
+				                    	</FormItem>
+				                    	<FormItem className="half-middle"
+					                            {...formItemLayout}
+					                            label="市场价格" >
+				                    			<span>{this.state.aaa}</span>
+				                    	</FormItem>
+				                    	<FormItem className="half-middle"
+					                            {...formItemLayout}
+					                            label="实签价格" >
+				                    			<span>{this.state.aaa}</span>
+				                    	</FormItem>
+				                    	<FormItem className="half-middle"
+					                            {...formItemLayout}
+					                            label="服务数量" >
+				                    			<span>{this.state.aaa}</span>
+				                    	</FormItem>
+				                    	<FormItem className="half-middle"
+					                            {...formItemLayout}
+					                            label="服务说明" >
+				                    			<span>{this.state.aaa}</span>
+				                    	</FormItem>
+				                    </div>}
+			                </Spin>
+			            </Form >
+			        </Modal>
+			        <Modal maskClosable={false} visible={this.state.signBillVisible}
+                        onOk={this.signBillOk} onCancel={this.signBillOk}
+                        width='800px'
+                        title='签单信息'                    
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" onSubmit={this.signOk} id="demand-form">
+			                <Spin spinning={this.state.loading}>
+			                        <div className="clearfix">
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="市场价格" > 
+					                            <span>{this.state.roleName}</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="客户名称" >   
+				                                    <Input placeholder="请输入客户名称" value={this.state.roleName} style={{width:'200px'}}
+				                                    onChange={(e)=>{this.setState({roleName:e.target.value})}} />
+				                                    <span className="mandatory">*</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签款项" >   
+				                                    <Input placeholder="请输入实签款项" value={this.state.url} style={{width:'200px'}}
+				                                    onChange={(e)=>{this.setState({url:e.target.value})}} />
+				                                    <span className="mandatory">*</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签首款" >   
+				                                    <Input placeholder="请输入实签首款" value={this.state.url} style={{width:'200px'}}
+				                                    onChange={(e)=>{this.setState({url:e.target.value})}} />
+				                                    <span className="mandatory">*</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="特批立项" >  
+					                            <Select placeholder="选择特批立项类型"
+						                            style={{ width:'200px'}}
+						                            value={this.state.orderType}
+						                            onChange={(e) => { this.setState({ orderType: e }) }}>
+						                            <Select.Option value='0'>未特批</Select.Option>
+						                            <Select.Option value='1'>申请特批</Select.Option>
+						                        </Select>
+					                    		<span className="mandatory">*</span>
+						                </FormItem>
+						                <div className='clearfix'>
+								        	<FormItem
+									            labelCol={{ span: 4 }}
+									            wrapperCol={{ span: 16 }}
+									            label="签单备注" >
+									                <Input type="textarea" placeholder="请输入签单备注" rows={4}  value={this.state.introduction} 
+										    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+									        </FormItem>
+								        </div>
+								        <div className='clearfix'>
+								            <FormItem
+								                labelCol={{ span: 4 }}
+								                wrapperCol={{ span: 18 }}
+								                label="合同扫描件" >
+								                <PicturesWall
+								                    pictureSign="customer_sys_file"
+								                    fileList={this.getOrgCodeUrl}
+								                    pictureUrl={this.state.orgCodeUrl} />
+								                    <p>图片建议:要清晰。</p>
+								            </FormItem>
+								        </div>
+				                    </div>
+			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
+			                        <Button className="submitSave" type="primary" onClick={this.temporary}>暂存信息</Button> 
+			                        <Button className="submitSave" type="primary" htmlType="submit">确定签单</Button>  
+			                        <Button className="submitSave" type="ghost" onClick={this.signBillOk}>返回</Button>
+			                    </FormItem> 
+			                </Spin>
+			            </Form >
+			        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default NewService;

+ 432 - 0
js/component/manageCenter/order/myOrder/myService.jsx

@@ -0,0 +1,432 @@
+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, Checkbox ,Modal, Upload ,Popconfirm} from 'antd';
+import NewService from "./addService.jsx";
+import moment from 'moment';
+import '../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress,splitUrl} from '../../../tools.js';
+
+const MyService=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/roles',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                customerName:this.state.customerName,
+                startDate: this.state.releaseDate[0],
+				endDate: this.state.releaseDate[1],
+				transactionProgress:this.state.transactionProgress,
+				contractProgress:this.state.contractProgress,
+				projectProgress:this.state.projectProgress,
+				settlementState:this.state.settlementState,
+				orderStatus:this.state.orderStatus,
+				approved:this.state.approved,
+				orderChannel:this.state.orderChannel,
+				intentOrder:this.state.intentOrder?'1':'0',
+				formalOrder:this.state.formalOrder?'1':'0'
+            },
+            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,
+	                         roleName: thisdata.roleName,
+	                         creater:thisdata.creater,
+	                         createTime:thisdata.createTimez,
+                        });
+                    };
+                    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({
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            releaseDate: [],
+            signBillState:false,
+            signBillVisible:false,
+            selectedRows: [],
+            searchMore: true,
+            loading: false,
+            intentOrder:false,
+            formalOrder: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: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '订单类型',
+                    dataIndex: 'creater',
+                    key: 'creater'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater7',
+                    key: 'creater7'
+                },{
+                    title: '订单客户',
+                    dataIndex: 'roleName1',
+                    key: 'roleName1'
+                }, {
+                    title: '实际下单金额',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                }, {
+                    title: '意向进度',
+                    dataIndex: 'createTime1',
+                    key: 'createTime1',
+                    render:(text)=>{return getIntentProgress(text) }
+                },{
+                    title: '交易进度',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2',
+                    render:(text)=>{return getTransactionProgress(text) }
+                }, {
+                    title: '合同进度',
+                    dataIndex: 'creater2',
+                    key: 'creater2',
+                    render:(text)=>{return getContractProgress(text) }
+                }, {
+                    title: '项目进度',
+                    dataIndex: 'creatu',
+                    key: 'creatu',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '结算状态',
+                    dataIndex: 'roleName3',
+                    key: 'roleName3'
+                }, {
+                    title: '订单状态',
+                    dataIndex: 'creater3',
+                    key: 'creater3'
+                }, {
+                    title: '是否特批',
+                    dataIndex: 'creat',
+                    key: 'creat'
+                },{
+                    title: '订单渠道',
+                    dataIndex: 'cre',
+                    key: 'cre'
+                },{
+                    title: '操作',
+                    dataIndex: 'ccc',
+                    key: 'ccc',
+                    render: (text, record, index) => {
+						return <div>
+							<Popconfirm title={'请确认您是否受理来自【'+record.roleName+'】发起的服务意向订单?'} onConfirm={(e)=>{this.admissibleOrder(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">受理意向</Button>                 
+							</Popconfirm>
+							<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.signBill(record)}} type="primary">签单</Button>                 
+							<Popconfirm title={'请确认您是否取消客户【'+record.roleName+'】的服务订单,订单取消将导致业务终止!'} onConfirm={(e)=>{this.cancelOrder(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">取消订单</Button>                 
+							</Popconfirm>
+							<Popconfirm title={'请确认您是否作废客户【'+record.roleName+'】的服务订单,订单作废将导致订单失效!'} onConfirm={(e)=>{this.scrapOrder(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>                 
+							</Popconfirm>
+							<Popconfirm title={'请确认您是否锁定客户【'+record.roleName+'】的服务订单,订单锁定将导致订单暂停!'} onConfirm={(e)=>{this.lockOrder(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">锁定<Icon type="lock" /></Button>                 
+							</Popconfirm>
+							<Popconfirm title={'请确认您是否解锁客户【'+record.roleName+'】的服务订单,订单解锁将导致订单正常!'} onConfirm={(e)=>{this.unlockOrder(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">解锁<Icon type="unlock" /></Button>                 
+							</Popconfirm>
+                        </div>
+					}
+                }
+            ],
+            dataSource: [],
+        };
+    },
+    //受理订单
+    admissibleOrder(e){
+    	this.operation(e,'admissibleOrder')
+    },
+    //取消订单
+    cancelOrder(e){
+    	this.operation(e,'cancelOrder')
+    },
+    //作废订单
+    scrapOrder(e){
+    	this.operation(e,'scrapOrder')
+    },
+    //锁定订单
+    lockOrder(e){
+    	this.operation(e,'lockOrder')
+    },
+    //解锁订单
+    unlockOrder(e){
+    	this.operation(e,'unlockOrder')
+    },
+    //签单
+    signBill(ids){
+    	this.setState({
+    		uid:ids,
+    		signBillVisible:true
+    	})
+    },
+    componentWillMount() {
+        this.loadData();
+    },
+    tableRowClick(record, index) {
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	signBillVisible:false,
+        	signBillState:true,
+            showDesc: true
+        });
+    },
+    //列表各种骚操作
+    operation(record,index) {
+    	let api;
+        switch(index){
+        	case 'admissibleOrder':
+        		api='/api/shoulidingdan';
+        		break;
+        	case 'cancelOrder':
+        		api='/api/quxiaodingdan';
+        		break;
+        	case 'scrapOrder':
+        		api='/api/zuofeidingdan';
+        		break;
+        	case 'lockOrder':
+        		api='/api/suodingdingdan';
+        		break;
+        	case 'unlockOrder':
+        		api='/api/jiesuodingdan';
+        		break;
+        	default:
+        	return false;
+        }
+        this.setState({
+            selectedRowKeys: [],
+            loading: true,
+            showDesc:false
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + api,
+            data: {
+            	id:record.id
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功!');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+    addClick() {
+    	this.state.userDetaile=false;
+        this.setState({
+        	signBillVisible:false,
+            showDesc: true
+        });
+    },
+    closeDesc(e, s) {
+    	this.state.userDetaile=false;
+        this.state.showDesc = e;
+        if (s) {
+            this.loadData();
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			signBillVisible:false,
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+    	this.setState({
+    		signBillVisible:false
+    	})
+        this.loadData();
+    },
+    reset() {
+    	this.setState({
+    		signBillVisible:false
+    	})
+    	this.state.customerName='';
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+		this.state.transactionProgress = undefined;
+		this.state.contractProgress = undefined;
+		this.state.projectProgress = undefined;
+		this.state.settlementState = undefined;
+		this.state.orderStatus = undefined;
+		this.state.approved = undefined;
+		this.state.orderChannel = undefined;
+		this.state.formalOrder=false;
+		this.state.intentOrder=false;
+        this.loadData();       
+    },
+    render() {
+    	const FormItem = Form.Item;
+    	const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+        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:[]
+			   })
+			},
+        };
+        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.customerName}
+	                        onChange={(e) => { this.setState({ customerName: 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 }); }} />     
+	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索<Icon type="search" /></Button>
+	                    <Button onClick={this.reset}>重置 <Icon type="reload" /></Button>
+	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
+	                    <Button type="primary" className="addButton" onClick={this.addClick} >开单<Icon type="plus" /></Button>
+	                </div>
+	                <div className='clearfix' style={{marginTop:'5px'}}>
+	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>   
+	                  		<Checkbox checked={this.state.intentOrder} onChange={(e)=>{this.setState({intentOrder:!this.state.intentOrder})}}>意向订单</Checkbox>
+	                  		<Checkbox checked={this.state.formalOrder} onChange={(e)=>{this.setState({formalOrder:!this.state.formalOrder})}}>正式订单</Checkbox>
+	                  		<Select placeholder="订单状态"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderStatus}
+	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="结算状态"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.settlementState}
+	                            onChange={(e) => { this.setState({ settlementState: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="项目进度"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.projectProgress}
+	                            onChange={(e) => { this.setState({ projectProgress: e }) }}>
+	                            {
+                                    projectProgress.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="是否特批"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.approved}
+	                            onChange={(e) => { this.setState({ approved: e }) }}>
+	                            <Select.Option value="0" >未特批</Select.Option>
+	                            <Select.Option value="1" >已特批</Select.Option>
+	                        </Select>
+	                        <Select placeholder="订单渠道"
+	                            style={{ width: 150 }}
+	                            value={this.state.orderChannel}
+	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</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>
+	                <NewService
+	                	uid={this.state.uid}
+	                	signBillVisible={this.state.signBillVisible}
+	                    signBillState={this.state.signBillState}
+	                	operation={this.operation}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser}
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />
+	            </div >
+            </div>
+        );
+    }
+}));
+
+export default MyService;
+

+ 371 - 0
js/component/manageCenter/order/orderManagement/approveOrder.jsx

@@ -0,0 +1,371 @@
+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,Checkbox} from 'antd';
+import ApproveOrderDetaile from "./approveOrderDetaile.jsx";
+import moment from 'moment';
+import '../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+
+const ApproveOrder=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/roles',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                customerName:this.state.customerName,
+                startDate: this.state.releaseDate[0],
+				endDate: this.state.releaseDate[1],
+				transactionProgress:this.state.transactionProgress,
+				contractProgress:this.state.contractProgress,
+				projectProgress:this.state.projectProgress,
+				settlementState:this.state.settlementState,
+				orderStatus:this.state.orderStatus,
+				approved:this.state.approved,
+				orderChannel:this.state.orderChannel,
+				intentOrder:this.state.intentOrder?'1':'0',
+            },
+            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,
+	                         roleName: thisdata.roleName,
+	                         creater:thisdata.creater,
+	                         createTime:thisdata.createTimez,
+                        });
+                    };
+                    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({
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            releaseDate: [],
+            selectedRows: [],
+            searchMore: true,
+            loading: false,
+            distributionVisible:false,
+            intentOrder: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 + '条数据';
+                }
+            },
+            distributionPagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.contactList(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            columns: [
+                {
+                    title: '订单编号',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '订单类型',
+                    dataIndex: 'creater',
+                    key: 'creater'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater7',
+                    key: 'creater7'
+                },{
+                    title: '订单客户',
+                    dataIndex: 'roleName1',
+                    key: 'roleName1'
+                }, {
+                    title: '订单金额',
+                    dataIndex: 'c',
+                    key: 'c'
+                },
+                {
+                    title: '实际下单金额',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                }, {
+                    title: '意向进度',
+                    dataIndex: 'createTime1',
+                    key: 'createTime1',
+                    render:(text)=>{return getIntentProgress(text) }
+                },{
+                    title: '交易进度',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2',
+                    render:(text)=>{return getTransactionProgress(text) }
+                }, {
+                    title: '结算状态',
+                    dataIndex: 'creater2',
+                    key: 'creater2',
+                    render:(text)=>{return getContractProgress(text) }
+                }, {
+                    title: '订单状态',
+                    dataIndex: 'creatu',
+                    key: 'creatu',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '订单渠道',
+                    dataIndex: 'cre',
+                    key: 'cre',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '操作',
+                    dataIndex: 'operation',
+                    key: 'operation',
+                    render: (text, record, index) => {
+						return <div>
+									<Popconfirm title={'您确认驳回 【'+ record.roleName +'】的特批申请?'} onConfirm={(e)=>{this.reject(record)}} okText="确认" cancelText="取消">
+									    <Button style={{marginRight:'5px'}} type="danger" onClick={(e) =>{ e.stopPropagation()}}>驳回</Button>                 
+									</Popconfirm>
+									<Popconfirm title={'您确定同意 【'+ record.roleName +'】的特批申请?'} onConfirm={(e)=>{this.confirm(record)}} okText="确认" cancelText="取消">
+									    <Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation()}}>同意</Button>                 
+									</Popconfirm>
+                        	   </div>
+					}
+                }
+            ],
+            dataSource: [],
+        };
+    },
+    //操作分配
+    confirmDelet(index){
+    	this.setState({
+    		userDetaile:false,
+    	});
+    	this.contactList(1,index.id)
+    },
+    //驳回
+    reject(record){
+    	let api ='api/bohui'
+    	this.confirmSelect(api,record)
+    },
+    //确认
+    confirm(record){
+    	let api='api/quren'
+    	this.confirmSelect(api,record)
+    },
+    confirmSelect(api,record){
+    	this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + api,
+            data: {
+            	id:record.id,
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+    componentWillMount() {
+        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();
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+        this.loadData();
+    },
+    //分配时搜索
+    searchOrder() {
+        this.contactList();
+    },
+    //分配时重置
+    resetOrder() {
+        this.contactList();
+    },
+    reset() {
+    	this.state.customerName='';
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+		this.state.transactionProgress = undefined;
+		this.state.contractProgress = undefined;
+		this.state.projectProgress = undefined;
+		this.state.settlementState = undefined;
+		this.state.orderStatus = undefined;
+		this.state.approved = undefined;
+		this.state.orderChannel = undefined;
+		this.state.intentOrder = 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:[]
+			   })
+			},
+        };
+        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.customerName}
+	                        onChange={(e) => { this.setState({ customerName: 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.orderStatus}
+	                        onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                        {
+	                            lvl.map(function (item) {
+	                                    return <Select.Option key={item.value} >{item.key}</Select.Option>
+	                            })
+	                        }
+                  		</Select>
+                  		<Input placeholder="订单负责人" style={{width:'150px'}}
+	                        value={this.state.customerName}
+	                        onChange={(e) => { this.setState({ customerName: 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' } : {}}> 
+	                  		<Checkbox checked={this.state.intentOrder} onChange={(e)=>{this.setState({intentOrder:!this.state.intentOrder})}}>特批历史订单</Checkbox>
+	                        <Select placeholder="订单状态"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderStatus}
+	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="结算状态"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderStatus}
+	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="订单渠道"
+	                            style={{ width: 150,marginRight:'10px' }}
+	                            value={this.state.orderChannel}
+	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</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>
+	                <ApproveOrderDetaile
+	                	confirmDelet={this.confirmDelet}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser}
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />
+	            </div >
+            </div>
+        );
+    }
+}));
+
+export default ApproveOrder;
+

+ 462 - 0
js/component/manageCenter/order/orderManagement/approveOrderDetaile.jsx

@@ -0,0 +1,462 @@
+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 {lvl} from '../../../dataDic.js';
+
+//图片组件
+const PicturesWall = React.createClass({
+    getInitialState() {
+        return {
+            previewVisible: false,
+            previewImage: '',
+            fileList: [],
+        }
+    },
+    handleCancel() {
+        this.setState({ previewVisible: false })
+    },
+    handlePreview(file) {
+        this.setState({
+            previewImage: file.url || file.thumbUrl,
+            previewVisible: true,
+        });
+    },
+    handleChange(info) {
+        let fileList = info.fileList;
+        this.setState({ fileList });
+        this.props.fileList(fileList);
+    },
+    componentWillReceiveProps(nextProps) {
+        this.state.fileList = nextProps.pictureUrl; 
+    },
+    render() {
+        const { previewVisible, previewImage, fileList } = this.state;
+        const uploadButton = (
+            <div>
+                <Icon type="plus" />
+                <div className="ant-upload-text">点击上传</div>
+            </div>
+        );
+        return (
+            <div style={{display:"inline-block"}}>
+                <Upload
+                    action={globalConfig.context + "/api/admin/superviser/uploadAdminImg"}
+                    data={{ 'sign': this.props.pictureSign }}
+                    listType="picture-card"
+                    fileList={fileList}
+                    onPreview={this.handlePreview}
+                    onChange={this.handleChange} >
+                    {fileList.length >= 4 ? null : uploadButton}
+                </Upload>
+                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
+                </Modal>
+            </div>
+        );
+    }
+});
+
+const ApproveOrderDetaile = Form.create()(React.createClass({
+	loadData() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/roles',
+            data: {
+            },
+            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,
+                        });
+                    };
+                   }
+                this.setState({
+                    dataSource: theArr,
+                    pagination: false,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			contractState:false,
+			orgCodeUrl:[],
+			checkedKeys: [],
+			columns: [
+				{
+                    title: '业务项目名称',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                },{
+                    title: '项目数量',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2'
+                }, {
+                    title: '服务市价',
+                    dataIndex: 'creater2',
+                    key: 'creater2'
+                }, {
+                    title: '实签价格',
+                    dataIndex: 'roleName3',
+                    key: 'roleName3'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater4',
+                    key: 'creater4'
+                }, {
+                    title: '项目说明',
+                    dataIndex: 'roleName5',
+                    key: 'roleName5'
+                }
+			]
+		};
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+    	$.ajax({
+            method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/role/rolePermission',
+            data: {
+              id: record.id
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                let idList=[];
+                thisData.map(function(item){
+                	idList.push(
+                		item.pid
+                	)
+                })
+                this.setState({
+					ids:record.id,
+                	roleName:thisData[0].rname,
+                	checkedKeys:idList,	
+                });                  
+            }.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);
+	},
+	componentWillMount() {
+		
+	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//查看订单明细
+	orderDetails(record){
+		if(record){
+	    	$.ajax({
+	            method: "post",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/role/rolePermission',
+	            data: {
+	              id: record.id
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                let idList=[];
+	                thisData.map(function(item){
+	                	idList.push(
+	                		item.pid
+	                	)
+	                })
+	                this.setState({
+						ids:record.id,
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+	            });
+	        }.bind(this));  
+	    }
+	},
+	tableRowClick(record, index) {
+        this.setState({
+        	addnextVisible:true,
+        });
+        this.orderDetails(record)
+    },
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			if(nextProps.datauser && nextProps.datauser.id ) {
+				this.loaduser(nextProps.datauser);
+				this.loadData();
+			}
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		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="clearfix">
+	                            <div className="clearfix">
+		                       		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单编号" >
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="下单时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="客户名称" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单类型" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单渠道" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单状态" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="已收款项" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="结算状态" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="市价订单金额" >    
+		                            	<span>{orderDetaiel.roleName}</span>
+				                    </FormItem>
+				                    <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="市价首款金额" >   
+			                            <span>{orderDetaiel.roleName}</span>
+				                    </FormItem>
+				                    <div className='clearfix'>
+							        	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="实签订单金额" >   
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="实签首款金额" >   
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="特批立项" >   
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+										<div className="clearfix">
+											<FormItem
+						                        labelCol={{ span: 4 }}
+						                        wrapperCol={{ span: 18 }}
+						                        label="合同扫描件" >
+					                            <Upload className="demandDetailShow-upload"
+					                                listType="customer_sys_file"
+					                                fileList={this.state.orgCodeUrl}
+					                                onPreview={(file) => {
+					                                    this.setState({
+					                                        previewImage: file.url || file.thumbUrl,
+					                                        previewVisible: true,
+					                                    });
+					                                }} >
+					                            </Upload>
+					                            <Modal maskClosable={false} footer={null}
+					                                visible={this.state.previewVisible}
+					                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+					                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+					                            </Modal>
+					                        </FormItem>    
+				                        </div>
+				                        <div className='clearfix'>
+								        	<FormItem
+									            labelCol={{ span: 4 }}
+									            wrapperCol={{ span: 16 }}
+									            label="订单留言" >
+								        		<span>{orderDetaiel.roleName}</span>
+									        </FormItem>
+								        </div>
+							        </div>
+		                        </div>
+		                        <div className='clearfix'>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单负责人" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    	</div>
+		                    	<div className='clearfix'>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="意向时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="签单时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="财务负责人" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="首付时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="项目负责人" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="立项时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+	                    		</div>
+				                <div>
+				                	<span style={{marginLeft:'50px',fontSize:'20px'}}>订单明细</span>
+				                </div>
+				                <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>
+		                </Spin>
+		            </Form >
+		        </Modal>
+		        <Modal maskClosable={false} visible={this.state.addnextVisible}
+                        onOk={this.nextCancel} onCancel={this.nextCancel}
+                        width='550px'
+                        title='查看订单明细服务'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	    <FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务名称" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="市场价格" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="实签价格" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务数量" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务说明" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default ApproveOrderDetaile;

+ 462 - 0
js/component/manageCenter/order/orderManagement/publicOrder.jsx

@@ -0,0 +1,462 @@
+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 PublicOrderDetaile from "./publicOrderDetaile.jsx";
+import moment from 'moment';
+import '../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+const PublicOrder=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/roles',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                customerName:this.state.customerName,
+                startDate: this.state.releaseDate[0],
+				endDate: this.state.releaseDate[1],
+				transactionProgress:this.state.transactionProgress,
+				contractProgress:this.state.contractProgress,
+				projectProgress:this.state.projectProgress,
+				settlementState:this.state.settlementState,
+				orderStatus:this.state.orderStatus,
+				approved:this.state.approved,
+				orderChannel:this.state.orderChannel
+            },
+            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,
+	                         roleName: thisdata.roleName,
+	                         creater:thisdata.creater,
+	                         createTime:thisdata.createTimez,
+                        });
+                    };
+                    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({
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            releaseDate: [],
+            selectedRows: [],
+            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 + '条数据';
+                }
+            },
+            distributionPagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.contactList(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            columns: [
+                {
+                    title: '订单编号',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '订单类型',
+                    dataIndex: 'creater',
+                    key: 'creater'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater7',
+                    key: 'creater7'
+                },{
+                    title: '订单客户',
+                    dataIndex: 'roleName1',
+                    key: 'roleName1'
+                }, {
+                    title: '订单金额',
+                    dataIndex: 'c',
+                    key: 'c'
+                },
+                {
+                    title: '实际下单金额',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                }, {
+                    title: '意向进度',
+                    dataIndex: 'createTime1',
+                    key: 'createTime1',
+                    render:(text)=>{return getIntentProgress(text) }
+                },{
+                    title: '交易进度',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2',
+                    render:(text)=>{return getTransactionProgress(text) }
+                }, {
+                    title: '结算状态',
+                    dataIndex: 'creater2',
+                    key: 'creater2',
+                    render:(text)=>{return getContractProgress(text) }
+                }, {
+                    title: '订单状态',
+                    dataIndex: 'creatu',
+                    key: 'creatu',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '订单渠道',
+                    dataIndex: 'cre',
+                    key: 'cre',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '操作',
+                    dataIndex: 'operation',
+                    key: 'operation',
+                    render: (text, record, index) => {
+						return <div>
+							    	<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>                 
+                        	   </div>
+					}
+                }
+            ],
+            userList:[
+            	{
+                    title: '用户编号',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '用户姓名',
+                    dataIndex: 'creater',
+                    key: 'creater'
+                },{
+                    title: '部门机构',
+                    dataIndex: 'roleName1',
+                    key: 'roleName1'
+                }, {
+                    title: '职务',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                },{
+                    title: '联系手机',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2'
+                }, {
+                    title: '操作',
+                    dataIndex: 'abc',
+                    key: 'abc',
+                    render:(text,record,index)=>{
+                    	return (
+                    	    <Popconfirm title={'您确认将此订单 【'+ record.roleName+'】 分配给【'+record.roleName+'-'+record.roleName+'】进行业务跟进?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
+							</Popconfirm>
+							)
+                    }
+                }
+            ],
+            dataSource: [],
+        };
+    },
+    //操作分配
+    confirmDelet(index){
+    	this.setState({
+    		userDetaile:false,
+    		distributionVisible:true
+    	});
+    	this.contactList(1,index.id)
+    },
+    distributionCancel(){
+    	this.setState({
+    		distributionVisible:false
+    	})
+    },
+    distributionOk(){
+    	this.setState({
+    		distributionVisible:false
+    	})
+    },
+    //分配对象列表
+    contactList(pageNo,orderId){
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/roles',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.distributionPagination.pageSize,
+            },
+            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,
+	                         roleName: thisdata.roleName,
+	                         creater:thisdata.creater,
+	                         createTime:thisdata.createTimez,
+	                         uid:orderId,
+                        });
+                    };
+                    this.state.distributionPagination.current = data.data.pageNo;
+                    this.state.distributionPagination.total = data.data.totalCount;
+                };
+                if(!data.data.list.length){
+					this.state.distributionPagination.current=0
+					this.state.distributionPagination.total=0
+				}
+                this.setState({
+                    distributionList: theArr,
+                    pagination: this.state.distributionPagination,
+                });
+            }.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 + "",
+            data: {
+            	id:record.id,
+            	uid:record.uid
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('分配成功');
+                this.setState({
+                    loading: false,
+                });
+                this.distributionOk();
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+    componentWillMount() {
+        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();
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+        this.loadData();
+    },
+    //分配时搜索
+    searchOrder() {
+        this.contactList();
+    },
+    //分配时重置
+    resetOrder() {
+        this.contactList();
+    },
+    reset() {
+    	this.state.customerName='';
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+		this.state.transactionProgress = undefined;
+		this.state.contractProgress = undefined;
+		this.state.projectProgress = undefined;
+		this.state.settlementState = undefined;
+		this.state.orderStatus = undefined;
+		this.state.approved = undefined;
+		this.state.orderChannel = 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:[]
+			   })
+			},
+        };
+        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.customerName}
+	                        onChange={(e) => { this.setState({ customerName: 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 }); }} />     
+	                    <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' } : {}}>                    			                  
+	                        <Select placeholder="订单状态"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderStatus}
+	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="订单渠道"
+	                            style={{ width: 150,marginRight:'10px' }}
+	                            value={this.state.orderChannel}
+	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="订单类型"
+	                            style={{ width: 150 }}
+	                            value={this.state.orderChannel}
+	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</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>
+	                <PublicOrderDetaile
+	                	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>
+			                		<Input placeholder="部门名称" style={{width:'150px'}}
+				                        value={this.state.customerName}
+				                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+				                    <Input placeholder="订单负责人" style={{width:'150px',marginLeft:'10px'}}
+				                        value={this.state.customerName}
+				                        onChange={(e) => { this.setState({ customerName: 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={this.state.distributionPagination}
+				                             />
+				                    </Spin>
+				                </div>
+			                </Spin>
+			            </Form>
+			    </Modal>
+            </div>
+        );
+    }
+}));
+
+export default PublicOrder;
+

+ 523 - 0
js/component/manageCenter/order/orderManagement/publicOrderDetaile.jsx

@@ -0,0 +1,523 @@
+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 {lvl} from '../../../dataDic.js';
+
+//图片组件
+const PicturesWall = React.createClass({
+    getInitialState() {
+        return {
+            previewVisible: false,
+            previewImage: '',
+            fileList: [],
+        }
+    },
+    handleCancel() {
+        this.setState({ previewVisible: false })
+    },
+    handlePreview(file) {
+        this.setState({
+            previewImage: file.url || file.thumbUrl,
+            previewVisible: true,
+        });
+    },
+    handleChange(info) {
+        let fileList = info.fileList;
+        this.setState({ fileList });
+        this.props.fileList(fileList);
+    },
+    componentWillReceiveProps(nextProps) {
+        this.state.fileList = nextProps.pictureUrl; 
+    },
+    render() {
+        const { previewVisible, previewImage, fileList } = this.state;
+        const uploadButton = (
+            <div>
+                <Icon type="plus" />
+                <div className="ant-upload-text">点击上传</div>
+            </div>
+        );
+        return (
+            <div style={{display:"inline-block"}}>
+                <Upload
+                    action={globalConfig.context + "/api/admin/superviser/uploadAdminImg"}
+                    data={{ 'sign': this.props.pictureSign }}
+                    listType="picture-card"
+                    fileList={fileList}
+                    onPreview={this.handlePreview}
+                    onChange={this.handleChange} >
+                    {fileList.length >= 4 ? null : uploadButton}
+                </Upload>
+                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
+                </Modal>
+            </div>
+        );
+    }
+});
+
+const ApproveDetaile = Form.create()(React.createClass({
+	loadData() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/roles',
+            data: {
+            },
+            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,
+                        });
+                    };
+                   }
+                this.setState({
+                    dataSource: theArr,
+                    pagination: false,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			contractState:false,
+			orgCodeUrl:[],
+			checkedKeys: [],
+			columns: [
+				{
+                    title: '业务项目名称',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                },{
+                    title: '项目数量',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2'
+                }, {
+                    title: '服务市价',
+                    dataIndex: 'creater2',
+                    key: 'creater2'
+                }, {
+                    title: '实签价格',
+                    dataIndex: 'roleName3',
+                    key: 'roleName3'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater4',
+                    key: 'creater4'
+                }, {
+                    title: '项目说明',
+                    dataIndex: 'roleName5',
+                    key: 'roleName5'
+                }
+			]
+		};
+	},
+	 //主管初始加载(自动补全)
+	supervisor(e){ 
+		$.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/selectName",
+            data:{
+            	name:e
+            },
+            success: function (data) {                	  
+				       let thedata=data.data;
+				    if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };	
+                    thedata = {}; 
+              }; 
+					this.setState({
+						customerArr:thedata,	
+                    });
+				}.bind(this),
+			}).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));  
+	},
+	//上级主管输入框失去焦点是判断客户是否存在
+	selectAuto(value,options){
+		this.setState({
+			auto:value
+		})
+	},
+	blurChange(e){
+		let theType;
+		let contactLists=this.state.customerArr||[];
+			if (e) {
+            contactLists.map(function (item) {
+                if (item.name == e.toString()) {
+                    theType=item.id
+                }
+           });     
+   	    }
+		this.setState({
+			theTypes:theType
+		})
+	},
+	//值改变时请求客户名称
+	httpChange(e){
+		if(e.length>=1){
+			this.supervisor(e); 
+		}	
+		this.setState({
+			auto:e
+		})
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+    	$.ajax({
+            method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/role/rolePermission',
+            data: {
+              id: record.id
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                let idList=[];
+                thisData.map(function(item){
+                	idList.push(
+                		item.pid
+                	)
+                })
+                this.setState({
+					ids:record.id,
+                	roleName:thisData[0].rname,
+                	checkedKeys:idList,	
+                });                  
+            }.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
+		})
+	},
+	//查看订单明细
+	orderDetails(record){
+		if(record){
+	    	$.ajax({
+	            method: "post",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/role/rolePermission',
+	            data: {
+	              id: record.id
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                let idList=[];
+	                thisData.map(function(item){
+	                	idList.push(
+	                		item.pid
+	                	)
+	                })
+	                this.setState({
+						ids:record.id,
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+	            });
+	        }.bind(this));  
+	    }
+	},
+	tableRowClick(record, index) {
+        this.setState({
+        	addnextVisible:true,
+        });
+        this.orderDetails(record)
+    },
+	componentWillMount() {
+		
+	},
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			if(nextProps.datauser && nextProps.datauser.id ) {
+				this.loaduser(nextProps.datauser);
+				this.loadData();
+			}
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		const orderDetaiel=this.state.orderList || [];
+		const dataSources=this.state.customerArr || [];
+        const options = dataSources.map((group,index) =>
+				      <Option key={index} value={group.name}>{group.name}</Option>
+				     )
+		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="clearfix">
+		                            <div className="clearfix">
+			                       		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="下单时间" >  
+				                            <span>{orderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="客户名称" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单类型" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单渠道" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单状态" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="已收款项" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="结算状态" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价订单金额" >    
+			                            	<span>{orderDetaiel.roleName}</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价首款金额" >   
+				                            <span>{orderDetaiel.roleName}</span>
+					                    </FormItem>
+					                    <div className='clearfix'>
+								        	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签订单金额" >   
+					                            <span>{orderDetaiel.roleName}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签首款金额" >   
+					                            <span>{orderDetaiel.roleName}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="特批立项" >   
+					                            <span>{orderDetaiel.roleName}</span>
+				                    		</FormItem>
+											<div className="clearfix">
+												<FormItem
+							                        labelCol={{ span: 4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="合同扫描件" >
+						                            <Upload className="demandDetailShow-upload"
+						                                listType="customer_sys_file"
+						                                fileList={this.state.orgCodeUrl}
+						                                onPreview={(file) => {
+						                                    this.setState({
+						                                        previewImage: file.url || file.thumbUrl,
+						                                        previewVisible: true,
+						                                    });
+						                                }} >
+						                            </Upload>
+						                            <Modal maskClosable={false} footer={null}
+						                                visible={this.state.previewVisible}
+						                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+						                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+						                            </Modal>
+						                        </FormItem>    
+					                        </div>
+					                        <div className='clearfix'>
+									        	<FormItem
+										            labelCol={{ span: 4 }}
+										            wrapperCol={{ span: 16 }}
+										            label="订单留言" >
+									        		<span>{orderDetaiel.roleName}</span>
+										        </FormItem>
+									        </div>
+								        </div>
+			                        </div>
+			                        <div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    	</div>
+			                    	<div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="意向时间" >  
+				                            <span>{orderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="签单时间" >  
+				                            <span>{orderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >  
+				                            <span>{orderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="首付时间" >  
+				                            <span>{orderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目负责人" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="立项时间" >  
+				                            <span>{orderDetaiel.createTimez}</span>
+			                    		</FormItem>
+		                    		</div>
+					                <div>
+					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>订单明细</span>
+					                </div>
+					                <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>
+			                </Spin>
+			            </Form >
+			        </Modal> 
+			        <Modal maskClosable={false} visible={this.state.addnextVisible}
+                        onOk={this.nextCancel} onCancel={this.nextCancel}
+                        width='550px'
+                        title='查看订单明细服务'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	    <FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务名称" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="市场价格" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="实签价格" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务数量" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务说明" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default ApproveDetaile;

+ 515 - 0
js/component/manageCenter/order/settlementOrder/managementDetaile.jsx

@@ -0,0 +1,515 @@
+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 {lvl} from '../../../dataDic.js';
+
+//图片组件
+const PicturesWall = React.createClass({
+    getInitialState() {
+        return {
+            previewVisible: false,
+            previewImage: '',
+            fileList: [],
+        }
+    },
+    handleCancel() {
+        this.setState({ previewVisible: false })
+    },
+    handlePreview(file) {
+        this.setState({
+            previewImage: file.url || file.thumbUrl,
+            previewVisible: true,
+        });
+    },
+    handleChange(info) {
+        let fileList = info.fileList;
+        this.setState({ fileList });
+        this.props.fileList(fileList);
+    },
+    componentWillReceiveProps(nextProps) {
+        this.state.fileList = nextProps.pictureUrl; 
+    },
+    render() {
+        const { previewVisible, previewImage, fileList } = this.state;
+        const uploadButton = (
+            <div>
+                <Icon type="plus" />
+                <div className="ant-upload-text">点击上传</div>
+            </div>
+        );
+        return (
+            <div style={{display:"inline-block"}}>
+                <Upload
+                    action={globalConfig.context + "/api/admin/superviser/uploadAdminImg"}
+                    data={{ 'sign': this.props.pictureSign }}
+                    listType="picture-card"
+                    fileList={fileList}
+                    onPreview={this.handlePreview}
+                    onChange={this.handleChange} >
+                    {fileList.length >= 4 ? null : uploadButton}
+                </Upload>
+                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
+                </Modal>
+            </div>
+        );
+    }
+});
+
+const ManagementDetaile = Form.create()(React.createClass({
+	loadData() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/roles',
+            data: {
+            },
+            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,
+                        });
+                    };
+                   }
+                this.setState({
+                    dataSource: theArr,
+                    pagination: false,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			orgCodeUrl:[],
+			checkedKeys: [],
+			columns: [
+				{
+                    title: '业务项目名称',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                },{
+                    title: '项目数量',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2'
+                }, {
+                    title: '服务市价',
+                    dataIndex: 'creater2',
+                    key: 'creater2'
+                }, {
+                    title: '实签价格',
+                    dataIndex: 'roleName3',
+                    key: 'roleName3'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater4',
+                    key: 'creater4'
+                }, {
+                    title: '项目说明',
+                    dataIndex: 'roleName5',
+                    key: 'roleName5'
+                }
+			]
+		};
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+    	$.ajax({
+            method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/role/rolePermission',
+            data: {
+              id: record.id
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                let idList=[];
+                thisData.map(function(item){
+                	idList.push(
+                		item.pid
+                	)
+                })
+                this.setState({
+					ids:record.id,
+                	roleName:thisData[0].rname,
+                	checkedKeys:idList,	
+                });                  
+            }.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
+		})
+	},
+	//查看订单明细
+	orderDetails(record){
+		if(record){
+	    	$.ajax({
+	            method: "post",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/role/rolePermission',
+	            data: {
+	              id: record.id
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                let idList=[];
+	                thisData.map(function(item){
+	                	idList.push(
+	                		item.pid
+	                	)
+	                })
+	                this.setState({
+						ids:record.id,
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+	            });
+	        }.bind(this));  
+	    }
+	},
+	//保存编辑
+	//新建订单、编辑订单保存
+	handleSubmit(e) {
+		e.preventDefault();
+//      if(this.state.orderType==undefined){
+//      	message.warning('请选择财务负责人');
+//      	return false;
+//      };
+		this.props.form.validateFields((err, values) => {
+			if(!err) {
+				this.setState({
+					loading: true
+				});
+				$.ajax({
+					method: "POST",
+					dataType: "json",
+					crossDomain: false,
+					url: globalConfig.context + 'api/baocuncaiwu',
+					data: {
+						id:this.props.datauser.id
+					}
+				}).done(function(data) {
+					this.setState({
+						loading: false
+					});
+					if(!data.error.length) {
+						message.success('保存成功!');
+						this.handleOk()
+					} else {
+						message.warning(data.error[0].message);
+					}
+				}.bind(this));
+			}
+		});
+	},
+	tableRowClick(record, index) {
+        this.setState({
+        	addnextVisible:true,
+        });
+        this.orderDetails(record)
+    },
+	componentWillMount() {
+		
+	},
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			if(nextProps.datauser && nextProps.datauser.id ) {
+				this.loaduser(nextProps.datauser);
+				this.loadData();
+			}
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		const orderDetaiel=this.state.orderList || [];
+		const dataSources=this.state.customerArr || [];
+        const options = dataSources.map((group,index) =>
+				      <Option key={index} value={group.name}>{group.name}</Option>
+				     )
+		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'}} onSubmit={this.handleSubmit} >
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+		                            <div className="clearfix">
+			                       		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="下单时间" >  
+				                            <span>{orderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="客户名称" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单类型" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单渠道" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单状态" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="已收款项" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="结算状态" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价订单金额" >    
+			                            	<span>{orderDetaiel.roleName}</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价首款金额" >   
+				                            <span>{orderDetaiel.roleName}</span>
+					                    </FormItem>
+					                    <div className='clearfix'>
+								        	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签订单金额" >   
+					                            <span>{orderDetaiel.roleName}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签首款金额" >   
+					                            <span>{orderDetaiel.roleName}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="特批立项" >   
+					                            <span>{orderDetaiel.roleName}</span>
+				                    		</FormItem>
+											<div className="clearfix">
+												<FormItem
+							                        labelCol={{ span: 4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="合同扫描件" >
+						                            <Upload className="demandDetailShow-upload"
+						                                listType="customer_sys_file"
+						                                fileList={this.state.orgCodeUrl}
+						                                onPreview={(file) => {
+						                                    this.setState({
+						                                        previewImage: file.url || file.thumbUrl,
+						                                        previewVisible: true,
+						                                    });
+						                                }} >
+						                            </Upload>
+						                            <Modal maskClosable={false} footer={null}
+						                                visible={this.state.previewVisible}
+						                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+						                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+						                            </Modal>
+						                        </FormItem>    
+					                        </div>
+					                        <div className='clearfix'>
+									        	<FormItem
+										            labelCol={{ span: 4 }}
+										            wrapperCol={{ span: 16 }}
+										            label="订单留言" >
+									        		<span>{orderDetaiel.roleName}</span>
+										        </FormItem>
+									        </div>
+								        </div>
+			                        </div>
+			                        <div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    	</div>
+			                    	<div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="意向时间" >  
+				                            <span>{orderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="签单时间" >  
+				                            <span>{orderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >  
+									        {this.props.editState?
+									        <Select placeholder="请选择财务负责人"
+						                            style={{ width: 150 }}
+						                            value={this.state.orderStatus}
+						                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+						                            {
+					                                    lvl.map(function (item) {
+					                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+					                                    })
+					                                }
+						                    </Select>:
+						                    <span>{orderDetaiel.createTimez}</span>}
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="首付时间" >  
+				                            <span>{orderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目负责人" >  
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="立项时间" >  
+				                            <span>{orderDetaiel.createTimez}</span>
+			                    		</FormItem>
+		                    		</div>
+					                <div>
+					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>订单明细</span>
+					                </div>
+					                <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>
+						            {this.props.editState?<div className='clearfix' style={{marginTop:'20px'}}>
+						            	 <Button className="setSave" type="primary" htmlType="submit">保存</Button> 
+				                         <Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
+						            </div>:''}
+			                    </div>
+			                </Spin>
+			            </Form >
+			        </Modal> 
+			        <Modal maskClosable={false} visible={this.state.addnextVisible}
+                        onOk={this.nextCancel} onCancel={this.nextCancel}
+                        width='550px'
+                        title='查看订单明细服务'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	    <FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务名称" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="市场价格" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="实签价格" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务数量" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务说明" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default ManagementDetaile;

+ 349 - 0
js/component/manageCenter/order/settlementOrder/mySettlement.jsx

@@ -0,0 +1,349 @@
+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 MySettlementDetaile from "./mySettlementDetaile.jsx";
+import moment from 'moment';
+import '../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+
+const MySettlement=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/roles',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                customerName:this.state.customerName,
+                startDate: this.state.releaseDate[0],
+				endDate: this.state.releaseDate[1],
+				transactionProgress:this.state.transactionProgress,
+				contractProgress:this.state.contractProgress,
+				projectProgress:this.state.projectProgress,
+				settlementState:this.state.settlementState,
+				orderStatus:this.state.orderStatus,
+				approved:this.state.approved,
+				orderChannel:this.state.orderChannel,
+            },
+            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,
+	                         roleName: thisdata.roleName,
+	                         creater:thisdata.creater,
+	                         createTime:thisdata.createTimez,
+                        });
+                    };
+                    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({
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            releaseDate: [],
+            selectedRows: [],
+            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 + '条数据';
+                }
+            },
+            distributionPagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.contactList(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            columns: [
+                {
+                    title: '订单编号',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '订单类型',
+                    dataIndex: 'creater',
+                    key: 'creater'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater7',
+                    key: 'creater7'
+                },{
+                    title: '订单客户',
+                    dataIndex: 'roleName1',
+                    key: 'roleName1'
+                },
+                {
+                    title: '实际下单金额',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                }, {
+                    title: '订单状态',
+                    dataIndex: 'createTime1',
+                    key: 'createTime1',
+                    render:(text)=>{return getIntentProgress(text) }
+                },{
+                    title: '项目进度',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2',
+                    render:(text)=>{return getTransactionProgress(text) }
+                }, {
+                    title: '结算状态',
+                    dataIndex: 'creater2',
+                    key: 'creater2',
+                    render:(text)=>{return getContractProgress(text) }
+                },{
+                    title: '是否特批',
+                    dataIndex: 'creater77',
+                    key: 'creater77',
+                    render:(text)=>{return getContractProgress(text) }
+                },{
+                    title: '订单负责人',
+                    dataIndex: 'creater9',
+                    key: 'creater9',
+                    render:(text)=>{return getContractProgress(text) }
+                }
+            ],
+            dataSource: [],
+        };
+    },
+    //操作分配
+    confirmDelet(index){
+    	this.setState({
+    		userDetaile:false,
+    	});
+    	this.contactList(1,index.id)
+    },
+    //驳回
+    reject(record){
+    	let api ='api/bohui'
+    	this.confirmSelect(api,record)
+    },
+    //确认
+    confirm(record){
+    	let api='api/quren'
+    	this.confirmSelect(api,record)
+    },
+    confirmSelect(api,record){
+    	this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + api,
+            data: {
+            	id:record.id,
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+    componentWillMount() {
+        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();
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+        this.loadData();
+    },
+    //分配时搜索
+    searchOrder() {
+        this.contactList();
+    },
+    //分配时重置
+    resetOrder() {
+        this.contactList();
+    },
+    reset() {
+    	this.state.customerName='';
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+		this.state.transactionProgress = undefined;
+		this.state.contractProgress = undefined;
+		this.state.projectProgress = undefined;
+		this.state.settlementState = undefined;
+		this.state.orderStatus = undefined;
+		this.state.approved = undefined;
+		this.state.orderChannel = 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:[]
+			   })
+			},
+        };
+        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.customerName}
+	                        onChange={(e) => { this.setState({ customerName: 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.orderStatus}
+	                        onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                        {
+	                            lvl.map(function (item) {
+	                                    return <Select.Option key={item.value} >{item.key}</Select.Option>
+	                            })
+	                        }
+                  		</Select>
+                  		<Input placeholder="订单负责人" style={{width:'150px'}}
+	                        value={this.state.customerName}
+	                        onChange={(e) => { this.setState({ customerName: 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' } : {}}> 
+	                        <Select placeholder="订单状态"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderStatus}
+	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="结算状态"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderStatus}
+	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="订单渠道"
+	                            style={{ width: 150,marginRight:'10px' }}
+	                            value={this.state.orderChannel}
+	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</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>
+	                <MySettlementDetaile
+	                	confirmDelet={this.confirmDelet}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser}
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />
+	            </div >
+            </div>
+        );
+    }
+}));
+
+export default MySettlement;
+

+ 462 - 0
js/component/manageCenter/order/settlementOrder/mySettlementDetaile.jsx

@@ -0,0 +1,462 @@
+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 {lvl} from '../../../dataDic.js';
+
+//图片组件
+const PicturesWall = React.createClass({
+    getInitialState() {
+        return {
+            previewVisible: false,
+            previewImage: '',
+            fileList: [],
+        }
+    },
+    handleCancel() {
+        this.setState({ previewVisible: false })
+    },
+    handlePreview(file) {
+        this.setState({
+            previewImage: file.url || file.thumbUrl,
+            previewVisible: true,
+        });
+    },
+    handleChange(info) {
+        let fileList = info.fileList;
+        this.setState({ fileList });
+        this.props.fileList(fileList);
+    },
+    componentWillReceiveProps(nextProps) {
+        this.state.fileList = nextProps.pictureUrl; 
+    },
+    render() {
+        const { previewVisible, previewImage, fileList } = this.state;
+        const uploadButton = (
+            <div>
+                <Icon type="plus" />
+                <div className="ant-upload-text">点击上传</div>
+            </div>
+        );
+        return (
+            <div style={{display:"inline-block"}}>
+                <Upload
+                    action={globalConfig.context + "/api/admin/superviser/uploadAdminImg"}
+                    data={{ 'sign': this.props.pictureSign }}
+                    listType="picture-card"
+                    fileList={fileList}
+                    onPreview={this.handlePreview}
+                    onChange={this.handleChange} >
+                    {fileList.length >= 4 ? null : uploadButton}
+                </Upload>
+                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
+                </Modal>
+            </div>
+        );
+    }
+});
+
+const MySettlementDetaile = Form.create()(React.createClass({
+	loadData() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/roles',
+            data: {
+            },
+            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,
+                        });
+                    };
+                   }
+                this.setState({
+                    dataSource: theArr,
+                    pagination: false,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			contractState:false,
+			orgCodeUrl:[],
+			checkedKeys: [],
+			columns: [
+				{
+                    title: '业务项目名称',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                },{
+                    title: '项目数量',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2'
+                }, {
+                    title: '服务市价',
+                    dataIndex: 'creater2',
+                    key: 'creater2'
+                }, {
+                    title: '实签价格',
+                    dataIndex: 'roleName3',
+                    key: 'roleName3'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater4',
+                    key: 'creater4'
+                }, {
+                    title: '项目说明',
+                    dataIndex: 'roleName5',
+                    key: 'roleName5'
+                }
+			]
+		};
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+    	$.ajax({
+            method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/role/rolePermission',
+            data: {
+              id: record.id
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                let idList=[];
+                thisData.map(function(item){
+                	idList.push(
+                		item.pid
+                	)
+                })
+                this.setState({
+					ids:record.id,
+                	roleName:thisData[0].rname,
+                	checkedKeys:idList,	
+                });                  
+            }.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);
+	},
+	componentWillMount() {
+		
+	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//查看订单明细
+	orderDetails(record){
+		if(record){
+	    	$.ajax({
+	            method: "post",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/role/rolePermission',
+	            data: {
+	              id: record.id
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                let idList=[];
+	                thisData.map(function(item){
+	                	idList.push(
+	                		item.pid
+	                	)
+	                })
+	                this.setState({
+						ids:record.id,
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+	            });
+	        }.bind(this));  
+	    }
+	},
+	tableRowClick(record, index) {
+        this.setState({
+        	addnextVisible:true,
+        });
+        this.orderDetails(record)
+    },
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			if(nextProps.datauser && nextProps.datauser.id ) {
+				this.loaduser(nextProps.datauser);
+				this.loadData();
+			}
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		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="clearfix">
+	                            <div className="clearfix">
+		                       		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单编号" >
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="下单时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="客户名称" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单类型" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单渠道" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单状态" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="已收款项" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="结算状态" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="市价订单金额" >    
+		                            	<span>{orderDetaiel.roleName}</span>
+				                    </FormItem>
+				                    <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="市价首款金额" >   
+			                            <span>{orderDetaiel.roleName}</span>
+				                    </FormItem>
+				                    <div className='clearfix'>
+							        	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="实签订单金额" >   
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="实签首款金额" >   
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="特批立项" >   
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+										<div className="clearfix">
+											<FormItem
+						                        labelCol={{ span: 4 }}
+						                        wrapperCol={{ span: 18 }}
+						                        label="合同扫描件" >
+					                            <Upload className="demandDetailShow-upload"
+					                                listType="customer_sys_file"
+					                                fileList={this.state.orgCodeUrl}
+					                                onPreview={(file) => {
+					                                    this.setState({
+					                                        previewImage: file.url || file.thumbUrl,
+					                                        previewVisible: true,
+					                                    });
+					                                }} >
+					                            </Upload>
+					                            <Modal maskClosable={false} footer={null}
+					                                visible={this.state.previewVisible}
+					                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+					                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+					                            </Modal>
+					                        </FormItem>    
+				                        </div>
+				                        <div className='clearfix'>
+								        	<FormItem
+									            labelCol={{ span: 4 }}
+									            wrapperCol={{ span: 16 }}
+									            label="订单留言" >
+								        		<span>{orderDetaiel.roleName}</span>
+									        </FormItem>
+								        </div>
+							        </div>
+		                        </div>
+		                        <div className='clearfix'>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单负责人" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    	</div>
+		                    	<div className='clearfix'>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="意向时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="签单时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="财务负责人" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="首付时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="项目负责人" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="立项时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+	                    		</div>
+				                <div>
+				                	<span style={{marginLeft:'50px',fontSize:'20px'}}>订单明细</span>
+				                </div>
+				                <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>
+		                </Spin>
+		            </Form >
+		        </Modal>
+		        <Modal maskClosable={false} visible={this.state.addnextVisible}
+                        onOk={this.nextCancel} onCancel={this.nextCancel}
+                        width='550px'
+                        title='查看订单明细服务'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	    <FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务名称" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="市场价格" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="实签价格" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务数量" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务说明" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default MySettlementDetaile;

+ 512 - 0
js/component/manageCenter/order/settlementOrder/settlementManagement.jsx

@@ -0,0 +1,512 @@
+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 "./managementDetaile.jsx";
+import moment from 'moment';
+import '../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+
+console.log(adminData.name)
+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/roles',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                customerName:this.state.customerName,
+                startDate: this.state.releaseDate[0],
+				endDate: this.state.releaseDate[1],
+				transactionProgress:this.state.transactionProgress,
+				contractProgress:this.state.contractProgress,
+				projectProgress:this.state.projectProgress,
+				settlementState:this.state.settlementState,
+				orderStatus:this.state.orderStatus,
+				approved:this.state.approved,
+				orderChannel:this.state.orderChannel
+            },
+            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,
+	                         roleName: thisdata.roleName,
+	                         creater:thisdata.creater,
+	                         createTime:thisdata.createTimez,
+                        });
+                    };
+                    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({
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            releaseDate: [],
+            selectedRows: [],
+            searchMore: true,
+            loading: false,
+            editState: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 + '条数据';
+                }
+            },
+            distributionPagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.contactList(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            columns: [
+                {
+                    title: '订单编号',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '订单类型',
+                    dataIndex: 'creater',
+                    key: 'creater'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater7',
+                    key: 'creater7'
+                },{
+                    title: '订单客户',
+                    dataIndex: 'roleName1',
+                    key: 'roleName1'
+                }, {
+                    title: '实际下单金额',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                }, {
+                    title: '订单状态',
+                    dataIndex: 'createTime1',
+                    key: 'createTime1',
+                    render:(text)=>{return getIntentProgress(text) }
+                },{
+                    title: '结算状态',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2',
+                    render:(text)=>{return getTransactionProgress(text) }
+                }, {
+                    title: '项目状态',
+                    dataIndex: 'creater2',
+                    key: 'creater2',
+                    render:(text)=>{return getContractProgress(text) }
+                }, {
+                    title: '是否特批',
+                    dataIndex: 'creatu',
+                    key: 'creatu',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '订单部门',
+                    dataIndex: 'cre1',
+                    key: 'cre1',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '订单负责人',
+                    dataIndex: 'cre2',
+                    key: 'cre2',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '财务负责人',
+                    dataIndex: 'cre3',
+                    key: 'cre3',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '项目负责人',
+                    dataIndex: 'cre4',
+                    key: 'cre4',
+                    render:(text)=>{return getProjectProgress(text) }
+                },{
+                    title: '操作',
+                    dataIndex: 'operation',
+                    key: 'operation',
+                    render: (text, record, index) => {
+						return <div>
+							    	<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>                 
+                        	   		<Popconfirm title={'订单结算编辑用于特殊情况下处理订单结算状态,请慎用!'} onConfirm={(e)=>{this.edit(record)}} okText="知悉,去编辑" cancelText="暂不编辑">
+									    <Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation() }}>编辑</Button>                 
+									</Popconfirm>
+                        	   </div>
+					}
+                }
+            ],
+            userList:[
+            	{
+                    title: '用户编号',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '用户姓名',
+                    dataIndex: 'creater',
+                    key: 'creater'
+                },{
+                    title: '部门机构',
+                    dataIndex: 'roleName1',
+                    key: 'roleName1'
+                }, {
+                    title: '职务',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                },{
+                    title: '联系手机',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2'
+                }, {
+                    title: '操作',
+                    dataIndex: 'abc',
+                    key: 'abc',
+                    render:(text,record,index)=>{
+                    	return (
+                    	    <Popconfirm title={'您确认将此订单 【'+ record.roleName+'】 分配给【'+record.roleName+'-'+record.roleName+'】进行业务跟进?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
+							</Popconfirm>
+							)
+                    }
+                }
+            ],
+            dataSource: [],
+        };
+    },
+    //操作分配
+    confirmDelet(index){
+    	this.setState({
+    		userDetaile:false,
+    		distributionVisible:true
+    	});
+    	this.contactList(1,index.id)
+    },
+    distributionCancel(){
+    	this.setState({
+    		distributionVisible:false
+    	})
+    },
+    distributionOk(){
+    	this.setState({
+    		distributionVisible:false
+    	})
+    },
+    //分配对象列表
+    contactList(pageNo,orderId){
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/roles',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.distributionPagination.pageSize,
+            },
+            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,
+	                         roleName: thisdata.roleName,
+	                         creater:thisdata.creater,
+	                         createTime:thisdata.createTimez,
+	                         uid:orderId,
+                        });
+                    };
+                    this.state.distributionPagination.current = data.data.pageNo;
+                    this.state.distributionPagination.total = data.data.totalCount;
+                };
+                if(!data.data.list.length){
+					this.state.distributionPagination.current=0
+					this.state.distributionPagination.total=0
+				}
+                this.setState({
+                    distributionList: theArr,
+                    pagination: this.state.distributionPagination,
+                });
+            }.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 + "",
+            data: {
+            	id:record.id,
+            	uid:record.uid
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('分配成功');
+                this.setState({
+                    loading: false,
+                });
+                this.distributionOk();
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+    //取编辑
+    edit(record){
+    	this.setState({
+            showDesc: true,
+            userDetaile:true,
+            datauser:record,
+            editState:true
+        });
+    },
+    componentWillMount() {
+        this.loadData();
+    },
+    tableRowClick(record, index) {
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	editState:false,
+            showDesc: true
+        });
+    },
+    closeDesc(e, s) {
+    	this.state.userDetaile=false;
+        this.state.showDesc = e;
+        if (s) {
+            this.loadData();
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+        this.loadData();
+    },
+    //分配时搜索
+    searchOrder() {
+        this.contactList();
+    },
+    //分配时重置
+    resetOrder() {
+        this.contactList();
+    },
+    reset() {
+    	this.state.customerName='';
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+		this.state.transactionProgress = undefined;
+		this.state.contractProgress = undefined;
+		this.state.projectProgress = undefined;
+		this.state.settlementState = undefined;
+		this.state.orderStatus = undefined;
+		this.state.approved = undefined;
+		this.state.orderChannel = 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:[]
+			   })
+			},
+        };
+        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.customerName}
+	                        onChange={(e) => { this.setState({ customerName: 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.orderStatus}
+	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                    </Select> 
+	                    <Input placeholder="订单负责人" style={{width:'150px'}}
+	                        value={this.state.customerName}
+	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+	                    <Select placeholder="财务负责人"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderStatus}
+	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                    </Select>     
+	                    <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' } : {}}>                    			                  
+	                        <Select placeholder="订单状态"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderStatus}
+	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="订单渠道"
+	                            style={{ width: 150,marginRight:'10px' }}
+	                            value={this.state.orderChannel}
+	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="订单类型"
+	                            style={{ width: 150 }}
+	                            value={this.state.orderChannel}
+	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</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
+	                	editState={this.state.editState}
+	                	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>
+			                		<Input placeholder="部门名称" style={{width:'150px'}}
+				                        value={this.state.customerName}
+				                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+				                    <Input placeholder="财务负责人" style={{width:'150px',marginLeft:'10px'}}
+				                        value={this.state.customerName}
+				                        onChange={(e) => { this.setState({ customerName: 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={this.state.distributionPagination}
+				                             />
+				                    </Spin>
+				                </div>
+			                </Spin>
+			            </Form>
+			    </Modal>
+            </div>
+        );
+    }
+}));
+
+export default SettlementManage;
+

+ 84 - 0
js/component/manageCenter/order/userMangagement.less

@@ -0,0 +1,84 @@
+.user-content {
+    background: #fff;
+    padding: 20px;
+    .content-title {
+        color: #333;
+        font-size: 16px;
+        overflow: hidden;
+    }
+    .user-search {
+        margin-bottom: 10px;
+        > input {
+            width: 140px;
+        }
+         > button,
+        .ant-select,
+        > input {
+            margin-right: 10px;
+            margin-top: 10px;
+        }
+        .ant-switch {
+            margin-left: 10px;
+        }
+        .search-more {
+            margin: 10px 0;
+            > span {
+                margin-right: 10px;
+            }
+        }
+    }
+    .addButton {
+        float: right;
+        margin-right: 50px!important;
+    }
+}
+.half-item {
+    float: left;
+    width: 50%;
+    height: 36px;
+    margin-bottom: 10px;
+    button {
+        margin-left: 20px;
+    }
+}
+.half-middle {
+    width: 80%;
+    margin: 10px auto;
+    height: 36px;
+    button {
+        margin-left: 20px;
+    }
+}
+.patent-table {
+    clear: both;
+}
+.set-submit {
+    margin-right: 20px;
+    font-size: 16px;
+    width: 80px;
+    height: 30px;
+    line-height: 30px;
+}
+.deletButton {
+    float: right;
+    margin-bottom: 15px;
+}
+.clearfix {
+    clear: both;
+}
+.mandatory {
+    color: red;
+    margin-left: 8px;
+}
+.search-more .ant-select-auto-complete.ant-select-lg .ant-input{
+    height:28px
+}
+.rolesCol{width: 90%;}
+.setSave,.operations,.cancel{
+    float: left;
+}
+.setSave{margin-right: 10px;margin-left: 150px;}
+.toVoid{float: left;margin-right: 10px;}
+.btnSave{text-align: center;margin-top: 10px;}
+.ant-calendar-picker{vertical-align: top;margin-top: 11px;}
+.ant-calendar-picker-input{height: 27px;}

+ 5 - 4
js/component/manageCenter/servicesManage/projectOrder/content.jsx

@@ -1,13 +1,14 @@
 import React from 'react';
 import '../../content.less';
 import LeftTab from '../leftTab.jsx';
-import Module from '../../module'
+import ProjectOrder from './projectOrder.jsx';
+import Module from '../../module.jsx'
 
 const Content = React.createClass({
     getInitialState() {
         return {
             loading: false,
-            leftKey: 'comprehensive',
+            leftKey: 'myProject',
         };
     },
     handlekey(key) {
@@ -28,8 +29,8 @@ const Content = React.createClass({
                 <div className="content-right">
                     {(() => {
                         switch (this.state.leftKey) {
-                            case '212':
-                                return <Module />;
+                            case 'myProject':
+                                return <ProjectOrder />;
                             default:
                                 return <Module />;  
                         };

+ 335 - 0
js/component/manageCenter/servicesManage/projectOrder/projectOrder.jsx

@@ -0,0 +1,335 @@
+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, Modal, Upload ,Popconfirm} from 'antd';
+import MySettlementDetaile from "./projectOrderDetaile.jsx";
+import moment from 'moment';
+import './userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+
+const ProjectOrder=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/roles',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                customerNameSearch:this.state.customerNameSearch,//客户名称
+                approvedSearch:this.state.approvedSearch, //是否特批
+                orderStatusSearch:this.state.orderStatusSearch, //订单状态
+                orderDepartmentSearch:this.state.orderDepartmentSearch, //订单部门
+                orderLeaderSearch:this.state.orderLeaderSearch,//订单负责人
+                financeLeaderSearch:this.state.financeLeaderSearch,//财务负责人
+            },
+            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,
+	                         roleName: thisdata.roleName,
+	                         creater:thisdata.creater,
+	                         createTime:thisdata.createTimez,
+                        });
+                    };
+                    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({
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            selectedRows: [],
+            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 + '条数据';
+                }
+            },
+            distributionPagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.contactList(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            columns: [
+                {
+                    title: '订单编号',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                },{
+                    title: '下单时间',
+                    dataIndex: 'creater7',
+                    key: 'creater7'
+                },{
+                    title: '客户名称',
+                    dataIndex: 'roleName1',
+                    key: 'roleName1'
+                },
+                {
+                    title: '订单类型',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                }, {
+                    title: '订单状态',
+                    dataIndex: 'createTime1',
+                    key: 'createTime1',
+                    render:(text)=>{return getIntentProgress(text) }
+                },{
+                    title: '结算状态',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2',
+                    render:(text)=>{return getTransactionProgress(text) }
+                }, {
+                    title: '是否特批',
+                    dataIndex: 'creater2',
+                    key: 'creater2',
+                    render:(text)=>{return getContractProgress(text) }
+                },{
+                    title: '订单部门',
+                    dataIndex: 'creater77',
+                    key: 'creater77',
+                    render:(text)=>{return getContractProgress(text) }
+                },{
+                    title: '订单负责人',
+                    dataIndex: 'creater9',
+                    key: 'creater9',
+                },{
+                    title: '财务负责人',
+                    dataIndex: 'creater91',
+                    key: 'creater91',
+                },{
+                	title: '操作',
+                    dataIndex: 'rr',
+                    key: 'rr',
+                    render:(text,record,index)=>{
+                    	return (
+                    		<Popconfirm title={'您确认将订单【'+record.roleName+'】进行立项,立项后可进行项目管理。'} onConfirm={(e)=>{this.edit(record)}} okText="确定立项" cancelText="暂不立项">
+								<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation() }}>立项</Button>                 
+							</Popconfirm>
+							)
+                    }
+                }
+            ],
+            dataSource: [],
+        };
+    },
+    //操作分配
+    confirmDelet(index){
+    	this.setState({
+    		userDetaile:false,
+    	});
+    	this.contactList(1,index.id)
+    },
+    //驳回
+    reject(record){
+    	let api ='api/bohui'
+    	this.confirmSelect(api,record)
+    },
+    //确认
+    confirm(record){
+    	let api='api/quren'
+    	this.confirmSelect(api,record)
+    },
+    confirmSelect(api,record){
+    	this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + api,
+            data: {
+            	id:record.id,
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+    componentWillMount() {
+        this.loadData();
+    },
+    edit(record) {
+    	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();
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+        this.loadData();
+    },
+    //分配时搜索
+    searchOrder() {
+        this.contactList();
+    },
+    //分配时重置
+    resetOrder() {
+        this.contactList();
+    },
+    reset() {
+    	this.state.customerNameSearch='';
+		this.state.approvedSearch = undefined;
+		this.state.orderStatusSearch = undefined;
+		this.state.orderDepartmentSearch = undefined;
+		this.state.orderLeaderSearch = '';
+		this.state.financeLeaderSearch = '';
+        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:[]
+			   })
+			},
+        };
+        const hasSelected = this.state.selectedRowKeys.length > 0;
+        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.customerNameSearch}
+	                        onChange={(e) => { this.setState({ customerNameSearch: e.target.value }); }} />
+	                    <Select placeholder="是否特批"
+	                        style={{ width: 150 ,marginRight:'10px'}}
+	                        value={this.state.approvedSearch}
+	                        onChange={(e) => { this.setState({ approvedSearch: e }) }}>
+	                        <Select.Option value='0'>未特批</Select.Option>
+	                        <Select.Option value='1'>已特批</Select.Option>
+                  		</Select>
+                        <Select placeholder="订单状态"
+	                        style={{ width: 150 ,marginRight:'10px'}}
+	                        value={this.state.orderStatusSearch}
+	                        onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
+	                        {
+	                            lvl.map(function (item) {
+	                                    return <Select.Option key={item.value} >{item.key}</Select.Option>
+	                            })
+	                        }
+                  		</Select>
+	                    <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' } : {}}> 
+	                        <Select placeholder="订单部门"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderDepartmentSearch}
+	                            onChange={(e) => { this.setState({ orderDepartmentSearch: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Input placeholder="订单负责人" style={{width:'150px',marginRight:'10px'}}
+		                        value={this.state.orderLeaderSearch}
+		                        onChange={(e) => { this.setState({ orderLeaderSearch: e.target.value }); }} />
+	                        <Input placeholder="财物负责人" style={{width:'150px'}}
+		                        value={this.state.financeLeaderSearch}
+		                        onChange={(e) => { this.setState({ financeLeaderSearch: e.target.value }); }} />
+	                    </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}
+	                            />
+	                    </Spin>
+	                </div>
+	                <MySettlementDetaile
+	                	confirmDelet={this.confirmDelet}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser}
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />
+	            </div >
+            </div>
+        );
+    }
+}));
+
+export default ProjectOrder;
+

+ 365 - 0
js/component/manageCenter/servicesManage/projectOrder/projectOrderDetaile.jsx

@@ -0,0 +1,365 @@
+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 {lvl} from '../../../dataDic.js';
+
+const MySettlementDetaile = Form.create()(React.createClass({
+	loadData() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/roles',
+            data: {
+            },
+            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;
+                        theArr.push({
+                             key:i,
+                             roleName5:thisdata[i].id   
+                        });
+                    };
+                   }
+                this.setState({
+                    dataSource: theArr,
+                    pagination: false,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			contractState:false,
+			orgCodeUrl:[],
+			checkedKeys: [],
+			columns: [
+				{
+                    title: '业务项目名称',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                },{
+                    title: '项目数量',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater4',
+                    key: 'creater4'
+                }, {
+                    title: '项目说明',
+                    dataIndex: 'roleName5',
+                    key: 'roleName5',
+                    render:(text) => {
+                    	return(
+                    		 text?text.substr(0,6)+'...':''
+                    	)
+                    }
+                }
+			]
+		};
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+    	$.ajax({
+            method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/role/rolePermission',
+            data: {
+              id: record.id
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                let idList=[];
+                thisData.map(function(item){
+                	idList.push(
+                		item.pid
+                	)
+                })
+                this.setState({
+					ids:record.id,
+                	roleName:thisData[0].rname,
+                	checkedKeys:idList,	
+                });                  
+            }.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);
+	},
+	componentWillMount() {
+		
+	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//查看订单明细
+	orderDetails(record){
+		if(record){
+	    	$.ajax({
+	            method: "post",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/role/rolePermission',
+	            data: {
+	              id: record.id
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                let idList=[];
+	                thisData.map(function(item){
+	                	idList.push(
+	                		item.pid
+	                	)
+	                })
+	                this.setState({
+						ids:record.id,
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+	            });
+	        }.bind(this));  
+	    }
+	},
+	tableRowClick(record, index) {
+        this.setState({
+        	addnextVisible:true,
+        });
+        this.orderDetails(record)
+    },
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			if(nextProps.datauser && nextProps.datauser.id ) {
+				this.loaduser(nextProps.datauser);
+				this.loadData();
+			}
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		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="clearfix">
+	                            <div className="clearfix">
+		                       		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单编号" >
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="下单时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="客户名称" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单类型" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单渠道" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单状态" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="已收款项" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="结算状态" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+				                    <div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="特批立项" >   
+				                            <span>{orderDetaiel.roleName}</span>
+			                    		</FormItem>
+			                    	</div>
+			                        <div className='clearfix'>
+							        	<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="订单留言" >
+							        		<span>{orderDetaiel.roleName}</span>
+								        </FormItem>
+							        </div>
+		                        </div>
+		                        <div className='clearfix'>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单负责人" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    	</div>
+		                    	<div className='clearfix'>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="意向时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="签单时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="财务负责人" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="首付时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="项目负责人" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="立项时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+	                    		</div>
+				                <div>
+				                	<span style={{marginLeft:'50px',fontSize:'20px'}}>订单明细</span>
+				                </div>
+				                <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>
+		                </Spin>
+		            </Form >
+		        </Modal>
+		        <Modal maskClosable={false} visible={this.state.addnextVisible}
+                        onOk={this.nextCancel} onCancel={this.nextCancel}
+                        width='550px'
+                        title='查看订单明细服务'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	    <FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务名称" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="项目类别" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="项目数量" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="下单时间" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务说明" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default MySettlementDetaile;

+ 84 - 0
js/component/manageCenter/servicesManage/projectOrder/userMangagement.less

@@ -0,0 +1,84 @@
+.user-content {
+    background: #fff;
+    padding: 20px;
+    .content-title {
+        color: #333;
+        font-size: 16px;
+        overflow: hidden;
+    }
+    .user-search {
+        margin-bottom: 10px;
+        > input {
+            width: 140px;
+        }
+         > button,
+        .ant-select,
+        > input {
+            margin-right: 10px;
+            margin-top: 10px;
+        }
+        .ant-switch {
+            margin-left: 10px;
+        }
+        .search-more {
+            margin: 10px 0;
+            > span {
+                margin-right: 10px;
+            }
+        }
+    }
+    .addButton {
+        float: right;
+        margin-right: 50px!important;
+    }
+}
+.half-item {
+    float: left;
+    width: 50%;
+    height: 36px;
+    margin-bottom: 10px;
+    button {
+        margin-left: 20px;
+    }
+}
+.half-middle {
+    width: 80%;
+    margin: 10px auto;
+    height: 36px;
+    button {
+        margin-left: 20px;
+    }
+}
+.patent-table {
+    clear: both;
+}
+.set-submit {
+    margin-right: 20px;
+    font-size: 16px;
+    width: 80px;
+    height: 30px;
+    line-height: 30px;
+}
+.deletButton {
+    float: right;
+    margin-bottom: 15px;
+}
+.clearfix {
+    clear: both;
+}
+.mandatory {
+    color: red;
+    margin-left: 8px;
+}
+.search-more .ant-select-auto-complete.ant-select-lg .ant-input{
+    height:28px
+}
+.rolesCol{width: 90%;}
+.setSave,.operations,.cancel{
+    float: left;
+}
+.setSave{margin-right: 10px;margin-left: 150px;}
+.toVoid{float: left;margin-right: 10px;}
+.btnSave{text-align: center;margin-top: 10px;}
+.ant-calendar-picker{vertical-align: top;margin-top: 11px;}
+.ant-calendar-picker-input{height: 27px;}

+ 56 - 4
js/component/tools.js

@@ -60,7 +60,11 @@ import {
     messageType,
     designated,
     featured,
-    actives
+    actives,
+    intentProgress,
+    transactionProgress,
+    contractProgress,
+    projectProgress
 } from './dataDic.js';
 
 import { provinceList} from './NewDicProvinceList.js';
@@ -572,11 +576,10 @@ module.exports = {
     },
     //获取需求和成果审核状态
     getTechAuditStatus: function (e) {
-        if (e||e>=0) {
-        	let tt=e.toString()
+        if (e) {
             let theType = '';
             techAuditStatusList.map(function (item) {
-                if (item.value == tt) {
+                if (item.value == e) {
                     theType = item.key;
                 };
             });
@@ -1064,5 +1067,54 @@ module.exports = {
             return theType;
         }
     
+	}, 
+	//意向进度
+	getIntentProgress:function(e){
+   		if (e) {
+            let theType = '';
+            intentProgress.map(function (item) {
+                if (item.value == e) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//交易进度
+	getTransactionProgress:function(e){
+   		if (e) {
+            let theType = '';
+            transactionProgress.map(function (item) {
+                if (item.value == e) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//合同进度
+	getContractProgress:function(e){
+   		if (e) {
+            let theType = '';
+            contractProgress.map(function (item) {
+                if (item.value == e) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//项目进度
+	getProjectProgress:function(e){
+   		if (e) {
+            let theType = '';
+            projectProgress.map(function (item) {
+                if (item.value == e) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
 	},
+	
 }