|  | @@ -6,8 +6,8 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 | 
												
													
														
															|  |  import NewService from "./addService.jsx";
 |  |  import NewService from "./addService.jsx";
 | 
												
													
														
															|  |  import moment from 'moment';
 |  |  import moment from 'moment';
 | 
												
													
														
															|  |  import '../userMangagement.less';
 |  |  import '../userMangagement.less';
 | 
												
													
														
															|  | -import {intentProgress,transactionProgress,contractProgress,projectProgress,orderType, orderStage, orderState,paymentState,specially,specialBatchState, projectState,orderChannel, approvedState, lock,paymentMethod,transactionChannel} from '../../../dataDic.js';
 |  | 
 | 
												
													
														
															|  | -import {getIntentProgress,getTransactionProgress,getProjectState,getContractProgress,getProjectProgress,splitUrl,getOrderType,getOrderStage,getOrderState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel,getProcessStatus,getLiquidationStatus} from '../../../tools.js';
 |  | 
 | 
												
													
														
															|  | 
 |  | +import {projectProgress,specially} from '../../../dataDic.js';
 | 
												
													
														
															|  | 
 |  | +import {getApprovedState,getProcessStatus,getLiquidationStatus,getNewOrderStatus} from '../../../tools.js';
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  |  const MyService=Form.create()(React.createClass({
 |  |  const MyService=Form.create()(React.createClass({
 | 
												
													
														
															|  |  	loadData(pageNo) {
 |  |  	loadData(pageNo) {
 | 
												
											
												
													
														
															|  | @@ -51,6 +51,7 @@ const MyService=Form.create()(React.createClass({
 | 
												
													
														
															|  |  	                         salesmanName:thisdata.salesmanName,//营销员名称
 |  |  	                         salesmanName:thisdata.salesmanName,//营销员名称
 | 
												
													
														
															|  |  	                         financeName:thisdata.financeName,//财务名称
 |  |  	                         financeName:thisdata.financeName,//财务名称
 | 
												
													
														
															|  |  	                         createDate:thisdata.createDate,//下单时间
 |  |  	                         createDate:thisdata.createDate,//下单时间
 | 
												
													
														
															|  | 
 |  | +	                         orderStatus:thisdata.orderStatus,//订单状态
 | 
												
													
														
															|  |                          });
 |  |                          });
 | 
												
													
														
															|  |                      };
 |  |                      };
 | 
												
													
														
															|  |                      this.state.pagination.current = data.data.pageNo;
 |  |                      this.state.pagination.current = data.data.pageNo;
 | 
												
											
												
													
														
															|  | @@ -137,9 +138,10 @@ const MyService=Form.create()(React.createClass({
 | 
												
													
														
															|  |                      key: 'approval',
 |  |                      key: 'approval',
 | 
												
													
														
															|  |                      render:text=>{return getApprovedState(text)}
 |  |                      render:text=>{return getApprovedState(text)}
 | 
												
													
														
															|  |                  },{
 |  |                  },{
 | 
												
													
														
															|  | -                    title: '订单负责人',
 |  | 
 | 
												
													
														
															|  | -                    dataIndex: 'salesmanName',
 |  | 
 | 
												
													
														
															|  | -                    key: 'salesmanName'
 |  | 
 | 
												
													
														
															|  | 
 |  | +                    title: '订单状态',
 | 
												
													
														
															|  | 
 |  | +                    dataIndex: 'orderStatus',
 | 
												
													
														
															|  | 
 |  | +                    key: 'orderStatus',
 | 
												
													
														
															|  | 
 |  | +                    render:text=>{return getNewOrderStatus(text)}
 | 
												
													
														
															|  |                  },{
 |  |                  },{
 | 
												
													
														
															|  |                      title: '财务负责人',
 |  |                      title: '财务负责人',
 | 
												
													
														
															|  |                      dataIndex: 'financeName',
 |  |                      dataIndex: 'financeName',
 |