Browse Source

Merge branch 'master' of http://git.jishutao.com/jishutao/web

liting2017 6 years ago
parent
commit
59ea6560c6

+ 1 - 1
js/component/manageCenter/servicesManage/projectOrder/myTask/projectManage.jsx

@@ -48,7 +48,7 @@ const MyTask=Form.create()(React.createClass({
 	                         categoryName:thisdata.categoryName,
 	                         buyerName:thisdata.buyerName,
 	                         taskDistributionTimes:thisdata.taskDistributionTimes,
-	                         deleteSign:thisdata.deletedSign,
+	                         deleteSign:thisdata.deleteSign,
 	                         taskStatus:thisdata.taskStatus,
 	                         taskReceiverName:thisdata.taskReceiverName,
 	                         projectNo:thisdata.projectNo,

+ 1 - 11
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx

@@ -598,17 +598,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                            label="结算状态" >  
 				                            <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
 			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价订单金额" >    
-			                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
-					                    </FormItem>
-					                    <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价首款金额" >   
-				                            <span>{orderDetaiel.firstPayment+'万元'}</span>
-					                    </FormItem>
-					                    <div className='clearfix'>
+			                    		<div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   

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

@@ -1151,16 +1151,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                            label="结算状态" >  
 				                            <span>{getPaymentState(orderArr.liquidationStatus)}</span>
 			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价订单金额" >    
-			                            	<span>{orderArr.orderAmount+'万元'}</span>
-					                    </FormItem>
-					                    <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价首款金额" >   
-				                            <span>{orderArr.firstPayment+'万元'}</span>
-					                    </FormItem>
+			                    		
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}