liting2017 7 years ago
parent
commit
82afbdaf79

+ 9 - 4
js/component/manageCenter/customer/companyCustomer.jsx

@@ -60,9 +60,7 @@ const PublicCustomer = React.createClass({
                             companyIntention:thisdata.companyIntention,//意向服务
                             followSituation:thisdata.followSituation,//最新跟进
                             adminName:thisdata.adminName,     //跟进人          
-                            followDate:thisdata.followDate,
-                            customerStatus:thisdata.customerStatus,//客户状态
-                            companyIntention:thisdata.companyIntention,//意向服务                                                      
+                            followDate:thisdata.followDate,                                                                                   
                         });
                     };
                    
@@ -399,6 +397,9 @@ const PublicCustomer = React.createClass({
         this.setState({
             loading: true
         });  
+        this.setState({
+            selectedRowKeys:[],            
+        });
         let deletedIds=this.state.rowId; 
          for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
             let rowItem = this.state.selectedRows[idx];                          
@@ -466,7 +467,10 @@ const PublicCustomer = React.createClass({
         this.state.data = [];
         this.setState({
             loading: true
-        });  
+        });
+        this.setState({
+            selectedRowKeys:[],            
+        });
         let deletedIds=this.state.rowId; 
          for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
             let rowItem = this.state.selectedRows[idx];                          
@@ -553,6 +557,7 @@ const PublicCustomer = React.createClass({
                             onChange={(e) => { this.setState({ customerTypet : e }) }}>
                             <Select.Option value="0" >个人客户</Select.Option>
                             <Select.Option value="1" >公司客户</Select.Option>
+                            <Select.Option value="2" >团体单位</Select.Option>
                     </Select>     
                     <Select placeholder="意向服务"
                             style={{ width: 160 }}

+ 39 - 26
js/component/manageCenter/customer/myClient.jsx

@@ -152,8 +152,12 @@ const AchievementList = Form.create()(React.createClass({
 					    let thedata=data.data;					  
 					    var email=[];
 					    var telNum=[];
+					    var watch=[];
+					    var qq=[];
 					    var contactIds=[];
-				        thedata.map(function (item,index) {				        				        	
+				        thedata.map(function (item,index) {	
+				        	watch.push(thedata[index].wechat);
+				        	qq.push(thedata[index].qq);
 				        	email.push(thedata[index].email);
 				        	contactIds.push(thedata[index].id);
 			            	telNum.push(thedata[index].telNum);
@@ -162,8 +166,9 @@ const AchievementList = Form.create()(React.createClass({
 			            var lastName= thedata[thedata.length-1].name;			        			          
 			            var nub=thedata[thedata.length-1].telNum; 
 			            var kid=thedata[thedata.length-1].id;
+			            
 						var contacts='电话';						
-						this.setState({
+						this.setState({							
 							idt:thedata[0].id,
 						    kid:kid,						   						  
 						    contactIds:contactIds,
@@ -171,6 +176,8 @@ const AchievementList = Form.create()(React.createClass({
 		        	    	nub:nub,
 				        	telNum:telNum,
 				        	email:email,
+				        	watch:watch,
+							qq:qq,
 				        	lastName:lastName,
 		                    orderStatusOption: theArr, 
 		                    technicalPictureUrl: thedata.sign ? splitUrl(thedata.sign, ',', globalConfig.avatarHost + '/upload') : [],
@@ -185,7 +192,7 @@ const AchievementList = Form.create()(React.createClass({
     //在添加联系记录页面,选择联系方式查看号码
     contacts(e){
     	
-			let conts='';   
+		let conts='';   
 	    if(e==0){
 	    	conts='电话'
 	    	this.state.nub=this.state.changNub		    	
@@ -195,12 +202,12 @@ const AchievementList = Form.create()(React.createClass({
 	    	this.state.nub=this.state.changEmail		    	
 	    }
 	    if(e==2){
-	    	conts='面谈'
-	    	this.state.nub=''		    
+	    	conts='微信'
+	    	this.state.nub=this.state.changWatch		    
 	    }	    	     
 	    if(e==3){
-	    	conts='短信'
-	    	this.state.nub=''			    	
+	    	conts='QQ'
+	    	this.state.nub=this.state.changQq			    	
 	    	}	
 	    this.setState({
 			conts:conts,
@@ -231,8 +238,9 @@ const AchievementList = Form.create()(React.createClass({
 //				let companyArr=[]; 				
 // 				let companyString=thisData.companyIntention;				
 // 				companyArr=companyString.split(",") ; 				
- 				let creatMent=thisData.createTime.substr(10,9)
- 				let createYear=thisData.createTime.substr(0,10)
+ 				let creatMent=thisData.createTime.substr(10,9);
+ 				let createYear=thisData.createTime.substr(0,10);
+ 				let followSituationTxt=getfllowSituation(thisData.followSituation.toString()); 				
                 this.setState({
                 	locationProvince:thisData.locationProvince,
                 	addId:thisData.id,                	
@@ -242,7 +250,7 @@ const AchievementList = Form.create()(React.createClass({
                     datak: thisData,
                     companyIndustry:thisData.companyIndustry,
                     adress:thisData.adress,                    
-                   	followSituation:thisData.followSituation,
+                   	followSituation:followSituationTxt,
             		customerStatus:thisData.customerStatus.toString(),
             		companyIntention:thisData.companyIntention,
             		_followSituation:thisData._followSituation,
@@ -377,10 +385,11 @@ const AchievementList = Form.create()(React.createClass({
 	//点击查看跟进记录,点击最新跟进的第一个按钮(跟进状态)执行的函数,将会出现很多跟进列表
 	setModal3VisibleOk(e) {		
 		this.setState({ modal3Visible:true });	
+		this.state.data = [];
         this.setState({
             loading: true
         });
-        let deletedIds;                    
+        let deletedIds=this.state.rowId;                    
         for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
             let rowItem = this.state.selectedRows[idx];                          
             if (rowItem.id) {
@@ -691,6 +700,7 @@ const AchievementList = Form.create()(React.createClass({
             let customerStatus= getcustomerStatueOn(this.state.customerStatus);
             let followSituation= getfllowSituationOn(this.state.followSituation);
             //图片转换
+            
             let thetechnicalPictureUrl = [];
             if (this.state.technicalPictureUrl.length) {
                 let picArr = [];
@@ -723,8 +733,8 @@ const AchievementList = Form.create()(React.createClass({
                         followDates:yearString+' '+pjstringY,
                         followResult:values.remarks,//跟进结果
                         attachment:"",//附件地址
-                        customerStatus:this.state.customerStatusi,//跟进客户状态
-                        followSituation:this.state.followSituationi,//跟进进度
+                        customerStatus:this.state.customerStatus,//跟进客户状态
+                        followSituation:this.state.followSituation.length==1?this.state.followSituation:followSituation,//跟进进度
                         contactInfo:(this.state.conts?this.state.conts:"电话")+"-"+(this.state.nub?this.state.nub:""),
                         sign:thetechnicalPictureUrl
                     }
@@ -748,14 +758,18 @@ const AchievementList = Form.create()(React.createClass({
     hundleName(e){		    	
        let changNub=this.state.telNum[e];
        let changEmail=this.state.email[e];
+       let changWatch=this.state.watch[e];
+       let changQq=this.state.qq[e];
        let kid=this.state.contactIds[e];      
-       this.setState({
+       this.setState({       		
        	  kid:kid,
        	  contacts:'电话',
        	  nub:this.state.telNum[e],
 	      lastName: e,
 	      changNub:changNub,
 	      changEmail:changEmail,
+	      changWatch:changWatch,
+	      changQq:changQq
 	   });
 	},
 
@@ -821,7 +835,7 @@ const AchievementList = Form.create()(React.createClass({
                         adress: this.state.adress,//详细地址1
                         remarks: values.remarks,//备注1
                         companyIntention:this.state.companyIntention,//公司意向
-                        followSituation:this.state.followSituation,//最新跟进1
+                        followSituation:theDatak.followSituation,//最新跟进1
                         customerStatus:this.state.customerStatus,//客户状态1
                 		beforeAdminName:this.state.adminName,
                		
@@ -1124,7 +1138,7 @@ const AchievementList = Form.create()(React.createClass({
 				  dataIndex: '_customerStatus',
 				  key: '_customerStatus'	 
 			},{
-				  title: '跟进状态',
+				  title: '跟进结果',
 				  dataIndex: '_followSituation',
 				  key: '_followSituation'	 
 			},{
@@ -1941,19 +1955,18 @@ const AchievementList = Form.create()(React.createClass({
 			                    			</Select>			                               
 							              <span style={{width:'120px',display:'inline-block',marginLeft:'20px'}}>{getcustomerTyp(theDatat.customerTyp)}
 			                                 <Button type="primary" onClick={this.setModal2VisibleOk}>添加</Button>	
-			                              </span>
-											    	
+			                              </span>											    	
 								</FormItem>													
 								<FormItem className="half-item"							                           
 			                        {...formItemLayout}
 		                            label="联系方式" >							                           
 	                               <Select placeholder="选择方式" style={{width:'100px'}} value={this.state.contacts}
 									         					onChange={this.contacts}>
-	                                   	 <Select.Option value="0">电话</Select.Option>
-									         <Select.Option value="1">邮件</Select.Option>
-									         <Select.Option value="2">面谈</Select.Option>
-									         <Select.Option value="3">短信</Select.Option>
-	                                		</Select>	
+                                   	     <Select.Option value="0">电话</Select.Option>
+								         <Select.Option value="1">邮件</Select.Option>
+								         <Select.Option value="2">微信</Select.Option>
+								         <Select.Option value="3">QQ</Select.Option>
+	                                </Select>	
 	                                <span style={{marginLeft:'20px'}}>{this.state.nub}</span>							                                															                         							                               
 					            </FormItem>
 						        <FormItem className="half-item"
@@ -1977,10 +1990,10 @@ const AchievementList = Form.create()(React.createClass({
                					<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="最新客户状态" >			                           
-			                                <Select placeholder="选择客户状态" style={{width:'200px'}} value={this.state.customerStatusi}  onChange={(e) => { this.setState({customerStatusi: e}); }}>
+			                                <Select placeholder="选择客户状态" style={{width:'200px'}} value={this.state.customerStatus}  onChange={(e) => { this.setState({customerStatus: e}); }}>
 		                                    {
 		                                        customerStatus.map(function (item) {
-		                                            return <Select.Option key={item.value} style={{width:'200px'}}>{item.key}</Select.Option>
+		                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 		                                        })
 		                                    }
 	                                </Select>			                              
@@ -1993,7 +2006,7 @@ const AchievementList = Form.create()(React.createClass({
 			                    <FormItem className="half-item"
 		                            {...formItemLayout}
 		                            label="最新跟进状态" >		                           
-		                                <Select placeholder="选择跟进状态"  style={{width:'200px'}}  value={this.state.followSituationi}  onChange={(e) => { this.setState({followSituationi: e}); }}>
+		                                <Select placeholder="选择跟进状态"  style={{width:'200px'}}  value={this.state.followSituation}  onChange={(e) => { this.setState({followSituation: e}); }}>
 		                                    {
 		                                        newFollow.map(function (item) {
 		                                            return <Select.Option key={item.value} >{item.key}</Select.Option>

+ 1 - 1
js/component/manageCenter/customer/myClientDesc.jsx

@@ -1067,7 +1067,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
 	                            {...formItemLayout}
 	                            label="手机号码" >
 	                            {getFieldDecorator('telNum', {	
-	                            	
+	                            	rules: [{ required: true, message: '此项为必填项!' }],
 	                                initialValue: theData.telNum 
 	                            })(
 	                                <Input />

+ 1 - 0
js/component/manageCenter/customer/publicCustomer.jsx

@@ -338,6 +338,7 @@ const PublicCustomer = React.createClass({
                             onChange={(e) => { this.setState({ customerTypet : e }) }}>
                             <Select.Option value="0" >个人客户</Select.Option>
                             <Select.Option value="1" >公司客户</Select.Option>
+                            <Select.Option value="2" >团体单位</Select.Option>
                     </Select>                        
                     <Select placeholder="地区"
                             style={{ width: 160 }}

+ 1 - 0
js/component/manageCenter/customer/teamCustomer.jsx

@@ -257,6 +257,7 @@ const Teamcustomer = React.createClass({
                             onChange={(e) => { this.setState({ customerTypet : e }) }}>
                             <Select.Option value="0" >个人客户</Select.Option>
                             <Select.Option value="1" >公司客户</Select.Option>
+                            <Select.Option value="2" >团体单位</Select.Option>
                     </Select>                        
                     <Select placeholder="地区"
                             style={{ width: 160 }}