|  | @@ -6,7 +6,7 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 | 
	
		
			
				|  |  |  import MySettlementDetaile from "./projectManageDetaile.jsx";
 | 
	
		
			
				|  |  |  import moment from 'moment';
 | 
	
		
			
				|  |  |  import '../userMangagement.less';
 | 
	
		
			
				|  |  | -import {projectState} from '../../../../dataDic.js';
 | 
	
		
			
				|  |  | +import {projectState,orderState} from '../../../../dataDic.js';
 | 
	
		
			
				|  |  |  import {getProjectState,getOrderState,getOrderType,getPaymentState,getApprovedState} from '../../../../tools.js';
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  const ProjectOrder=Form.create()(React.createClass({
 | 
	
	
		
			
				|  | @@ -25,8 +25,8 @@ const ProjectOrder=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |                  setUpStartDate: this.state.releaseDate[0],
 | 
	
		
			
				|  |  |  				setUpEndDate: this.state.releaseDate[1],
 | 
	
		
			
				|  |  |  				depId:this.state.departmentt,
 | 
	
		
			
				|  |  | -				orderStartTime: this.state.releaseDateOrder[0],
 | 
	
		
			
				|  |  | -				orderEndTime: this.state.releaseDateOrder[1],
 | 
	
		
			
				|  |  | +				orderStartDate: this.state.releaseDateOrder[0],
 | 
	
		
			
				|  |  | +				orderEndDate: this.state.releaseDateOrder[1],
 | 
	
		
			
				|  |  |                  buyerName:this.state.buyerNameSearch,//客户名称
 | 
	
		
			
				|  |  |                  orderStatus:this.state.orderStatusSearch, //订单状态
 | 
	
		
			
				|  |  |                  salesmanName:this.state.salesmanNameSearch,//订单负责人
 | 
	
	
		
			
				|  | @@ -177,6 +177,7 @@ const ProjectOrder=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |       //结项
 | 
	
		
			
				|  |  |      Knots(record){
 | 
	
		
			
				|  |  |      	this.setState({
 | 
	
		
			
				|  |  | +    		signComment:'',
 | 
	
		
			
				|  |  |      		contractId:record.id,
 | 
	
		
			
				|  |  |      		serial:record.serialNumber,
 | 
	
		
			
				|  |  |      		buyerName:record.buyerName,
 | 
	
	
		
			
				|  | @@ -380,6 +381,7 @@ const ProjectOrder=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  	                    <Input placeholder="客户名称" style={{width:'150px'}}
 | 
	
		
			
				|  |  |  	                        value={this.state.buyerNameSearch}
 | 
	
		
			
				|  |  |  	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
 | 
	
		
			
				|  |  | +	                    <span style={{fontSize:'14px',marginRight:'5px'}}>立项时间:</span>    
 | 
	
		
			
				|  |  |  	                    <RangePicker
 | 
	
		
			
				|  |  |  		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 | 
	
		
			
				|  |  |  		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
 | 
	
	
		
			
				|  | @@ -391,17 +393,7 @@ const ProjectOrder=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  	                </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.orderStatusSearch}
 | 
	
		
			
				|  |  | -	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
 | 
	
		
			
				|  |  | -	                            {
 | 
	
		
			
				|  |  | -                                    projectState.map(function (item) {
 | 
	
		
			
				|  |  | -                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 | 
	
		
			
				|  |  | -                                    })
 | 
	
		
			
				|  |  | -                                }
 | 
	
		
			
				|  |  | -	                        </Select>
 | 
	
		
			
				|  |  | -	                        <Input placeholder="订单编号" style={{width:'150px',margin:'10px'}}
 | 
	
		
			
				|  |  | +	                        <Input placeholder="订单编号" style={{width:'150px',marginRight:'10px'}}
 | 
	
		
			
				|  |  |  		                        value={this.state.orderNoSearch}
 | 
	
		
			
				|  |  |  		                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
 | 
	
		
			
				|  |  |  	                        <Select placeholder="选择部门" style={{width:'150px'}}
 | 
	
	
		
			
				|  | @@ -416,6 +408,7 @@ const ProjectOrder=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  	                        <Input placeholder="订单负责人" style={{width:'150px',margin:'10px'}}
 | 
	
		
			
				|  |  |  		                        value={this.state.salesmanNameSearch}
 | 
	
		
			
				|  |  |  		                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
 | 
	
		
			
				|  |  | +	                        <span style={{fontSize:'14px',marginRight:'5px'}}>订单时间:</span>
 | 
	
		
			
				|  |  |  	                        <RangePicker
 | 
	
		
			
				|  |  |  		                        value={[this.state.releaseDateOrder[0] ? moment(this.state.releaseDateOrder[0]) : null,
 | 
	
		
			
				|  |  |  		                        this.state.releaseDateOrder[1] ? moment(this.state.releaseDateOrder[1]) : null]}
 |