Browse Source

Merge branch 'master' of http://git.jishutao.com/jishutao/kede-client

liting2017 6 years ago
parent
commit
a900d01aee

+ 1 - 1
js/component/dataDic.js

@@ -2444,7 +2444,7 @@ module.exports = {
 	        key: "项目评审"
 	    },{
 	        value: "3",
-	        key: "项目待公示"
+	        key: "项目立项"
 	    },{
 	        value: "4",
 	        key: "项目公示"

+ 84 - 30
js/component/manageCenter/order/orderNew/addService.jsx

@@ -6,7 +6,7 @@ import '../userMangagement.less';
 import moment from 'moment';
 import Picture from '@/manageCenter/publicComponent/picture';
 import {orderTypes,customerType,jiedian,tepi,boutique} from '../../../dataDic.js';  
-import {splitUrl,getTransactionProject,getChangeState,getTransactionChannel,beforeUploadFile,getProcessStatus,getLiquidationStatus,getboutique} from '../../../tools.js';
+import {splitUrl,getTransactionProject,getChangeState,getTransactionChannel,beforeUploadFile,getProcessStatus,getLiquidationStatus,getboutique,getApprovedState} from '../../../tools.js';
 const Option = AutoComplete.Option;
 //图片组件
 const PicturesWall = React.createClass({
@@ -1063,8 +1063,8 @@ const NewService = Form.create()(React.createClass({
 						                    		<FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="合同编号" >                             
-							                                    <Input placeholder="请输入合同编号" value={this.state.contractNo}
-							                                    	onChange={(e)=>{this.setState({contractNo:e.target.value})}} style={{width:'240px'}} />
+							                                {this.state.processStatus==0?<Input placeholder="请输入合同编号" value={this.state.contractNo}
+							                                    	onChange={(e)=>{this.setState({contractNo:e.target.value})}} style={{width:'240px'}} />:<span>{this.state.contractNo}</span>}
 								                    </FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
@@ -1087,29 +1087,30 @@ const NewService = Form.create()(React.createClass({
 							                            <span>{this.state.settlementAmount+'万元'}</span>
 							                            {this.state.settlementAmount?<Button type='primary' onClick={this.tuikuan} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>退单</Button>:''}
 						                    		</FormItem>
-						                    		<FormItem className="half-item"
-							                            {...formItemLayout}
-							                            label="企业联系人" >                             
-						                                    <Input placeholder="请输入联系人" ref='signTotalAmount' value={this.state.contacts} onChange={(e)=>{this.setState({contacts:e.target.value})}} style={{width:'240px'}} />
-								                   			<span className="mandatory">*</span>
-								                    </FormItem>
-								                     <FormItem className="half-item"
-							                            {...formItemLayout}
-							                            label="联系人电话" >                             
-						                                    <Input placeholder="请输入联系人电话" ref='signTotalAmount' value={this.state.contactMobile} onChange={(e)=>{this.setState({contactMobile:e.target.value})}} style={{width:'240px'}} />
-								                   			<span className="mandatory">*</span>
-								                    </FormItem>
-								                    <FormItem className="half-item"
-							                            {...formItemLayout}
-							                            label="企业法人" >                             
-						                                    <Input placeholder="请输入法人" ref='signTotalAmount' value={this.state.legalPerson} onChange={(e)=>{this.setState({legalPerson:e.target.value})}} style={{width:'240px'}} />
-								                    </FormItem>
-								                     <FormItem className="half-item"
-							                            {...formItemLayout}
-							                            label="法人电话" >                             
-						                                    <Input placeholder="请输入法人电话" ref='signTotalAmount' value={this.state.legalPersonTel} onChange={(e)=>{this.setState({legalPersonTel:e.target.value})}} style={{width:'240px'}} />
-								                    </FormItem>
-							                    	<div className='clearfix'>
+						                    		{this.state.processStatus==0?
+						                    		<div className='clearfix'>
+							                    		<FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="企业联系人" >                             
+							                                    <Input placeholder="请输入联系人" ref='signTotalAmount' value={this.state.contacts} onChange={(e)=>{this.setState({contacts:e.target.value})}} style={{width:'240px'}} />
+									                   			<span className="mandatory">*</span>
+									                    </FormItem>
+									                     <FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="联系人电话" >                             
+							                                    <Input placeholder="请输入联系人电话" ref='signTotalAmount' value={this.state.contactMobile} onChange={(e)=>{this.setState({contactMobile:e.target.value})}} style={{width:'240px'}} />
+									                   			<span className="mandatory">*</span>
+									                    </FormItem>
+									                    <FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="企业法人" >                             
+							                                    <Input placeholder="请输入法人" ref='signTotalAmount' value={this.state.legalPerson} onChange={(e)=>{this.setState({legalPerson:e.target.value})}} style={{width:'240px'}} />
+									                    </FormItem>
+									                     <FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="法人电话" >                             
+							                                    <Input placeholder="请输入法人电话" ref='signTotalAmount' value={this.state.legalPersonTel} onChange={(e)=>{this.setState({legalPersonTel:e.target.value})}} style={{width:'240px'}} />
+									                    </FormItem>
 									                    <FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="签单金额(万元)" >                             
@@ -1145,6 +1146,52 @@ const NewService = Form.create()(React.createClass({
 					                                            value={this.state.signDate ? moment(this.state.signDate) : null}
 					                                            onChange={(data, dataString) => { this.setState({ signDate: dataString }); }} />
 					                                    </FormItem>
+					                                </div>
+					                                    :
+					                                <div className='clearfix'>
+						                    			<FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="企业联系人" >                             
+							                                <span>{this.state.contacts}</span>
+									                    </FormItem>
+									                     <FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="联系人电话" >                             
+							                                <span>{this.state.contactMobile}</span>
+									                    </FormItem>
+									                    <FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="企业法人" >                             
+							                                <span>{this.state.legalPerson}</span>
+							                            </FormItem>
+									                     <FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="法人电话" >  
+								                             <span>{this.state.legalPersonTel}</span>
+									                    </FormItem>
+									                    <FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="签单金额(万元)" >                             
+							                                 <span>{this.state.firstAmount}</span>
+									                    </FormItem>
+									                    <FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="首付金额(万元)" >                             
+							                                <span>{this.state.totalAmount}</span>
+									                    </FormItem>
+							                    		<FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="特批立项" >  
+								                            <span>{getApprovedState(this.state.approval)}</span>
+							                    		</FormItem>	
+							                    		<FormItem className="half-item"
+								                            {...formItemLayout}
+								                            label="合同签订时间" >   
+								                            <span>{this.state.signDate}</span>
+							                    		</FormItem>
+							                    	</div>}
+						                    			
+					                                    
 							                    		<div className='clearfix'>
 												            <FormItem
 												                labelCol={{ span: 4 }}
@@ -1163,15 +1210,22 @@ const NewService = Form.create()(React.createClass({
 												            </FormItem>
 												        </div>
 												        <div className='clearfix'>
+												        {this.state.processStatus==0?
 												        	<FormItem
 													            labelCol={{ span: 4 }}
 													            wrapperCol={{ span: 16 }}
 													            label="订单留言" >
 													                <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.orderRemarks} 
 														    				onChange={(e)=>{this.setState({orderRemarks:e.target.value})}}/>			                      
-													        </FormItem>
+													        </FormItem>:
+													        <FormItem
+													            labelCol={{ span: 4 }}
+													            wrapperCol={{ span: 16 }}
+													            label="订单留言" >
+												        	 	<span>{this.state.orderRemarks}</span>
+													        </FormItem>}
 												        </div>
-											        </div>
+											        
 											        <div className='clearfix'>
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
@@ -1395,8 +1449,8 @@ const NewService = Form.create()(React.createClass({
 				                    	<FormItem
 								            labelCol={{ span: 4 }}
 								            wrapperCol={{ span: 16 }}
-								            label="拒绝理由" >
-								                <Input type="textarea" placeholder="请输入拒绝理由" rows={4}  value={this.state.reason} 
+								            label="退单理由" >
+								                <Input type="textarea" placeholder="请输入退单理由" rows={4}  value={this.state.reason} 
 									    				onChange={(e)=>{this.setState({reason:e.target.value})}}/>	
 								        </FormItem>
 				                    </div>	

+ 138 - 364
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -3,9 +3,10 @@ import { Radio, Icon, Button, AutoComplete,Cascader,Input, Select, Spin, Popconf
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import Jquery from 'jquery/dist/jquery.js';
+import Picture from '@/manageCenter/publicComponent/picture';
 import moment from 'moment';
 import {boutique ,tepi,jiedian} from '@/dataDic.js';
-import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique,getNewOrderStatus} from '@/tools.js';
+import { getLiquidationStatus,getApprovedState,getProcessStatus,splitUrl,getjiedian,getboutique,getNewOrderStatus,getRefundStatus} from '@/tools.js';
 import './customer.less';
 const TabPane = Tabs.TabPane;
 const Dragger = Upload.Dragger;
@@ -111,6 +112,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 							 orderStatus:thisdata.orderStatus,//订单状态
 	                         refundStatus:thisdata.refundStatus,//退单状态
 	                         reason:thisdata.reason,//退单原因
+	                         createDate:thisdata.createDate,//退单时间
 	                         liquidationStatus:thisdata.liquidationStatus,//结算状态
 						});
 					};
@@ -139,6 +141,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 			selectedRowKeys: [],
 			orgCodeUrl:[],
 			customerArr:[],
+			applicationUrl:[],
+			contractUrl:[],
 			pagination: {
 				defaultCurrent: 1,
 				defaultPageSize: 10,
@@ -270,35 +274,95 @@ const IntentionCustomer = Form.create()(React.createClass({
 	visit(record) {
 		this.setState({
 			addnextVisible:true,
-			dunId:record.id
 		})
+		this.tuidanxiangqing(record.id);
+		
 	},
-	//删除
-    delectRow(record) {
+	//退单详情
+    tuidanxiangqing(id) {
         this.setState({
             loading: true
         });
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/newOrder/deleteOrderTask",
+            url: globalConfig.context + "/api/admin/newOrder/orderRefundDetail",
             data: {
-            	id:record.id
+            	id:id
             }
         }).done(function (data) {
-            if (!data.error.length) {
-                message.success('删除成功!');
-                this.setState({
-                    loading: false,
-                });
-                this.xiangmu(this.state.orderNo)
-            	this.loadData();
-            } else {
-                message.warning(data.error[0].message);
-            };
+            let theArr = [];
+				if(data.error.length || data.data.list == "") {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				} else {
+					let thisdata=data.data;
+					this.setState({
+						 id:thisdata.id,
+						 createDate:thisdata.createDate,//退单时间
+						 orderNo: thisdata.orderNo,//订单编号
+						 orderStatus: thisdata.orderStatus,//订单状态
+						 refundStatus:thisdata.refundStatus,//退单状态
+						 applicationUrl:thisdata.applicationUrl?splitUrl(thisdata.applicationUrl, ',', globalConfig.avatarHost + '/upload') : [],//申请表附件
+						 contractUrl:thisdata.contractUrl?splitUrl(thisdata.contractUrl, ',', globalConfig.avatarHost + '/upload') : [],//合同附件
+						 reason:thisdata.reason,//退单原因
+	                     liquidationStatus:thisdata.liquidationStatus,//结算状态
+					})
+					this.setState({
+			            loading: false
+			        });
+			        
+				};
         }.bind(this));
     },
+    //点击确认退单
+	tuidanOk(){
+		let contractUrls = [];
+		let applicationUrls = [];
+        if (this.state.contractUrl.length) {
+            let picArr = [];
+            this.state.contractUrl.map(function (item) {
+				if ( item.response && item.response.data && item.response.data.length ){
+					picArr.push(item.response.data);
+				}
+            });
+            contractUrls = picArr.join(",");
+        };
+         if (this.state.applicationUrl.length) {
+            let picArr = [];
+            this.state.applicationUrl.map(function (item) {
+				if ( item.response && item.response.data && item.response.data.length ){
+					picArr.push(item.response.data);
+				}
+            });
+            applicationUrls = picArr.join(",");
+        };
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +'/api/admin/newOrder/updateOrderRefund' ,
+			data: {
+				id:this.state.id,//订单编号
+				contractUrl:contractUrls.length?contractUrls:'',//终止合同
+				applicationUrl:applicationUrls.length?applicationUrls:'',//退单申请表
+				reason:this.state.reason,//退单原因
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('退单成功!');
+				this.nextCancel();
+				this.handleCancel();
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
 	//页面加载函数
 	componentWillMount() {
 		this.loadData();
@@ -473,247 +537,14 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
-	//催款节点保存
-	contactSave(e) {
-		this.setState({
-			loading: true
-		});
-		$.ajax({
-			url: globalConfig.context + '/api/admin/newOrder/createOrderDun',
-			method: 'post',
-			data: {
-				orderNo: this.state.orderNo,
-				orderDun: JSON.stringify(this.state.contactList)
-			}
-		}).done(function(data) {
-			this.setState({
-				loading: false
-			});
-			if(!data.error.length) {
-				message.success('保存成功!');
-				this.jiedian(this.state.orderNo);
-			} else {
-				message.warning(data.error[0].message);
-			}
-		}.bind(this));
-	},
-	//点击新增催款节点
-	addcontact(record) {
-		this.state.contactList.push({
-			key:this.state.contactList.length,
-			money: '',
-			dunSubject:undefined,
-			orderNo: this.state.orderNo,
-			dunTarget:this.state.kehuId,
-		});
-		this.setState({
-			contactList: this.state.contactList
-		})
-	},	
-	//删除收款节点
-	confirmDelet(index) {
-		this.state.contactList.splice(index,1);
-		this.setState({
-			contactList: this.state.contactList
-		})
-		this.contactSave();
-	},
-	//重新提交
-	examOk(){
-		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.contacts){
-        	message.warning('企业负责人不能为空');
-        	this.refs.signFirstPayment.focus()
-        	return false;
-        };
-        if(!this.state.contactMobile){
-        	message.warning('企业负责人电话不能为空');
-        	this.refs.signFirstPayment.focus()
-        	return false;
-        };
-        if(!this.state.totalAmount){
-        	message.warning('签单金额不能为空');
-        	this.refs.signFirstPayment.focus()
-        	return false;
-        };
-        if(!this.state.firstAmount){
-        	message.warning('首付金额不能为空');
-        	this.refs.signFirstPayment.focus()
-        	return false;
-        };
-        if(!theorgCodeUrl){
-        	message.warning('企业负责人不能为空');
-        	this.refs.signFirstPayment.focus()
-        	return false;
-        };
-		$.ajax({
-			method: "post",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context +"/api/admin/newOrder/updateServiceOrderNew",
-			data: {
-				orderNo: this.state.orderNo,//订单编号
-				totalAmount: this.state.totalAmount,//总金额
-				firstAmount: this.state.firstAmount,//首付
-				isSubmit: 1,//保存草稿还是提交
-				signDate: this.state.signDate,//签单日期
-				contacts: this.state.contacts,//企业负责人
-				contactMobile: this.state.contactMobile,//负责人联系方式
-				legalPerson: this.state.legalPerson,//企业法人
-				legalPersonTel: this.state.legalPersonTel,//企业法人联系电话
-				approval: this.state.approval,//特批状态
-				contractNo: this.state.contractNo,//合同编号
-				orderRemarks: this.state.orderRemarks,//订单备注
-				contractPictureUrl:theorgCodeUrl.length?theorgCodeUrl:'',
-			},
-			success: function(data) {
-				if(data.error.length || data.data.list == "") {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-				} else {
-					message.success("该订单已重新提交~");
-					this.setState({
-						visible:false,
-					});
-					this.resets();
-					this.loadData();
-				};
-				
-			}.bind(this),
-		}).always(function() {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
-	//重新提交
-	examOks(){
-		
-		$.ajax({
-			method: "post",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context +"/api/admin/newOrder/deleteOrderNew",
-			data: {
-				orderNo: this.state.orderNo,//订单编号
-			},
-			success: function(data) {
-				if(data.error.length || data.data.list == "") {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-				} else {
-					message.success("该订单已作废~");
-					this.setState({
-						visible:false,
-					});
-					this.resets();
-					this.loadData();
-				};
-				
-			}.bind(this),
-		}).always(function() {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
-	//新建项目明细保存
-	nextSubmit(e) {
-		e.preventDefault();
-		if(this.state.gid==undefined||!this.state.gid){
-			message.warning('服务名称不匹配!');
-			return false;
-		};
-		if(!this.state.commodityPrice){
-			message.warning('请输入金额!');
-			this.refs.commodityPrice.focus();
-			return false;
-		};
-		if(!this.state.commodityQuantity){
-			message.warning('请输入商品数量!');
-			this.refs.commodityQuantity.focus();
-			return false;
-		};
-		if(!this.state.main){
-			message.warning('请选择是否为主要项目!');
-			this.refs.commodityQuantity.focus();
-			return false;
-		};
-		this.setState({
-			loading: true
-		});
-		let api=this.state.addState?'/api/admin/newOrder/addOrderTask':'/api/bianji';
-		$.ajax({
-			method: "POST",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context +api ,
-			data: {
-				commodityId:this.state.gid,//商品ID
-				orderNo:this.state.orderNo,//订单编号
-				commodityName:this.state.commodityName,//商品名称
-				commodityQuantity:this.state.commodityQuantity,//商品数量
-				commodityPrice:this.state.commodityPrice,//签单总价
-				taskComment:this.state.taskComment,//服务说明
-				main:this.state.main,//是否为主要项目
-			}
-		}).done(function(data) {
-			this.setState({
-				loading: false
-			});
-			if(!data.error.length) {
-				message.success('保存成功!');
-				this.nextCancel()
-				 this.xiangmu(this.state.orderNo)
-			} else {
-				message.warning(data.error[0].message);
-			}
-		}.bind(this));
-	},
-	//点击签单
-	handleCancels(e) {
-		this.setState({
-			isSubmit:1
-		})
-	},
-	//点击签单
-	handleCancelq(e) {
-		this.setState({
-			isSubmit:0
-		})
-	},
+	
 	resets(){
     	this.state.orderNo='';
     	this.state.customerName='';
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
     },
-    //点击添加项目明细
-	addDetailed(){
-		this.setState({
-			gid:'',
-			customerArr:[],
-			commodityName:'',
-			commodityQuantity:'',
-			commodityId:'',
-			taskComment:'',
-			main:undefined,
-			commodityPrice:'',
-			addState:1,
-			addnextVisible: true
-		})
-	},
+    
 	
 	//搜索
 	search() {
@@ -738,80 +569,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 		})
 		this.resets();
 	},
-	//客户
-	selectAutoCUT(value){
-		let autoIds;
-		let fwList=this.state.customerArr;
-		fwList.map(function(item){
-			if(value==item.name){
-				autoIds=item.id
-			}
-		})
-		this.setState({
-			customerName:value,
-			autoId:autoIds
-		})
-		
-	},
-	//加载(自动补全)
-	supervisor(e,state){ //客户名称与服务名称自动补全
-		let api=state?'/api/admin/customer/getCustomerByName':'/api/admin/order/getBusinessProjectByName';
-		$.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + api,
-            data:state?{
-            	name:e,
-            	type:this.state.customType
-            }:{
-            	businessName: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({
-						states:state,
-						customerArr:thedata,	
-                    });
-				}.bind(this),
-			}).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));  
-	},
-	//上级主管输入框失去焦点是判断客户是否存在
-	selectAuto(value){
-		let kid=[];
-		let fwList=this.state.customerArr;
-		fwList.map(function(item){
-			if(value==item.bname){
-				kid=item
-			}
-		})
-		this.setState({
-			commodityName:value,
-			gid:kid.id,
-			//commodityPrice:kid.price==0?kid.price.toString():kid.price,
-			commodityFirstPayment:kid.firstPayment==0?kid.firstPayment.toString():kid.firstPayment
-		})
-	},
-	//服务值改变时请求客户名称
-	httpChange(e){
-		this.state.gid='';
-		if(e.length>=1){
-			this.supervisor(e,false); 
-		}	
-		this.setState({
-			commodityName:e
-		})
-	},
 	render() {
 		const formItemLayout = {
 			labelCol: { span: 8 },
@@ -1027,7 +784,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 					                        <Table columns={this.state.columnsX}
 					                            dataSource={this.state.dataSourceX}
 					                            pagination={this.state.paginations}
-					                            onRowClick={this.tableRowClickX} 
 					                            />
 					                    </Spin>
 						            </div>
@@ -1041,57 +797,75 @@ const IntentionCustomer = Form.create()(React.createClass({
                         title={'修改退单申请'}                     
                         footer=''
                         className="admin-desc-content">
-			            <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
+			            <Form layout="horizontal"  id="demand-form">
 			                <Spin spinning={this.state.loading}>
 			                        
 				                    <div className='clearfix'>
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="项目名称" >
-				                    			<span>{this.state.commodityName}</span>
+					                            label="退单编号" >
+				                    			<span>{this.state.id}</span>
 				                    	</FormItem>
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="项目数量" >
-				                    			<Input placeholder="请输入数量" value={this.state.commodityQuantity} style={{width:'200px'}}
-				                                    onChange={(e)=>{this.setState({commodityQuantity:e.target.value})}} />
-				                                <span className="mandatory">*</span>  
+					                            label="退单日期" >
+				                    			<span>{this.state.createDate}</span>
 				                    	</FormItem>
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="金额(万元)" >
-				                    			<Input placeholder="请输入签单金额" value={this.state.commodityPrice} style={{width:'200px'}}
-				                                    onChange={(e)=>{this.setState({commodityPrice:e.target.value})}} />
-				                                <span className="mandatory">*</span>      
+					                            label="订单编号" >
+				                    			<span>{this.state.orderNo}</span>
 				                    	</FormItem>
-					                    <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="主要项目" >  
-				                            <Select placeholder="选择是否为主要业务"
-					                            style={{ width:'200px'}}
-					                            value={this.state.main}
-					                            onChange={(e)=>{this.setState({main:e})}}>
-					                            {
-				                                    boutique.map(function (item) {
-				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
-				                                    })
-				                                }
-					                     	</Select>
-					                     	<span className="mandatory">*</span>   
-			                    		</FormItem>
-					                    <div className='clearfix'>
-					                    	<FormItem 
-						                            labelCol={{ span: 4 }}
-										            wrapperCol={{ span: 16 }}
-						                            label="服务说明" >
-					                    			 <Input type='textarea' placeholder="请输入服务说明" value={this.state.taskComment} 
-					                                    onChange={(e)=>{this.setState({taskComment:e.target.value})}} />
-					                    	</FormItem>
-				                    	</div>
+				                    	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="订单状态" >
+				                    			<span>{getNewOrderStatus(this.state.orderStatus)}</span>
+				                    	</FormItem>
+				                    	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="退单状态" >
+				                    			<span>{getRefundStatus(this.state.refundStatus)}</span>
+				                    	</FormItem>
+				                    	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="退款状态" >
+				                    			<span>{getLiquidationStatus(this.state.liquidationStatus)}</span>
+				                    	</FormItem>
+				                    	<div className='clearfix'>
+				                			<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 16 }} label="终止合同">
+										        <Picture
+									              fileList={(e)=>{this.setState({contractUrl:e})}}
+									              pictureUrl={this.state.contractUrl}
+									              visible={this.props.visible}
+									              data={{'sign':'order_refund_file',url:'/api/admin/newOrder/uploadRefundOrderFile',number:8}}
+									           />
+										    </FormItem>
+										</div>
+										<div className='clearfix'>
+				                			<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 16 }} label="退单申请表">
+										        <Picture
+									              fileList={(e)=>{this.setState({applicationUrl:e})}}
+									              pictureUrl={this.state.applicationUrl}
+									              visible={this.props.visible}
+									              data={{'sign':'order_refund_file',url:'/api/admin/newOrder/uploadRefundOrderFile',number:8}}
+									           />
+										    </FormItem>
+										</div>	
+					                   <div className='clearfix'>
+					                    	<FormItem
+									            labelCol={{ span: 4 }}
+									            wrapperCol={{ span: 16 }}
+									            label="退单理由" >
+					                    		{this.state.refundStatus==2?
+									                <Input type="textarea" placeholder="请输入退单理由" rows={4}  value={this.state.reason} 
+										    				onChange={(e)=>{this.setState({reason:e.target.value})}}/>:<span>{this.state.reason}</span>	}
+									        </FormItem>
+					                    </div>
+					                    {this.state.refundStatus==2?
 				                    	<FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-					                        <Button className="submitSave" type="primary" onClick={this.tabRowSave}>保存</Button>  
+					                        <Button className="submitSave" type="primary" onClick={this.tuidanOk}>重新退单</Button>  
 					                        <Button className="submitSave" type="ghost" onClick={this.nextCancel}>取消</Button>
-					                    </FormItem>
+					                    </FormItem>:''}
 				                    </div>
 			                </Spin>
 			            </Form >

+ 4 - 4
js/component/manageCenter/order/orderNew/press.jsx

@@ -394,10 +394,10 @@ const IntentionCustomer = Form.create()(React.createClass({
 	//导出
     exportExec(){
         var data = {
-            name: this.state.customerName,//订单负责人
-            orderNo: this.state.orderNo,//订单编号
-            startTime: this.state.releaseDate[0],
-            endTime: this.state.releaseDate[1],
+            name: this.state.customerName?this.state.customerName:undefined,//订单负责人
+            orderNo: this.state.orderNo?this.state.orderNo:undefined,//订单编号
+            startTime: this.state.releaseDate[0]?this.state.releaseDate[0]:undefined,
+            endTime: this.state.releaseDate[1]?this.state.releaseDate[1]:undefined,
         }
         window.location.href=(globalConfig.context+'/api/admin/newOrder/exportOrderDunData?'+$.param(data));
     },