liting2017 7 years ago
parent
commit
ddc77f06fe
22 changed files with 211 additions and 206 deletions
  1. 19 19
      js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx
  2. 1 1
      js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx
  3. 2 2
      js/component/manageCenter/order/flowSettlement/billManage/myBill.jsx
  4. 6 6
      js/component/manageCenter/order/flowSettlement/billManage/myBillDetaile.jsx
  5. 3 3
      js/component/manageCenter/order/flowSettlement/billManagement/myBill.jsx
  6. 8 9
      js/component/manageCenter/order/flowSettlement/billManagement/myBillDetaile.jsx
  7. 1 1
      js/component/manageCenter/order/flowSettlement/billQuery/myBill.jsx
  8. 6 6
      js/component/manageCenter/order/flowSettlement/billQuery/myBillDetaile.jsx
  9. 2 2
      js/component/manageCenter/order/flowSettlement/myBill/myBill.jsx
  10. 10 12
      js/component/manageCenter/order/flowSettlement/myBill/myBillDetaile.jsx
  11. 28 34
      js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx
  12. 41 2
      js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx
  13. 1 1
      js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx
  14. 15 20
      js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx
  15. 1 1
      js/component/manageCenter/order/orderManagement/publicOrder/publicOrder.jsx
  16. 15 20
      js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx
  17. 2 2
      js/component/manageCenter/order/settlementOrder/mySettlement/mySettlement.jsx
  18. 15 20
      js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx
  19. 14 19
      js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx
  20. 1 1
      js/component/manageCenter/order/settlementOrder/settlementManage/settlementManagement.jsx
  21. 15 20
      js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx
  22. 5 5
      js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

+ 19 - 19
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx

