dengzhiguo 6 anos atrás
pai
commit
cfa6da0a00

+ 2 - 2
js/component/dataDic.js

@@ -2425,10 +2425,10 @@ module.exports = {
 	        key: "已派咨询师管理员"
         },{
 	        value: "5",
-	        key: "已部分派咨询师经理"
+	        key: "部分分配"
 	    },{
 	        value: "6",
-	        key: "已全部派咨询师经理"
+	        key: "全部分配"
 	    }
     ],
     //项目状态

+ 8 - 3
js/component/manageCenter/order/orderNew/addService.jsx

@@ -448,7 +448,9 @@ const NewService = Form.create()(React.createClass({
 					signDate:thisData.signDate,//签单时间
 					userName:thisData.userName,//客户名称
 					salesmanName:thisData.salesmanName,//营销员名称
+					salesmanMobile:thisData.salesmanMobile,//营销员电话
 					financeName:thisData.financeName,//财务名称
+					financeMobile:thisData.financeMobile,//财务电话
 					contractNo:thisData.contractNo,//合同编号
 					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
                 });
@@ -840,7 +842,10 @@ const NewService = Form.create()(React.createClass({
 	//点击退单
 	tuikuan(){
 		this.setState({
-			lookVisible:true
+			lookVisible:true,
+			contractUrl:[],
+			applicationUrl:[],
+			reason:''
 		})
 	},
 	//关闭退单
@@ -1251,7 +1256,7 @@ const NewService = Form.create()(React.createClass({
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="订单负责人电话" >  
-				                            				<span>{orderDetaiel.projectType}</span>
+				                            				<span>{this.state.salesmanMobile}</span>
 							                    		</FormItem>
 							                    	</div>
 							                    	<div className='clearfix'>
@@ -1263,7 +1268,7 @@ const NewService = Form.create()(React.createClass({
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="财务负责人电话" >  
-				                            				<span>{orderDetaiel.projectType}</span>
+				                            				<span>{this.state.financeMobile}</span>
 							                    		</FormItem>
 							                    	</div>
 					                    		<div>

+ 24 - 0
js/component/manageCenter/order/orderNew/reject.jsx

@@ -400,6 +400,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
 	                     financeName:thisdata.financeName,//财务名称
 	                     financeMobile:thisdata.financeMobile,//财务电话
+	                     initiateName:thisdata.initiateName,//驳回人
+	                     backDate:thisdata.backDate,//驳回时间
+	                     reason:thisdata.reason,//驳回原因
 	                     approval:thisdata.approval.toString(),//特批状态
 	                     //approval:thisdata.approval==0?thisdata.approval.toString():thisdata.approval,//特批状态
 					})
@@ -1037,6 +1040,27 @@ const IntentionCustomer = Form.create()(React.createClass({
                             				<span>{this.state.financeMobile}</span>
 			                    		</FormItem>
 			                    	</div>
+			                    	<div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="驳回人" >  
+				                            <span>{this.state.initiateName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="驳回时间" >  
+                            				<span>{this.state.backDate}</span>
+			                    		</FormItem>
+			                    	</div>
+			                    	<div className='clearfix'>
+			                    		<FormItem 
+				                            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+				                            label="驳回原因" >  
+				                            <span>{this.state.reason}</span>
+			                    		</FormItem>
+			                    		
+			                    	</div>
 			                    	<div>
 					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>催款节点</span>
 					                	<Button type='primary' onClick={this.addcontact} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加催款节点</Button>

+ 12 - 14
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -51,6 +51,7 @@ const PaiDan = React.createClass({
 	                         userName:thisdata.userName,//客户名称
 	                         salesmanName:thisdata.salesmanName,//营销员名称
 	                         financeName:thisdata.financeName,//财务名称
+	                         consultantName:thisdata.consultantName,//项目负责人
 	                         createDate:thisdata.createDate,//下单时间
                         });
                     };
@@ -113,12 +114,6 @@ const PaiDan = React.createClass({
                     key: 'signDate',
                 },
                 {
-                    title: '流程状态',
-                    dataIndex: 'processStatus',
-                    key: 'processStatus',
-                    render: text => { return getProcessStatus(text)}
-                },
-                {
                     title: '订单总金额(万)',
                     dataIndex: 'totalAmount',
                     key: 'totalAmount'
@@ -135,19 +130,20 @@ const PaiDan = React.createClass({
                     key: 'salesmanName'
                 },
                 {
-                    title: '订单负责人',
-                    dataIndex: 'salesmanName',
-                    key: 'salesmanName'
+                    title: '财务负责人',
+                    dataIndex: 'financeName',
+                    key: 'financeName'
                 },
                 {
-                    title: '订单负责人',
-                    dataIndex: 'salesmanName',
-                    key: 'salesmanName'
+                    title: '项目负责人',
+                    dataIndex: 'consultantName',
+                    key: 'consultantName'
                 },
                 {
                     title: '分派状态',
-                    dataIndex: 'sellerName1',
-                    key: 'sellerName1'
+                    dataIndex: 'processStatus',
+                    key: 'processStatus',
+                    render: text => { return getProcessStatus(text)}
                 },
                 {
                     title:'操作',
@@ -269,6 +265,8 @@ const PaiDan = React.createClass({
                     data={this.state.assignData}
                     showDesc={this.state.assignVisible}
                     closeDesc={this.closeAssign.bind(this)}
+                    title={'项目'}
+                    fenpaiData={8}
                 />
         </div> )
     }