|  | @@ -1,10 +1,10 @@
 | 
	
		
			
				|  |  |  import React from 'react';
 | 
	
		
			
				|  |  | -import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
 | 
	
		
			
				|  |  | +import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete,DatePicker} from 'antd';
 | 
	
		
			
				|  |  |  import ajax from 'jquery/src/ajax/xhr.js';
 | 
	
		
			
				|  |  |  import $ from 'jquery/src/ajax';
 | 
	
		
			
				|  |  |  import '../../userMangagement.less';
 | 
	
		
			
				|  |  |  import {orderType} from '../../../../dataDic.js';  
 | 
	
		
			
				|  |  | -import {splitUrl,getOrderType,getOrderStage,getOrderState,getTransactionProject,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel,beforeUploadFile} from '../../../../tools.js';
 | 
	
		
			
				|  |  | +import {splitUrl,getOrderType,getOrderStage,getProjectState,getOrderState,getTransactionProject,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel,beforeUploadFile} from '../../../../tools.js';
 | 
	
		
			
				|  |  |  const Option = AutoComplete.Option;
 | 
	
		
			
				|  |  |  //图片组件
 | 
	
		
			
				|  |  |  const PicturesWall = React.createClass({
 | 
	
	
		
			
				|  | @@ -457,13 +457,9 @@ const NewService = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |      signBitt(){
 | 
	
		
			
				|  |  |      	this.setState({
 | 
	
		
			
				|  |  |  			contractNo:this.state.contractNo,
 | 
	
		
			
				|  |  | -			signVisible:true
 | 
	
		
			
				|  |  | +			signVisible:true,
 | 
	
		
			
				|  |  | +			entryTime:undefined
 | 
	
		
			
				|  |  |      	})
 | 
	
		
			
				|  |  | -//  	if(this.state.contractNo){
 | 
	
		
			
				|  |  | -//  		
 | 
	
		
			
				|  |  | -//  	}else{
 | 
	
		
			
				|  |  | -//  		message.warning("请输入合同编号!")
 | 
	
		
			
				|  |  | -//  	}
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      signBittOk(){
 | 
	
		
			
				|  |  |      	this.setState({
 | 
	
	
		
			
				|  | @@ -679,6 +675,13 @@ const NewService = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  	temporary(){
 | 
	
		
			
				|  |  |  		this.temporarySave(true)
 | 
	
		
			
				|  |  |  	},
 | 
	
		
			
				|  |  | +	//签单时间选择
 | 
	
		
			
				|  |  | +    selTime(e,index){
 | 
	
		
			
				|  |  | +    	this.setState({
 | 
	
		
			
				|  |  | +    		entryTime:e,
 | 
	
		
			
				|  |  | +    		selTime:index
 | 
	
		
			
				|  |  | +    	})
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |  	signSub(e){
 | 
	
		
			
				|  |  |  		e.preventDefault();
 | 
	
		
			
				|  |  |  		this.setState({
 | 
	
	
		
			
				|  | @@ -695,7 +698,8 @@ const NewService = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  				signFirstPayment:this.state.signFirstPayment,
 | 
	
		
			
				|  |  |  				approval:this.state.approval,
 | 
	
		
			
				|  |  |  				orderRemarks:this.state.orderRemarks,
 | 
	
		
			
				|  |  | -				contractNo:this.state.contractNo
 | 
	
		
			
				|  |  | +				contractNo:this.state.contractNo,
 | 
	
		
			
				|  |  | +				signTime:this.state.selTime
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  		}).done(function(data) {
 | 
	
		
			
				|  |  |  			this.setState({
 | 
	
	
		
			
				|  | @@ -1230,6 +1234,11 @@ const NewService = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  							                            label="立项时间" >  
 | 
	
		
			
				|  |  |  							                            <span>{orderDetaiel.setUpTime}</span>
 | 
	
		
			
				|  |  |  						                    		</FormItem>
 | 
	
		
			
				|  |  | +						                    		<FormItem className="half-item"
 | 
	
		
			
				|  |  | +							                            {...formItemLayout}
 | 
	
		
			
				|  |  | +							                            label="项目状态" >  
 | 
	
		
			
				|  |  | +							                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
 | 
	
		
			
				|  |  | +						                    		</FormItem>
 | 
	
		
			
				|  |  |  					                    		</div>
 | 
	
		
			
				|  |  |  					                    		<div>
 | 
	
		
			
				|  |  |  								                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
 | 
	
	
		
			
				|  | @@ -1509,6 +1518,20 @@ const NewService = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  					                    		<span className="mandatory">*</span>
 | 
	
		
			
				|  |  |  						                </FormItem>
 | 
	
		
			
				|  |  |  				                    </div>
 | 
	
		
			
				|  |  | +				                    <div className="clearfix">
 | 
	
		
			
				|  |  | +				                    	<FormItem 
 | 
	
		
			
				|  |  | +				                            {...formItemLayout}
 | 
	
		
			
				|  |  | +				                            label="签单时间" >   
 | 
	
		
			
				|  |  | +				                            <DatePicker
 | 
	
		
			
				|  |  | +				                              style={{marginTop:"2px"}}
 | 
	
		
			
				|  |  | +										      showTime
 | 
	
		
			
				|  |  | +										      format="YYYY-MM-DD"
 | 
	
		
			
				|  |  | +										      placeholder="选择签单时间"
 | 
	
		
			
				|  |  | +										      value={this.state.entryTime}
 | 
	
		
			
				|  |  | +										      onChange={(e,time)=>{this.selTime(e,time)}}
 | 
	
		
			
				|  |  | +										    />
 | 
	
		
			
				|  |  | +			                    		</FormItem>
 | 
	
		
			
				|  |  | +			                    	</div>	
 | 
	
		
			
				|  |  |  			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
 | 
	
		
			
				|  |  |  			                        <Button className="submitSave" type="primary" htmlType="submit">确定签单</Button>  
 | 
	
		
			
				|  |  |  			                        <Button className="submitSave" type="ghost" onClick={this.signBittOk}>返回</Button>
 |