@@ -138,11 +138,11 @@ const NewService = Form.create()(React.createClass({
                     dataIndex: 'commodityQuantity',
                     key: 'commodityQuantity'
                 }, {
-                    title: '服务市价',
+                    title: '服务市价(万元)',
                     dataIndex: 'commodityPrice',
                     key: 'commodityPrice'
                 }, {
-                    title: '实签价格',
+                    title: '实签价格(万元)',
                     dataIndex: 'discountPrice',
                     key: 'discountPrice'
                 }, {
@@ -179,7 +179,7 @@ const NewService = Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 }, {
-                    title: '流水金额',
+                    title: '流水金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount'
                 },{
@@ -806,7 +806,7 @@ const NewService = Form.create()(React.createClass({
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="已收款项" >  
-							                            <span>{orderDetaiel.actuallyTotalAmount}</span>
+							                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
@@ -816,24 +816,24 @@ const NewService = Form.create()(React.createClass({
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="市价订单金额" >    
-						                            	<span>{orderDetaiel.orderAmount}</span>
+						                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
 								                    </FormItem>
 								                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="市价首款金额" >   
-							                            <span>{orderDetaiel.firstPayment}</span>
+							                            <span>{orderDetaiel.firstPayment+'万元'}</span>
 								                    </FormItem>
 								                    {orderDetaiel.deleteSign==0&&orderDetaiel.orderStatus==2?
 							                    	<div className='clearfix'>
 									                    <FormItem className="half-item"
 								                            {...formItemLayout}
-								                            label="实签订单金额" >                             
+								                            label="实签订单金额(万元)" >                             
 							                                    <Input placeholder="实签订单金额" ref='signTotalAmount' value={this.state.signTotalAmount} onChange={(e)=>{this.setState({signTotalAmount:e.target.value})}} style={{width:'240px'}} />
 									                   			<span className="mandatory">*</span>
 									                    </FormItem>
 									                    <FormItem className="half-item"
 									                            {...formItemLayout}
-									                            label="实签首款金额" >                             
+									                            label="实签首款金额(万元)" >                             
 								                                    <Input placeholder="请输入实签首款金额" ref='signFirstPayment' value={this.state.signFirstPayment} onChange={(e)=>{this.setState({signFirstPayment:e.target.value})}} style={{width:'240px'}} />
 									                    		<span className="mandatory">*</span>
 									                    </FormItem>
@@ -868,12 +868,12 @@ const NewService = Form.create()(React.createClass({
 											        	<FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="实签订单金额" >   
-								                            <span>{orderDetaiel.signTotalAmount}</span>
+								                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
 							                    		</FormItem>
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="实签首款金额" >   
-								                            <span>{orderDetaiel.signFirstPayment}</span>
+								                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
 							                    		</FormItem>
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
@@ -1017,12 +1017,12 @@ const NewService = Form.create()(React.createClass({
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="市场价格" >   
+					                            label="市场价格(万元)" >   
 				                                <span>{this.state.commodityPrice}</span>    
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签价格" >   
+					                            label="实签价格(万元)" >   
 				                                    <Input placeholder="请输入实签价格" value={this.state.discountPrice} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({discountPrice:e.target.value})}} ref="discountPrice"/>
 				                                <span className="mandatory">*</span>    
@@ -1036,12 +1036,12 @@ const NewService = Form.create()(React.createClass({
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="市场首付金额" >   
+					                            label="市场首付金额(万元)" >   
 				                                <span>{this.state.commodityFirstPayment}</span>  
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="签单首付金额" >   
+					                            label="签单首付金额(万元)" >   
 				                                    <Input placeholder="请输入签单首付金额" value={this.state.discountFirstPayment} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({discountFirstPayment:e.target.value})}} ref='discountFirstPayment'/>
 				                                <span className="mandatory">*</span>    
@@ -1080,7 +1080,7 @@ const NewService = Form.create()(React.createClass({
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签价格" >
-				                    			<span>{editFws.discountPrice}</span>
+				                    			<span>{editFws.discountPrice+'万元'}</span>
 				                    	</FormItem>
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -1095,12 +1095,12 @@ const NewService = Form.create()(React.createClass({
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="市场首付金额" >   
-				                                <span>{editFws.commodityFirstPayment}</span>    
+				                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="签单首付金额" >   
-				                                <span>{editFws.discountFirstPayment}</span>    
+				                                <span>{editFws.discountFirstPayment+'万元'}</span>    
 					                    </FormItem>
 					                    <div className='clearfix'>
 					                    	<FormItem 
@@ -1135,14 +1135,14 @@ const NewService = Form.create()(React.createClass({
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签款项" >   
+					                            label="实签款项(万元)" >   
 				                                    <Input placeholder="请输入实签款项" value={this.state.signTotalAmount} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({signTotalAmount:e.target.value})}} />
 				                                    <span className="mandatory">*</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签首款" >   
+					                            label="实签首款(万元)" >   
 				                                    <Input placeholder="请输入实签首款" value={this.state.signFirstPayment} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({signFirstPayment:e.target.value})}} />
 				                                    <span className="mandatory">*</span>

+ 1 - 1
js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx

@@ -187,7 +187,7 @@ const ServiceManage=Form.create()(React.createClass({
                     	return (text.length>9?text.substr(0,9)+'...':text)
                     }
                 }, {
-                    title: '实际下单金额',
+                    title: '实际下单金额(万元)',
                     dataIndex: 'signTotalAmount',
                     key: 'signTotalAmount'
                 },{

+ 2 - 2
js/component/manageCenter/order/flowSettlement/billManage/myBill.jsx

@@ -152,7 +152,7 @@ const MyBill=Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 }, {
-                    title: '流水金额',
+                    title: '流水金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount'
                 },{
@@ -276,7 +276,7 @@ const MyBill=Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                	<span style={{fontSize:'16px'}}>结算流水管理</span>	
+                	<span style={{fontSize:'16px'}}>部门订单流水</span>	
 	                <div className="user-search">
 	                    <Input placeholder="付款人名称" style={{width:'150px'}}
 	                        value={this.state.draweeName}

+ 6 - 6
js/component/manageCenter/order/flowSettlement/billManage/myBillDetaile.jsx

@@ -202,7 +202,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="流水金额" >  
-			                            <span>{orderDetaiel.transactionAmount}</span>
+			                            <span>{orderDetaiel.transactionAmount+'万元'}</span>
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
@@ -364,7 +364,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="已收款项" >  
-				                            <span>{seeOrderDetaiel.actuallyTotalAmount}</span>
+				                            <span>{seeOrderDetaiel.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -374,23 +374,23 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价订单金额" >    
-			                            	<span>{seeOrderDetaiel.orderAmount}</span>
+			                            	<span>{seeOrderDetaiel.orderAmount+'万元'}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价首款金额" >   
-				                            <span>{seeOrderDetaiel.firstPayment}</span>
+				                            <span>{seeOrderDetaiel.firstPayment+'万元'}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   
-					                            <span>{seeOrderDetaiel.signTotalAmount}</span>
+					                            <span>{seeOrderDetaiel.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签首款金额" >   
-					                            <span>{seeOrderDetaiel.signFirstPayment}</span>
+					                            <span>{seeOrderDetaiel.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}

+ 3 - 3
js/component/manageCenter/order/flowSettlement/billManagement/myBill.jsx

@@ -18,7 +18,7 @@ const MyBill=Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/queryAllBill',
+            url: globalConfig.context + '/api/admin/order/listMyBill',
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -152,7 +152,7 @@ const MyBill=Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 }, {
-                    title: '流水金额',
+                    title: '流水金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount'
                 },{
@@ -286,7 +286,7 @@ const MyBill=Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                	<span style={{fontSize:'16px'}}>我的结算流水</span>	
+                	<span style={{fontSize:'16px'}}>结算流水管理</span>	
 	                <div className="user-search">
 	                    <Input placeholder="付款人名称" style={{width:'150px'}}
 	                        value={this.state.draweeName}

+ 8 - 9
js/component/manageCenter/order/flowSettlement/billManagement/myBillDetaile.jsx

@@ -36,7 +36,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 	                    };
 	                    thisData = {};
 	                };
-	                console.log(thisData.financialPayTime)
 	                this.setState({
 	                	orderList:thisData,
 	                	financialPayNo:thisData.financialPayNo,
@@ -201,7 +200,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="流水金额" >  
-			                            <span>{orderDetaiel.transactionAmount}</span>
+			                            <span>{orderDetaiel.transactionAmount+'万元'}</span>
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
@@ -272,7 +271,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="财务流水时间" >   
-				                            <DatePicker style={{marginTop:'2px'}}
+				                            <DatePicker style={{marginTop:'2px',width:'200px'}}
 										      showTime
 										      format="YYYY-MM-DD HH:mm:ss"
 										      placeholder="选择时间"
@@ -310,7 +309,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 								        </FormItem>
 								    </div>} 
 								    {!this.props.rowClick?<div className='btnSave'>
-							            <Button className="setSave" type="primary" onClick={this.toVoidCancel}>确认流水</Button> 
+							            <Button className="setSave" type="primary" onClick={this.toVoidCancel}>保存信息</Button> 
 							        	<Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
 							        </div>:''}
 		                        </div>
@@ -361,7 +360,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="已收款项" >  
-				                            <span>{seeOrderDetaiel.actuallyTotalAmount}</span>
+				                            <span>{seeOrderDetaiel.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -371,23 +370,23 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价订单金额" >    
-			                            	<span>{seeOrderDetaiel.orderAmount}</span>
+			                            	<span>{seeOrderDetaiel.orderAmount+'万元'}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价首款金额" >   
-				                            <span>{seeOrderDetaiel.firstPayment}</span>
+				                            <span>{seeOrderDetaiel.firstPayment+'万元'}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   
-					                            <span>{seeOrderDetaiel.signTotalAmount}</span>
+					                            <span>{seeOrderDetaiel.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签首款金额" >   
-					                            <span>{seeOrderDetaiel.signFirstPayment}</span>
+					                            <span>{seeOrderDetaiel.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}

+ 1 - 1
js/component/manageCenter/order/flowSettlement/billQuery/myBill.jsx

@@ -152,7 +152,7 @@ const MyBill=Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 }, {
-                    title: '流水金额',
+                    title: '流水金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount'
                 },{

+ 6 - 6
js/component/manageCenter/order/flowSettlement/billQuery/myBillDetaile.jsx

@@ -202,7 +202,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="流水金额" >  
-			                            <span>{orderDetaiel.transactionAmount}</span>
+			                            <span>{orderDetaiel.transactionAmount+'万元'}</span>
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
@@ -364,7 +364,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="已收款项" >  
-				                            <span>{seeOrderDetaiel.actuallyTotalAmount}</span>
+				                            <span>{seeOrderDetaiel.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -374,23 +374,23 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价订单金额" >    
-			                            	<span>{seeOrderDetaiel.orderAmount}</span>
+			                            	<span>{seeOrderDetaiel.orderAmount+'万元'}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价首款金额" >   
-				                            <span>{seeOrderDetaiel.firstPayment}</span>
+				                            <span>{seeOrderDetaiel.firstPayment+'万元'}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   
-					                            <span>{seeOrderDetaiel.signTotalAmount}</span>
+					                            <span>{seeOrderDetaiel.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签首款金额" >   
-					                            <span>{seeOrderDetaiel.signFirstPayment}</span>
+					                            <span>{seeOrderDetaiel.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}

+ 2 - 2
js/component/manageCenter/order/flowSettlement/myBill/myBill.jsx

@@ -155,7 +155,7 @@ const MyBill=Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 }, {
-                    title: '流水金额',
+                    title: '流水金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount'
                 },{
@@ -289,7 +289,7 @@ const MyBill=Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                	<span style={{fontSize:'16px'}}>我的结算流水</span>	
+                	<span style={{fontSize:'16px'}}>我的订单流水</span>	
 	                <div className="user-search">
 	                    <Input placeholder="付款人名称" style={{width:'150px'}}
 	                        value={this.state.draweeName}

+ 10 - 12
js/component/manageCenter/order/flowSettlement/myBill/myBillDetaile.jsx

@@ -5,7 +5,7 @@ import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {} from '../../../../dataDic.js';
 import {getOrderType ,getOrderChannel , getOrderState ,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
-
+import moment from 'moment';
 
 const MyBillDetaile = Form.create()(React.createClass({
 	getInitialState() {
@@ -40,6 +40,9 @@ const MyBillDetaile = Form.create()(React.createClass({
 	                this.setState({
 	                	orderList:thisData,
 						billNoId:record.billNo,
+						financialPayNo:thisData.financialPayNo,
+	                	financialPayTime:thisData.financialPayTime?moment(thisData.financialPayTime,'YYYY-MM-DD HH:mm:ss'):undefined,
+	                	remarks:thisData.remarks,
 	                });                  
 	            }.bind(this),
 	       }).always(function () {
@@ -168,11 +171,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 		if(nextProps.userDetaile && nextProps.showDesc ) {
 			this.loaduser(nextProps.datauser);
 		};
-		if(!this.props.rowClick){
-			this.state.remarks='';
-			this.state.financialPayNo ='';
-			this.state.financialPayTime =undefined;
-		}
 	},
 	render() {
 		const FormItem = Form.Item
@@ -207,7 +205,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="流水金额" >  
-			                            <span>{orderDetaiel.transactionAmount}</span>
+			                            <span>{orderDetaiel.transactionAmount+'万元'}</span>
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
@@ -369,7 +367,7 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="已收款项" >  
-				                            <span>{seeOrderDetaiel.actuallyTotalAmount}</span>
+				                            <span>{seeOrderDetaiel.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -379,23 +377,23 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价订单金额" >    
-			                            	<span>{seeOrderDetaiel.orderAmount}</span>
+			                            	<span>{seeOrderDetaiel.orderAmount+'万元'}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价首款金额" >   
-				                            <span>{seeOrderDetaiel.firstPayment}</span>
+				                            <span>{seeOrderDetaiel.firstPayment+'万元'}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   
-					                            <span>{seeOrderDetaiel.signTotalAmount}</span>
+					                            <span>{seeOrderDetaiel.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签首款金额" >   
-					                            <span>{seeOrderDetaiel.signFirstPayment}</span>
+					                            <span>{seeOrderDetaiel.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}

+ 28 - 34
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -138,11 +138,11 @@ const NewService = Form.create()(React.createClass({
                     dataIndex: 'commodityQuantity',
                     key: 'commodityQuantity'
                 }, {
-                    title: '服务市价',
+                    title: '服务市价(万元)',
                     dataIndex: 'commodityPrice',
                     key: 'commodityPrice'
                 }, {
-                    title: '实签价格',
+                    title: '实签价格(万元)',
                     dataIndex: 'discountPrice',
                     key: 'discountPrice'
                 }, {
@@ -179,7 +179,7 @@ const NewService = Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 }, {
-                    title: '流水金额',
+                    title: '流水金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount'
                 },{
@@ -251,7 +251,7 @@ const NewService = Form.create()(React.createClass({
 	        	message.warning('请选择订单类型');
 	        	return false;
 	        }
-        	if(this.state.autoId==undefined||!this.state.autoId){ 
+        	if(!this.state.autoId){ 
 	        	message.warning('客户名称不匹配');
 	        	return false;
         	};
@@ -508,24 +508,19 @@ const NewService = Form.create()(React.createClass({
 		})
 	},
 	//客户
-	selectAutoCUT(value,options){
-		this.setState({
-			customerName:value,
-		})
-	},
-	blurCutor(value){
+	selectAutoCUT(value){
 		let autoIds;
 		let fwList=this.state.customerArr;
 		fwList.map(function(item){
 			if(value==item.name){
 				autoIds=item.id
-			}else{
-				autoIds=''
 			}
 		})
 		this.setState({
+			customerName:value,
 			autoId:autoIds
 		})
+		
 	},
 	//服务值改变时请求客户名称
 	httpChange(e){
@@ -539,11 +534,11 @@ const NewService = Form.create()(React.createClass({
 	},
 	//客户名称自动补全
 	customerChange(e){
+		this.state.autoId='';
 		if(e.length>=1){
 			this.supervisor(e,true); 
 		}	
 		this.setState({
-			autoId:'',
 			customerName:e
 		})
 	},
@@ -702,7 +697,7 @@ const NewService = Form.create()(React.createClass({
 		})
 		this.state.lookSource=[];
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
@@ -716,8 +711,8 @@ const NewService = Form.create()(React.createClass({
                         message.warning(data.error[0].message);
                     };
                 } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
+                    for (let i = 0; i < data.data.length; i++) {
+                        let thisdata = data.data[i];
                         theArr.push({
                              key: i,
 	                         billNo: thisdata.billNo,
@@ -885,7 +880,6 @@ const NewService = Form.create()(React.createClass({
 													        value={this.state.customerName}
 													        onChange={this.customerChange}
 													        filterOption={true}
-													        onBlur={this.blurCutor}
 													        onSelect={this.selectAutoCUT}
 													      >
 													        <Input/>
@@ -927,7 +921,7 @@ const NewService = Form.create()(React.createClass({
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="已收款项" >  
-							                            <span>{orderDetaiel.actuallyTotalAmount}</span>
+							                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
@@ -937,24 +931,24 @@ const NewService = Form.create()(React.createClass({
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="市价订单金额" >    
-						                            	<span>{orderDetaiel.orderAmount}</span>
+						                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
 								                    </FormItem>
 								                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="市价首款金额" >   
-							                            <span>{orderDetaiel.firstPayment}</span>
+							                            <span>{orderDetaiel.firstPayment+'万元'}</span>
 								                    </FormItem>
 								                    {orderDetaiel.deleteSign==0&&orderDetaiel.orderStatus==2?
 							                    	<div className='clearfix'>
 									                    <FormItem className="half-item"
 								                            {...formItemLayout}
-								                            label="实签订单金额" >                             
+								                            label="实签订单金额(万元)" >                             
 							                                    <Input placeholder="实签订单金额" ref='signTotalAmount' value={this.state.signTotalAmount} onChange={(e)=>{this.setState({signTotalAmount:e.target.value})}} style={{width:'240px'}} />
 									                   			<span className="mandatory">*</span>
 									                    </FormItem>
 									                    <FormItem className="half-item"
 									                            {...formItemLayout}
-									                            label="实签首款金额" >                             
+									                            label="实签首款金额(万元)" >                             
 								                                    <Input placeholder="请输入实签首款金额" ref='signFirstPayment' value={this.state.signFirstPayment} onChange={(e)=>{this.setState({signFirstPayment:e.target.value})}} style={{width:'240px'}} />
 									                    		<span className="mandatory">*</span>
 									                    </FormItem>
@@ -989,12 +983,12 @@ const NewService = Form.create()(React.createClass({
 											        	<FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="实签订单金额" >   
-								                            <span>{orderDetaiel.signTotalAmount}</span>
+								                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
 							                    		</FormItem>
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="实签首款金额" >   
-								                            <span>{orderDetaiel.signFirstPayment}</span>
+								                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
 							                    		</FormItem>
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
@@ -1138,12 +1132,12 @@ const NewService = Form.create()(React.createClass({
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="市场价格" >   
+					                            label="市场价格(万元)" >   
 				                                <span>{this.state.commodityPrice}</span>    
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签价格" >   
+					                            label="实签价格(万元)" >   
 				                                    <Input placeholder="请输入实签价格" value={this.state.discountPrice} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({discountPrice:e.target.value})}} ref="discountPrice"/>
 				                                <span className="mandatory">*</span>    
@@ -1157,12 +1151,12 @@ const NewService = Form.create()(React.createClass({
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="市场首付金额" >   
+					                            label="市场首付金额(万元)" >   
 				                                <span>{this.state.commodityFirstPayment}</span>    
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="签单首付金额" >   
+					                            label="签单首付金额(万元)" >   
 				                                    <Input placeholder="请输入签单首付金额" value={this.state.discountFirstPayment} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({discountFirstPayment:e.target.value})}} ref='discountFirstPayment'/>
 				                                <span className="mandatory">*</span>    
@@ -1190,12 +1184,12 @@ const NewService = Form.create()(React.createClass({
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="市场价格" >
-				                    			<span>{editFws.commodityPrice}</span>
+				                    			<span>{editFws.commodityPrice+'万元'}</span>
 				                    	</FormItem>
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签价格" >
-				                    			<span>{editFws.discountPrice}</span>
+				                    			<span>{editFws.discountPrice+'万元'}</span>
 				                    	</FormItem>
 				                    	<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -1205,12 +1199,12 @@ const NewService = Form.create()(React.createClass({
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="市场首付金额" >   
-				                                <span>{editFws.commodityFirstPayment}</span>    
+				                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="签单首付金额" >   
-				                                <span>{editFws.discountFirstPayment}</span>    
+				                                <span>{editFws.discountFirstPayment+'万元'}</span>    
 					                    </FormItem>
 					                    <div className='clearfix'>
 					                    	<FormItem 
@@ -1245,14 +1239,14 @@ const NewService = Form.create()(React.createClass({
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签款项" >   
+					                            label="实签款项(万元)" >   
 				                                    <Input placeholder="请输入实签款项" value={this.state.signTotalAmount} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({signTotalAmount:e.target.value})}} />
 				                                    <span className="mandatory">*</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签首款" >   
+					                            label="实签首款(万元)" >   
 				                                    <Input placeholder="请输入实签首款" value={this.state.signFirstPayment} style={{width:'200px'}}
 				                                    onChange={(e)=>{this.setState({signFirstPayment:e.target.value})}} />
 				                                    <span className="mandatory">*</span>

+ 41 - 2
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx

@@ -123,7 +123,7 @@ const MyService=Form.create()(React.createClass({
                     dataIndex: 'buyerName',
                     key: 'buyerName'
                 }, {
-                    title: '实际下单金额',
+                    title: '实际下单金额(万元)',
                     dataIndex: 'signTotalAmount',
                     key: 'signTotalAmount'
                 },{
@@ -175,6 +175,12 @@ const MyService=Form.create()(React.createClass({
 							{text.applyLock &&<Popconfirm title={'请确认您是否锁定客户【'+record.buyerName+'】的服务订单,订单锁定将导致订单暂停!'} onConfirm={(e)=>{this.lockOrder(record)}} okText="确认" cancelText="取消">
 							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">锁定<Icon type="lock" /></Button>                 
 							</Popconfirm>}
+							{text.agreeRefund &&<Popconfirm title={'请确认您是否同意客户【'+record.buyerName+'】的退款?'} onConfirm={(e)=>{this.refundOk(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">同意退款</Button>                 
+							</Popconfirm>}
+							{text.refuseRefund &&<Popconfirm title={'请确认您是否拒绝客户【'+record.buyerName+'】的退款?'} onConfirm={(e)=>{this.refundCancel(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">拒绝退款</Button>                 
+							</Popconfirm>}
 							{text.applyUnLock&&<Popconfirm title={'请确认您是否解锁客户【'+record.buyerName+'】的服务订单,订单解锁将导致订单正常!'} onConfirm={(e)=>{this.unlockOrder(record)}} okText="确认" cancelText="取消">
 							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">解锁<Icon type="unlock" /></Button>                 
 							</Popconfirm>}
@@ -185,7 +191,40 @@ const MyService=Form.create()(React.createClass({
             dataSource: [],
         };
     },
-    
+    //是否退款
+    refundCancel(record){
+    	this.refund(record,0)
+    },
+    refundOk(record){
+    	this.refund(record,1)
+    },
+    refund(record,index){
+    	this.setState({
+        	signBillVisible:false,
+            selectedRowKeys: [],
+            loading: true,
+            userDetaile:false
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/order/confirmRefund',
+            data: {
+            	orderNo:record.orderNo,
+            	confirm:index
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功!');
+                this.setState({
+                    loading: false,
+                    showDesc:false
+                });
+            } 
+            this.loadData(this.state.pageNo);
+        }.bind(this));
+    },
     //受理订单
     admissibleOrderOk(e){
     	this.admissibleOrder(e,true)

+ 1 - 1
js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx

@@ -178,7 +178,7 @@ const ApproveOrder=Form.create()(React.createClass({
                     render:(text)=>{return (text.length>8)?(text).substr(0,8)+'…':text}
                 },
                 {
-                    title: '实际下单金额',
+                    title: '实际下单金额(万元)',
                     dataIndex: 'signTotalAmount',
                     key: 'signTotalAmount'
                 }, {

+ 15 - 20
js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx

@@ -133,11 +133,11 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
                     dataIndex: 'commodityQuantity',
                     key: 'commodityQuantity'
                 }, {
-                    title: '服务市价',
+                    title: '服务市价(万元)',
                     dataIndex: 'commodityPrice',
                     key: 'commodityPrice'
                 }, {
-                    title: '实签价格',
+                    title: '实签价格(万元)',
                     dataIndex: 'discountPrice',
                     key: 'discountPrice'
                 }, {
@@ -163,7 +163,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 }, {
-                    title: '流水金额',
+                    title: '流水金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount'
                 },{
@@ -272,7 +272,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 		})
 		this.state.lookSource=[];
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
@@ -286,8 +286,8 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
                         message.warning(data.error[0].message);
                     };
                 } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
+                    for (let i = 0; i < data.data.length; i++) {
+                        let thisdata = data.data[i];
                         theArr.push({
                              key: i,
 	                         billNo: thisdata.billNo,
@@ -394,7 +394,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="已收款项" >  
-				                            <span>{orderDetaiel.actuallyTotalAmount}</span>
+				                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -404,23 +404,23 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价订单金额" >    
-			                            	<span>{orderDetaiel.orderAmount}</span>
+			                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价首款金额" >   
-				                            <span>{orderDetaiel.firstPayment}</span>
+				                            <span>{orderDetaiel.firstPayment+'万元'}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   
-					                            <span>{orderDetaiel.signTotalAmount}</span>
+					                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签首款金额" >   
-					                            <span>{orderDetaiel.signFirstPayment}</span>
+					                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -527,32 +527,27 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="服务市价" >
-		                    			<span>{editFws.commodityPrice}</span>
+		                    			<span>{editFws.commodityPrice+'万元'}</span>
 			                    	</FormItem>
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="实签价格" >
-		                    			<span>{editFws.discountPrice}</span>
+		                    			<span>{editFws.discountPrice+'万元'}</span>
 			                    	</FormItem>
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="服务数量" >
 		                    			<span>{editFws.commodityQuantity}</span>
 			                    	</FormItem>
-			                    	 <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="商品规格" >   
-		                                <span>{editFws.commodityMode}</span>    
-				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="市场首付金额" >   
-		                                <span>{editFws.commodityFirstPayment}</span>    
+		                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
 				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="签单首付金额" >   
-		                                <span>{editFws.discountFirstPayment}</span>    
+		                                <span>{editFws.discountFirstPayment+'万元'}</span>    
 				                    </FormItem>
 				                    <div className='clearfix'>
 				                    	<FormItem 

+ 1 - 1
js/component/manageCenter/order/orderManagement/publicOrder/publicOrder.jsx

@@ -170,7 +170,7 @@ const PublicOrder=Form.create()(React.createClass({
                     key: 'buyerName'
                 }, 
                 {
-                    title: '订单金额',
+                    title: '订单金额(万元)',
                     dataIndex: 'signTotalAmount',
                     key: 'signTotalAmount'
                 }, {

+ 15 - 20
js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx

@@ -132,11 +132,11 @@ const ApproveDetaile = Form.create()(React.createClass({
                     dataIndex: 'commodityQuantity',
                     key: 'commodityQuantity'
                 }, {
-                    title: '服务市价',
+                    title: '服务市价(万元)',
                     dataIndex: 'commodityPrice',
                     key: 'commodityPrice'
                 }, {
-                    title: '实签价格',
+                    title: '实签价格(万元)',
                     dataIndex: 'discountPrice',
                     key: 'discountPrice'
                 }, {
@@ -162,7 +162,7 @@ const ApproveDetaile = Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 }, {
-                    title: '流水金额',
+                    title: '流水金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount'
                 },{
@@ -271,7 +271,7 @@ const ApproveDetaile = Form.create()(React.createClass({
 		})
 		this.state.lookSource=[];
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
@@ -285,8 +285,8 @@ const ApproveDetaile = Form.create()(React.createClass({
                         message.warning(data.error[0].message);
                     };
                 } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
+                    for (let i = 0; i < data.data.length; i++) {
+                        let thisdata = data.data[i];
                         theArr.push({
                              key: i,
 	                         billNo: thisdata.billNo,
@@ -393,7 +393,7 @@ const ApproveDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="已收款项" >  
-				                            <span>{orderDetaiel.actuallyTotalAmount}</span>
+				                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -403,23 +403,23 @@ const ApproveDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价订单金额" >    
-			                            	<span>{orderDetaiel.orderAmount}</span>
+			                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价首款金额" >   
-				                            <span>{orderDetaiel.firstPayment}</span>
+				                            <span>{orderDetaiel.firstPayment+'万元'}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   
-					                            <span>{orderDetaiel.signTotalAmount}</span>
+					                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签首款金额" >   
-					                            <span>{orderDetaiel.signFirstPayment}</span>
+					                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -526,32 +526,27 @@ const ApproveDetaile = Form.create()(React.createClass({
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="服务市价" >
-		                    			<span>{editFws.commodityPrice}</span>
+		                    			<span>{editFws.commodityPrice+'万元'}</span>
 			                    	</FormItem>
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="实签价格" >
-		                    			<span>{editFws.discountPrice}</span>
+		                    			<span>{editFws.discountPrice+'万元'}</span>
 			                    	</FormItem>
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="服务数量" >
 		                    			<span>{editFws.commodityQuantity}</span>
 			                    	</FormItem>
-			                    	 <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="商品规格" >   
-		                                <span>{editFws.commodityMode}</span>    
-				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="市场首付金额" >   
-		                                <span>{editFws.commodityFirstPayment}</span>    
+		                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
 				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="签单首付金额" >   
-		                                <span>{editFws.discountFirstPayment}</span>    
+		                                <span>{editFws.discountFirstPayment+'万元'}</span>    
 				                    </FormItem>
 				                    <div className='clearfix'>
 				                    	<FormItem 

+ 2 - 2
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlement.jsx

@@ -169,7 +169,7 @@ const MySettlement=Form.create()(React.createClass({
                     	return (text.length>9?text.substr(0,9)+'...':text)
                     }
                 }, {
-                    title: '实际下单金额',
+                    title: '实际下单金额(万元)',
                     dataIndex: 'signTotalAmount',
                     key: 'signTotalAmount'
                 }, {
@@ -437,7 +437,7 @@ const MySettlement=Form.create()(React.createClass({
 			                <Spin spinning={this.state.loading}>
 		                        <div className="clearfix">
 	                        	    <Form.Item className="half-middle"
-			                            label="支付金额" >
+			                            label="支付金额(万元)" >
 		                    			<Input value={this.state.payment} onChange={(e)=>{this.setState({payment:e.target.value})}} style={{width:'220px'}} />
 		                    			<span className="mandatory">*</span>
 			                    	</Form.Item>

+ 15 - 20
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx

@@ -132,11 +132,11 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     dataIndex: 'commodityQuantity',
                     key: 'commodityQuantity'
                 }, {
-                    title: '服务市价',
+                    title: '服务市价(万元)',
                     dataIndex: 'commodityPrice',
                     key: 'commodityPrice'
                 }, {
-                    title: '实签价格',
+                    title: '实签价格(万元)',
                     dataIndex: 'discountPrice',
                     key: 'discountPrice'
                 }, {
@@ -162,7 +162,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 }, {
-                    title: '流水金额',
+                    title: '流水金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount'
                 },{
@@ -274,7 +274,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		})
 		this.state.lookSource=[];
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
@@ -288,8 +288,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
                         message.warning(data.error[0].message);
                     };
                 } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
+                    for (let i = 0; i < data.data.length; i++) {
+                        let thisdata = data.data[i];
                         theArr.push({
                              key: i,
 	                         billNo: thisdata.billNo,
@@ -393,7 +393,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="已收款项" >  
-				                            <span>{orderDetaiel.actuallyTotalAmount}</span>
+				                            <span>{orderDetaiel.actuallyTotalAmount+"万元"}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -403,23 +403,23 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价订单金额" >    
-			                            	<span>{orderDetaiel.orderAmount}</span>
+			                            	<span>{orderDetaiel.orderAmount+"万元"}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价首款金额" >   
-				                            <span>{orderDetaiel.firstPayment}</span>
+				                            <span>{orderDetaiel.firstPayment+"万元"}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   
-					                            <span>{orderDetaiel.signTotalAmount}</span>
+					                            <span>{orderDetaiel.signTotalAmount+"万元"}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签首款金额" >   
-					                            <span>{orderDetaiel.signFirstPayment}</span>
+					                            <span>{orderDetaiel.signFirstPayment+"万元"}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -531,32 +531,27 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="市场价格" >
-		                    			<span>{editFws.commodityPrice}</span>
+		                    			<span>{editFws.commodityPrice+"万元"}</span>
 			                    	</FormItem>
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="实签价格" >
-		                    			<span>{editFws.discountPrice}</span>
+		                    			<span>{editFws.discountPrice+"万元"}</span>
 			                    	</FormItem>
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="服务数量" >
 		                    			<span>{editFws.commodityQuantity}</span>
 			                    	</FormItem>
-			                    	 <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="商品规格" >   
-		                                <span>{editFws.commodityMode}</span>    
-				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="市场首付金额" >   
-		                                <span>{editFws.commodityFirstPayment}</span>    
+		                                <span>{editFws.commodityFirstPayment+"万元"}</span>    
 				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="签单首付金额" >   
-		                                <span>{editFws.discountFirstPayment}</span>    
+		                                <span>{editFws.discountFirstPayment+"万元"}</span>    
 				                    </FormItem>
 				                    <div className='clearfix'>
 				                    	<FormItem 

+ 14 - 19
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx

@@ -133,11 +133,11 @@ const ManagementDetaile = Form.create()(React.createClass({
                     dataIndex: 'commodityQuantity',
                     key: 'commodityQuantity'
                 }, {
-                    title: '服务市价',
+                    title: '服务市价(万元)',
                     dataIndex: 'commodityPrice',
                     key: 'commodityPrice'
                 }, {
-                    title: '实签价格',
+                    title: '实签价格(万元)',
                     dataIndex: 'discountPrice',
                     key: 'discountPrice'
                 }, {
@@ -163,7 +163,7 @@ const ManagementDetaile = Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 }, {
-                    title: '流水金额',
+                    title: '流水金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount'
                 },{
@@ -272,7 +272,7 @@ const ManagementDetaile = Form.create()(React.createClass({
 		})
 		this.state.lookSource=[];
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
@@ -286,8 +286,8 @@ const ManagementDetaile = Form.create()(React.createClass({
                         message.warning(data.error[0].message);
                     };
                 } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
+                    for (let i = 0; i < data.data.length; i++) {
+                        let thisdata = data.data[i];
                         theArr.push({
                              key: i,
 	                         billNo: thisdata.billNo,
@@ -394,7 +394,7 @@ const ManagementDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="已收款项" >  
-				                            <span>{orderDetaiel.actuallyTotalAmount}</span>
+				                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -404,23 +404,23 @@ const ManagementDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价订单金额" >    
-			                            	<span>{orderDetaiel.orderAmount}</span>
+			                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价首款金额" >   
-				                            <span>{orderDetaiel.firstPayment}</span>
+				                            <span>{orderDetaiel.firstPayment+'万元'}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   
-					                            <span>{orderDetaiel.signTotalAmount}</span>
+					                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签首款金额" >   
-					                            <span>{orderDetaiel.signFirstPayment}</span>
+					                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -532,27 +532,22 @@ const ManagementDetaile = Form.create()(React.createClass({
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="实签价格" >
-		                    			<span>{editFws.discountPrice}</span>
+		                    			<span>{editFws.discountPrice+'万元'}</span>
 			                    	</FormItem>
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="服务数量" >
 		                    			<span>{editFws.commodityQuantity}</span>
 			                    	</FormItem>
-			                    	 <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="商品规格" >   
-		                                <span>{editFws.commodityMode}</span>    
-				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="市场首付金额" >   
-		                                <span>{editFws.commodityFirstPayment}</span>    
+		                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
 				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="签单首付金额" >   
-		                                <span>{editFws.discountFirstPayment}</span>    
+		                                <span>{editFws.discountFirstPayment+'万元'}</span>    
 				                    </FormItem>
 				                    <div className='clearfix'>
 				                    	<FormItem 

+ 1 - 1
js/component/manageCenter/order/settlementOrder/settlementManage/settlementManagement.jsx

@@ -181,7 +181,7 @@ const SettlementManage=Form.create()(React.createClass({
                     	return (text.length>9?text.substr(0,9)+'...':text)
                     }
                 }, {
-                    title: '实际下单金额',
+                    title: '实际下单金额(万元)',
                     dataIndex: 'signTotalAmount',
                     key: 'signTotalAmount'
                 }, {

+ 15 - 20
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx

@@ -80,11 +80,11 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     dataIndex: 'commodityQuantity',
                     key: 'commodityQuantity'
                 }, {
-                    title: '服务市价',
+                    title: '服务市价(万元)',
                     dataIndex: 'commodityPrice',
                     key: 'commodityPrice'
                 }, {
-                    title: '实签价格',
+                    title: '实签价格(万元)',
                     dataIndex: 'discountPrice',
                     key: 'discountPrice'
                 }, {
@@ -110,7 +110,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 }, {
-                    title: '流水金额',
+                    title: '流水金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount'
                 },{
@@ -219,7 +219,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		})
 		this.state.lookSource=[];
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
@@ -233,8 +233,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
                         message.warning(data.error[0].message);
                     };
                 } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
+                    for (let i = 0; i < data.data.length; i++) {
+                        let thisdata = data.data[i];
                         theArr.push({
                              key: i,
 	                         billNo: thisdata.billNo,
@@ -341,7 +341,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="已收款项" >  
-				                            <span>{orderDetaiel.actuallyTotalAmount}</span>
+				                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -351,23 +351,23 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价订单金额" >    
-			                            	<span>{orderDetaiel.orderAmount}</span>
+			                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价首款金额" >   
-				                            <span>{orderDetaiel.firstPayment}</span>
+				                            <span>{orderDetaiel.firstPayment+'万元'}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   
-					                            <span>{orderDetaiel.signTotalAmount}</span>
+					                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签首款金额" >   
-					                            <span>{orderDetaiel.signFirstPayment}</span>
+					                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -474,32 +474,27 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="服务市价" >
-		                    			<span>{editFws.commodityPrice}</span>
+		                    			<span>{editFws.commodityPrice+'万元'}</span>
 			                    	</FormItem>
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="实签价格" >
-		                    			<span>{editFws.discountPrice}</span>
+		                    			<span>{editFws.discountPrice+'万元'}</span>
 			                    	</FormItem>
 			                    	<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="服务数量" >
 		                    			<span>{editFws.commodityQuantity}</span>
 			                    	</FormItem>
-			                    	 <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="商品规格" >   
-		                                <span>{editFws.commodityMode}</span>    
-				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="市场首付金额" >   
-		                                <span>{editFws.commodityFirstPayment}</span>    
+		                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
 				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="签单首付金额" >   
-		                                <span>{editFws.discountFirstPayment}</span>    
+		                                <span>{editFws.discountFirstPayment+'万元'}</span>    
 				                    </FormItem>
 				                    <div className='clearfix'>
 				                    	<FormItem 

+ 5 - 5
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -1150,7 +1150,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					                    		<FormItem className="half-item"
 						                            {...formItemLayout}
 						                            label="已收款项" >  
-						                            <span>{orderArr.actuallyTotalAmount}</span>
+						                            <span>{orderArr.actuallyTotalAmount+'万元'}</span>
 					                    		</FormItem>
 					                    		<FormItem className="half-item"
 						                            {...formItemLayout}
@@ -1160,23 +1160,23 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					                    		<FormItem className="half-item"
 						                            {...formItemLayout}
 						                            label="市价订单金额" >    
-					                            	<span>{orderArr.orderAmount}</span>
+					                            	<span>{orderArr.orderAmount+'万元'}</span>
 							                    </FormItem>
 							                    <FormItem className="half-item"
 						                            {...formItemLayout}
 						                            label="市价首款金额" >   
-						                            <span>{orderArr.firstPayment}</span>
+						                            <span>{orderArr.firstPayment+'万元'}</span>
 							                    </FormItem>
 							                    <div className='clearfix'>
 										        	<FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="实签订单金额" >   
-							                            <span>{orderArr.signTotalAmount}</span>
+							                            <span>{orderArr.signTotalAmount+'万元'}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="实签首款金额" >   
-							                            <span>{orderArr.signFirstPayment}</span>
+							                            <span>{orderArr.signFirstPayment+'万元'}</span>
 						                    		</FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}