liting2017 6 years ago
parent
commit
e49ff69ee2

+ 0 - 0
js/component/manageCenter/customer/individualCustomer/intentionCustomer/personalIntention.jsx


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

@@ -425,11 +425,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="首付时间" >  
-				                            <span>{seeOrderDetaiel.createTimez}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
 				                            label="项目负责人" >  
 				                            <span>{seeOrderDetaiel.technicianName}</span>
 			                    		</FormItem>

+ 0 - 5
js/component/manageCenter/order/flowSettlement/billManagement/myBillDetaile.jsx

@@ -424,11 +424,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="首付时间" >  
-				                            <span>{seeOrderDetaiel.createTimez}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
 				                            label="项目负责人" >  
 				                            <span>{seeOrderDetaiel.technicianName}</span>
 			                    		</FormItem>

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

@@ -425,11 +425,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="首付时间" >  
-				                            <span>{seeOrderDetaiel.createTimez}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
 				                            label="项目负责人" >  
 				                            <span>{seeOrderDetaiel.technicianName}</span>
 			                    		</FormItem>

+ 0 - 5
js/component/manageCenter/order/flowSettlement/myBill/myBillDetaile.jsx

@@ -428,11 +428,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="首付时间" >  
-				                            <span>{seeOrderDetaiel.createTimez}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
 				                            label="项目负责人" >  
 				                            <span>{seeOrderDetaiel.technicianName}</span>
 			                    		</FormItem>

+ 0 - 5
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx

@@ -635,11 +635,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="首付时间" >  
-				                            <span>{orderDetaiel.createTimez}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
 				                            label="项目负责人" >  
 				                            <span>{orderDetaiel.technicianName}</span>
 			                    		</FormItem>

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

@@ -50,7 +50,7 @@ const MyTask=Form.create()(React.createClass({
 	                         deleteSign:thisdata.deletedSign,
 	                         taskStatus:thisdata.taskStatus,
 	                         taskReceiverName:thisdata.taskReceiverName,
-	                         projectNo:thisdata.projectNo
+	                         projectNo:thisdata.projectNo,
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;

+ 148 - 2
js/component/manageCenter/servicesManage/projectOrder/myTask/projectManageDetaile.jsx

@@ -4,7 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../userMangagement.less';
 import {orderType} from '../../../../dataDic.js';
-import {getOrderType,getProjectState,getTaskStatus} from '../../../../tools.js';
+import {getOrderType,getProjectState,getTaskStatus,getOrderChannel,getOrderState,getPaymentState,getApprovedState} from '../../../../tools.js';
 
 const MySettlementDetaile = Form.create()(React.createClass({
 	getInitialState() {
@@ -34,7 +34,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                    thisData = {};
 	                };
 	                this.setState({
-						orderList:thisData,
+	                	orderNo:thisData.orderNo,
+						orderList:thisData
 	                });                  
 	            }.bind(this),
 	       }).always(function () {
@@ -44,6 +45,47 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	        }.bind(this));  
 	    }
     },
+    //查看订单
+	seeOrder(){
+		this.setState({
+			seeOrderVisible:true
+		})
+		this.seeOrderList();
+	},
+	seeOrderCancel(){
+		this.setState({
+			seeOrderVisible:false
+		})	
+	},
+	seeOrderList(){
+		this.state.lookOrderList=[];
+    	$.ajax({
+            method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
+            data: {
+              orderNo: this.state.orderNo
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                this.setState({
+					id:thisData.id,
+					lookOrderList:thisData,
+                });
+            }.bind(this),
+       }).always(function () {
+            this.setState({            	
+                loading: false
+            });
+        }.bind(this));  
+	},
 	componentWillMount() {
 		
 	},
@@ -64,6 +106,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			labelCol: { span: 8 },
 			wrapperCol: { span: 14 },
 		};
+		const seeOrderDetaiel=this.state.lookOrderList || [];
 		const orderDetaiel=this.state.orderList || [];
 		return(
 			<div>
@@ -81,6 +124,12 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                            label="客户名称" >
 			                    			<span>{orderDetaiel.buyerName}</span>
 			                    	</FormItem>
+			                    	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >
+			                    			<span>{orderDetaiel.orderNo}</span>
+				                        {/*<Button style={{float:'right'}} onClick={this.seeOrder}>查看订单</Button>*/}
+			                    	</FormItem>
 		                        	<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="项目编号" >
@@ -135,6 +184,103 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		                </Spin>
 		            </Form >
 		        </Modal>
+		        <Modal maskClosable={false} visible={this.state.seeOrderVisible}
+                        onOk={this.seeOrderCancel} onCancel={this.seeOrderCancel}
+                        width='1000px'
+                        title= '查看订单'                 
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	  	<div className="clearfix">
+			                       		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >
+				                            <span>{seeOrderDetaiel.orderNo}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="下单时间" >  
+				                            <span>{seeOrderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="客户名称" >  
+				                            <span>{seeOrderDetaiel.buyerName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单类型" >  
+				                            <span>{getOrderType(seeOrderDetaiel.orderType)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单渠道" >  
+				                            <span>{getOrderChannel(seeOrderDetaiel.orderChannel)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单状态" >  
+				                            <span>{getOrderState(seeOrderDetaiel.orderStatus)}</span>
+			                    		</FormItem>
+					                    <div className='clearfix'>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="特批立项" >   
+					                            <span>{getApprovedState(seeOrderDetaiel.approval)}</span>
+				                    		</FormItem>
+					                        <div className='clearfix'>
+									        	<FormItem
+										            labelCol={{ span: 4 }}
+										            wrapperCol={{ span: 16 }}
+										            label="订单留言" >
+									        		<span>{seeOrderDetaiel.orderRemarks}</span>
+										        </FormItem>
+									        </div>
+								        </div>
+			                        </div>
+			                        <div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >  
+				                            <span>{seeOrderDetaiel.salesmanName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="意向时间" >  
+				                            <span>{seeOrderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="签单时间" >  
+				                            <span>{seeOrderDetaiel.signTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >  
+				                            <span>{seeOrderDetaiel.financeName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目负责人" >  
+				                            <span>{seeOrderDetaiel.technicianName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="立项时间" >  
+				                            <span>{seeOrderDetaiel.setUpTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目状态" >  
+				                            <span>{getProjectState(seeOrderDetaiel.projectStage)}</span>
+						                </FormItem>
+		                    		</div>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
     	    </div>
 		)
 	}

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

@@ -1197,11 +1197,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                            <div className="clearfix">
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="项目类型" >  
-			                            <span>{orderDetaiel.projectType}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
 			                            label="项目负责人" >  
 			                            <span>{orderDetaiel.principalName}</span>
 			                            {!this.props.queryProject?<Button onClick={this.transfer} style={{'float':"right"}}>转交</Button>:''}