dengzhiguo 6 years ago
parent
commit
cdb5f70397

+ 9 - 12
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -457,10 +457,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 			message.warning('请填写公司主营产品');
 			return false;
 		};
-		if(!this.state.intellectualProperty) {
-			message.warning('请填写已有知识产权情况');
-			return false;
-		};
 		var reg = /^[1-9]\d*$|^0$/;
 		if(this.state.consultationPrice) {
 			if(this.state.consultationPrice.length > 6) {
@@ -863,7 +859,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					                    <div className="clearfix" >
 					                    	<FormItem className="half-item" 
 					                          {...formItemLayout}
-					                         label="公司行业">
+					                         label="企业行业">
 											    <Select placeholder="选择行业" value={this.state.industry}  style={{width:'95%'}}
 											    				onChange={(e)=>{this.setState({industry:e})}}>
 				                                      {
@@ -1039,13 +1035,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 							                                <Input ref='consul' placeholder="请输入上年度研发费用" value={this.state.lastYearResearchAmount} style={{width:'95%'}}
 														onChange={(e) => {this.setState({lastYearResearchAmount: e.target.value })}}/>万
 							                    </FormItem>
-							                    <FormItem className="half-item"
-								                    	 {...formItemLayout}
-								                         label="上年度总资产情况"
-							                            >
-							                                <Input ref='consul' placeholder="上年度总资产情况" value={this.state.assets} style={{width:'95%'}}
-														onChange={(e) => {this.setState({assets: e.target.value })}}/>万
-							                    </FormItem>
 							                    <FormItem className="half-item" 
 						                            {...formItemLayout}
 						                           label="客户信用等级"
@@ -1059,6 +1048,14 @@ const IntentionCustomer = Form.create()(React.createClass({
 					                                    }
 					                                </Select>  
 						                   		 </FormItem>
+							                    <FormItem className="half-item"
+								                    	 {...formItemLayout}
+								                         label="上年度总资产情况"
+							                            >
+							                                <Input ref='consul' placeholder="上年度总资产情况" value={this.state.assets} style={{width:'95%'}}
+														onChange={(e) => {this.setState({assets: e.target.value })}}/>万
+							                    </FormItem>
+							                    
 							                    <div className='clearfix'>
 								                    <FormItem
 								                        labelCol={{ span:4 }}

+ 20 - 26
js/component/manageCenter/customer/NEW/crm/crmAll.jsx

@@ -818,6 +818,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					       <div>
 					       		<Form layout="horizontal" onSubmit={this.newSubmit} id="demand-form">
 					                <Spin spinning={this.state.loading}>
+					                	<div style={{fontSize:'18px',marginLeft:'50px',marginTop:'15px',marginBottom:'10px',color:"red",fontWeight:"bold"}}>基本信息</div>
 						               	<div className="clearfix" >
 					                    	<FormItem className="half-item"
 							                     {...formItemLayout}
@@ -835,7 +836,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					                    <div className="clearfix" >
 					                    	<FormItem className="half-item" 
 					                          {...formItemLayout}
-					                         label="行业">
+					                         label="企业行业">
 											    <Select placeholder="选择行业" value={this.state.industry}  style={{width:'95%'}}
 											    				onChange={(e)=>{this.setState({industry:e})}} disabled={true}>
 				                                      {
@@ -880,22 +881,14 @@ const IntentionCustomer = Form.create()(React.createClass({
 							                    <FormItem
 							                        labelCol={{ span:4 }}
 							                        wrapperCol={{ span: 20 }}
-							                        label="公司主营产品" >
+							                        label="主营产品" >
 							                        <Input type="textarea" rows={2} value={this.state.businessScope}  style={{width:'95%'}}
 													onChange={(e,pre) => { this.setState({ businessScope: e.target.value })}} disabled={true}/>
 							                   		<span style={{color:'red',marginLeft:'5px'}}>*</span>
 							                   </FormItem>
 						                    </div>
-						                    <div className='clearfix'>
-							                    <FormItem
-							                        labelCol={{ span:4 }}
-							                        wrapperCol={{ span: 20 }}
-							                        label="已有知识产权情况" >
-							                            <Input type="textarea" rows={2} value={this.state.intellectualProperty} style={{width:'95%'}}
-													onChange={(e,pre) => { this.setState({ intellectualProperty: e.target.value })}} disabled={true}/>
-							                    	<span style={{color:'red',marginLeft:'5px'}}>*</span>
-							                    </FormItem>
-						                    </div>
+						                    
+						                    <div style={{fontSize:'18px',marginLeft:'50px',marginTop:'15px',marginBottom:'10px',color:"red",fontWeight:"bold"}}>企业资料</div>
 						                    <FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                         label="通信地址"
@@ -941,14 +934,14 @@ const IntentionCustomer = Form.create()(React.createClass({
 						                    </FormItem>
 											<FormItem className="half-item" 
 							                    	 {...formItemLayout}
-							                        label="主要联系人"
+							                        label="联系人"
 					                           	 >
 						                            <Input placeholder="主要联系人" value={this.state.contacts} onChange={(e) => {
 								                        this.setState({ contacts:  e.target.value })}} disabled={true}/>
 						                    </FormItem>
 						                    <FormItem className="half-item" 
 							                    	 {...formItemLayout}
-							                        label="主要联系人号码"
+							                        label="联系人号码"
 					                           	 >
 						                            <Input placeholder="主要联系人号码" value={this.state.contactMobile} onChange={(e) => {
 								                        this.setState({ contactMobile:  e.target.value })}} disabled={true}/>
@@ -962,7 +955,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 						                    </FormItem>
 						                    <FormItem className="half-item"
 							                    	 {...formItemLayout}
-							                         label="法人电子邮箱"
+							                         label="法人邮箱"
 						                            >
 						                                <Input placeholder="法人电子邮箱" value={this.state.legalPersonEmail} 
 													onChange={(e) => {this.setState({legalPersonEmail: e.target.value })}} disabled={true}/>
@@ -1004,8 +997,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 							                            <p>建议:图片要清晰。</p>
 							                    </FormItem>
 							                </div> 
-							                <div style={{fontSize:'18px',marginLeft:'50px',marginTop:'15px',marginBottom:'10px',color:"red",fontWeight:"bold"}}>签单客户信息完善</div>
-							                <div className='clearfix' >
+							                <div style={{fontSize:'18px',marginLeft:'50px',marginTop:'15px',marginBottom:'10px',color:"red",fontWeight:"bold"}}>重要资料</div>
+							               	<div className='clearfix' >
 						                    	<FormItem className="half-item"
 								                    	 {...formItemLayout}
 								                         label="上年度销售额"
@@ -1020,13 +1013,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 							                                <Input ref='consul' placeholder="请输入上年度研发费用" value={this.state.lastYearResearchAmount} style={{width:'95%'}}
 														onChange={(e) => {this.setState({lastYearResearchAmount: e.target.value })}} disabled={true}/>万
 							                    </FormItem>
-							                    <FormItem className="half-item"
-								                    	 {...formItemLayout}
-								                         label="上年度总资产情况"
-							                            >
-							                                <Input ref='consul' placeholder="上年度总资产情况" value={this.state.assets} style={{width:'95%'}}
-														onChange={(e) => {this.setState({assets: e.target.value })}} disabled={true}/>万
-							                    </FormItem>
 							                    <FormItem className="half-item" 
 						                            {...formItemLayout}
 						                           label="客户信用等级"
@@ -1040,11 +1026,19 @@ const IntentionCustomer = Form.create()(React.createClass({
 					                                    }
 					                                </Select>  
 						                   		 </FormItem>
+							                    <FormItem className="half-item"
+								                    	 {...formItemLayout}
+								                         label="上年度总资产情况"
+							                            >
+							                                <Input ref='consul' placeholder="上年度总资产情况" value={this.state.assets} style={{width:'95%'}}
+														onChange={(e) => {this.setState({assets: e.target.value })}} disabled={true}/>万
+							                    </FormItem>
+							                    
 							                    <div className='clearfix'>
 								                    <FormItem
 								                        labelCol={{ span:4 }}
 								                        wrapperCol={{ span: 19 }}
-								                        label="核心技术" >
+								                        label="企业核心技术" >
 								                            <Input type="textarea" rows={3} value={this.state.coreTechnology} 
 														onChange={(e,pre) => { this.setState({ coreTechnology: e.target.value })}} disabled={true}/>
 								                    </FormItem>
@@ -1071,7 +1065,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 								                    <FormItem
 								                        labelCol={{ span:4 }}
 								                        wrapperCol={{ span: 19 }}
-								                        label="企业高企合作情况" >
+								                        label="高企合作情况" >
 								                            <Input type="textarea" rows={3} value={this.state.cooperationSituation} 
 														onChange={(e,pre) => { this.setState({ cooperationSituation: e.target.value })}} disabled={true}/>
 								                    </FormItem>

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

@@ -39,7 +39,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
                              deleteSign:thisdata.deleteSign, 
                              taskComment:thisdata.taskComment, 
                              publishStatus:thisdata.publishStatus, 
-                             technicianMobile:thisdata.technicianMobile, 
                         });
                     };
                    }
@@ -63,8 +62,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			orderSelect:false,
 			transferState:false,
 			orgCodeUrl:[],
-			lvState:false,
-			lvRadio:2,
+			lvState:true,
+			lvRadio:0,
 			customerArr:[],
 			checkedKeys: [],
             //派单
@@ -82,10 +81,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     dataIndex: 'technicianName',
                     key: 'technicianName'
                 }, {
-                    title: '负责人联系方式',
-                    dataIndex: 'technicianMobile',
-                    key: 'technicianMobile'
-                }, {
                     title: '任务状态',
                     dataIndex: 'taskStatus',
                     key: 'taskStatus',
@@ -291,7 +286,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
     },
     //查看详情
     loaduser(record){
-		console.log(record);
     	if(record){
     	$.ajax({
             method: "get",
@@ -498,8 +492,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
     	});
     	this.state.departmenttList=undefined;
     	this.state.financeNameSearch='';
-    	this.state.lvRadio=2;
-    	//this.contactList();
+    	this.state.lvRadio=0;
+    	this.contactLists();
     },
     distributionCancel(){
     	this.setState({
@@ -578,6 +572,72 @@ const MySettlementDetaile = Form.create()(React.createClass({
             });
         }.bind(this));
     },
+    //分配对象列表
+    contactLists(){
+    	this.setState({
+            loading: true
+        });
+        
+    	let api = '/api/admin/superviser/adminList';
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + api,
+            data: {
+                pageNo: 1,
+                pageSize: 99,
+                departmentId:this.state.departmenttList,
+                name:this.state.financeNameSearch,
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                	if(data.data.list){
+                		for (let i = 0; i < data.data.list.length; i++) {
+	                        let thisdata = data.data.list[i];
+	                        theArr.push({
+	                             key: i,
+		                         id: thisdata.id,
+		                         userNo: thisdata.userNo,
+		                         name:thisdata.name,
+		                         departmentName:thisdata.departmentName,
+		                         departmentId:thisdata.departmentId,
+		                         position:thisdata.position,
+		                         mobile:thisdata.mobile,
+	                        });
+                    	};
+                	}else{
+                		for (let i = 0; i < data.data.length; i++) {
+	                        let thisdata = data.data[i];
+	                        theArr.push({
+	                             key: i,
+		                         id: thisdata.id,
+		                         userNo: thisdata.userNo,
+		                         name:thisdata.name,
+		                         departmentName:thisdata.departmentName,
+		                         departmentId:thisdata.departmentId,
+		                         position:thisdata.position,
+		                         mobile:thisdata.mobile,
+	                        });
+                   		};
+                	}
+                    
+                };
+                this.setState({
+                    distributionList: theArr,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
     //选定对象
     confirmSelect(record){
     	if(this.state.projectVisible){
@@ -644,17 +704,17 @@ const MySettlementDetaile = Form.create()(React.createClass({
         }.bind(this));
     },
     searchOrder(){
-    	this.contactList();
+    	this.contactLists();
     },
     resetOrder(){
     	this.state.departmenttList=undefined;
     	this.state.financeNameSearch='';
-    	this.state.lvRadio=2;
+    	this.state.lvRadio=0;
     	this.setState({
     		lvState:false,
     		distributionList:[]
     	})
-    	this.contactList();
+    	this.contactLists();
     },
     //添加任务
     addTask(){
@@ -869,8 +929,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		});
 		this.state.departmenttList=undefined;
     	this.state.financeNameSearch='';
-    	this.state.lvRadio=2;
-		//this.contactList();
+    	this.state.lvRadio=0;
+		this.contactLists();
 	},
 	/* -----变更操作开始----- */
 	//新建变更
@@ -1032,9 +1092,9 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		}.bind(this));
 	},
 	/*-----变更操作结束----*/
-	//派单阶级操作
+	//切换其他下级
 	lvRadioFn(e){
-		if(e.target.value==2){
+		if(e.target.value==0){
 			this.setState({
 				lvRadio:e.target.value,
 				lvState:false
@@ -1044,8 +1104,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				lvRadio:e.target.value,
 				lvState:true
 			})
-			this.contactList();
 		}
+		this.contactList();
 	},
 	
 	
@@ -1158,11 +1218,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                            label="结算状态" >  
 				                            <span>{getPaymentState(orderArr.liquidationStatus)}</span>
 			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单部门" >  
-				                            <span>{orderArr.departmentName}</span>
-			                    		</FormItem>
+			                    		
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -1437,17 +1493,15 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					                    	<span>{this.state.deletedSign==2?'锁定':'未锁定'}</span>
 			                    	</FormItem>
 			                    	<div className='clearfix'>
-							        	{this.state.taskStatus<1?
-							        	<FormItem
+							        	{this.state.taskStatus<1?<FormItem
 								            labelCol={{ span: 4 }}
 								            wrapperCol={{ span: 16 }}
 								            label="任务说明" >
 								                <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.taskComment} 
 									    				onChange={(e)=>{this.setState({taskComment:e.target.value})}}/>			                      
 								        </FormItem>:
-								        <FormItem 
-				                            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
+								        <FormItem className="half-item"
+				                            {...formItemLayout}
 				                            label="任务说明" >
 					                    	<span>{this.state.taskComment}</span>
 				                    	</FormItem>}
@@ -1564,8 +1618,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			                <Spin spinning={this.state.loading}>
 			                	<div>
 			                		<Radio.Group onChange={this.lvRadioFn} value={this.state.lvRadio}>
-								        <Radio value={0}>下级</Radio>
-								        <Radio value={2}>其他</Radio>
+								        <Radio value={2}>下级</Radio>
+								        <Radio value={0}>其他</Radio>
 								    </Radio.Group>
 			                		{!this.state.lvState&&<Select placeholder="部门"
 				                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
@@ -1580,8 +1634,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                    {!this.state.lvState&&<Input placeholder={this.state.transferState?"责任人":"咨询师"} style={{width:'150px',marginLeft:'10px'}}
 				                        value={this.state.financeNameSearch}
 				                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />}  
-				                    <Button type="primary" onClick={this.searchOrder} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
-	                    			<Button onClick={this.resetOrder}>重置</Button>
+				                    {!this.state.lvState&&<Button type="primary" onClick={this.searchOrder} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>}
+	                    			{!this.state.lvState&&<Button onClick={this.resetOrder}>重置</Button>}
 			                	</div>
 			                	 <div className="patent-table" style={{marginTop:'10px'}}>
 				                    <Spin spinning={this.state.loading}>