dengzhiguo 7 years ago
parent
commit
f1c1afb655

+ 3 - 3
js/component/manageCenter/customer/companyCustomer.jsx

@@ -12,7 +12,7 @@ import { beforeUploadFile,getOrderStatus, getSearchUrl,getcustomerTyp,getcityArr
 
 //查询功能和初始列表
 const PublicCustomer = React.createClass({
-    loadData(pageNumber, detailApiUrl) {    	
+    loadData(pageNo, detailApiUrl) {    	
         this.state.data = [];
         this.setState({
             loading: true
@@ -23,7 +23,7 @@ const PublicCustomer = React.createClass({
             crossDomain: false,          
             url:globalConfig.context +'/api/admin/customer/listCompanyCustomer',
             data: {
-                pageNumber: pageNumber || 1,
+                pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,               
                 companyName: this.state.companyName, //名称1                
 								customerType: this.state.customerType, //客户类型1
@@ -67,7 +67,7 @@ const PublicCustomer = React.createClass({
                         });
                     };
                    
-                    this.state.pagination.current = data.data.pageNumber;
+                    this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.total = data.data.totalCount;
                 };               
                 this.setState({

+ 4 - 3
js/component/manageCenter/customer/leftTab.jsx

@@ -33,13 +33,14 @@ const LeftTab = React.createClass({
                 </Menu.Item>               
                 <Menu.Item key="publicCustomer">
                     公共客户
-                </Menu.Item> 
-                <Menu.Item key="companyCustomer">
-                    公司客户
                 </Menu.Item>
                 <Menu.Item key="teamCustomer">
                     团队客户
                 </Menu.Item>
+                <Menu.Item key="companyCustomer">
+                    公司客户
+                </Menu.Item>
+                
             </Menu>
         );
     },

+ 150 - 183
js/component/manageCenter/customer/myClient.jsx

@@ -9,46 +9,7 @@ import  TechAchievementDesc from './myClientDesc.jsx';
 import { achievementCategoryList, techAuditStatusList,cityArr,tag,customerStatus,intentionalService,newFollow ,newFollowOn,contact,sex,intentionalServiceOn,customerStatusOn} from '../../dataDic.js';
 import { beforeUploadFile, companySearch, getAchievementCategory,getsex,getSearchUrl,getTechAuditStatus,getcustomerTyp,getcityArr,getCompanyIntentionOn,getcustomerStatue,getCompanyIntention,getfllowSituation,getcontact,getfllowSituationOn,getcustomerStatueOn} from '../../tools.js';
 import BatchImport from './batchImport';
-//历史记录	
-const datas = [{
-		  key: '1',
-		  firstName: 'John',
-		  lastName: 'Brown',
-		  age: 32,
-		  address: 'New York No. 1 Lake Park',
-		  addres:'31232',
-		  addre:'31231',
-		  addr:'231321',
-		}, {
-		  key: '2',
-		  firstName: 'Jim',
-		  lastName: 'Green',
-		  age: 42,
-		  address: 'London No. 1 Lake Park',
-		  addres:'31232',
-		  addre:'31231',
-		  addr:'231321',
-		}, {
-		  key: '3',
-		  firstName: 'Joe',
-		  lastName: 'Black',
-		  age: 32,
-		  address: 'Sidney No. 1 Lake Park',
-		  addres:'31232',
-		  addre:'31231',
-		  addr:'231321',
-		}, {
-		  key: '4',
-		  firstName: 'Jim',
-		  lastName: 'Green',
-		  age: 42,
-		  address: 'London No. 1 Lake Park',
-		  addres:'31232',
-		  addre:'31231',
-		  addr:'231321',
-		}, 
-		];
-	
+
 //图片组件
 const PicturesWall = React.createClass({
     getInitialState() {
@@ -101,23 +62,10 @@ const PicturesWall = React.createClass({
         );
     }
 });
-const contactsOptionWoman=[];
-
-const datat = [{
-	  key: 1,
-	  name: 'John Brown sr.',
-  },
-  {
-    key: 12,
-    name: 'John Brown jr.',  
-  }, {
-    key: 13,
-    name: 'Jim Green sr.',   
-}];
 
 const AchievementList = Form.create()(React.createClass({
 	
-    loadData(pageNumber, apiUrl) {
+    loadData(pageNo, apiUrl) {
         this.state.data = [];
         this.setState({
             loading: true
@@ -128,7 +76,76 @@ const AchievementList = Form.create()(React.createClass({
             crossDomain: false,          
             url:globalConfig.context + '/api/admin/customer/listPrivateCustomer',
             data: {
- 				pageNumber: pageNumber || 1,
+ 				pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,               
+//              companyName: this.state.companyName, //名称1                
+//				customerType: this.state.customerType, //客户类型1
+//            	locationProvince:this.state.locationProvince,//地区
+//				customerStatus:this.state.customerStatus,//客户状态1
+//				contactName:this.state.contactName,//联系人姓名1							
+//				contactTel:this.state.contactTel,//联系人手机
+//				companyIntention:this.state.companyIntention,//意向服务
+//              followSituation:this.state.followSituation,//最新跟进进度		
+            },
+            success: function (data) {            	
+                let theArr = [];
+                let ad;
+                if (data.error.length || data.data.list=="") {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };                   
+                } else { 
+                	ad=data.data.list[0].aid;
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];                       
+                        theArr.push({
+                            key: i,                           
+                            id: thisdata.id,                                                  
+                            companyName:thisdata.companyName,//公司名称
+                            _shareType:thisdata._shareType,//客户类型
+                            locationProvince:thisdata.locationProvince,//地区                        
+                            contactName:thisdata.contactName, //联系人姓名
+                            telNum:thisdata.telNum,//手机号
+                            _customerStatus:thisdata._customerStatus,//客户状态
+                            _companyIntention:thisdata._companyIntention,//意向服务
+                            _followSituation:thisdata._followSituation,//最新跟进
+                            customerStatus:thisdata.customerStatus,//客户状态
+                            companyIntention:thisdata.companyIntention,//意向服务
+                            followSituation:thisdata.followSituation,//最新跟进
+                            adminName:thisdata.adminName,     //跟进人          
+                            followDate:thisdata.followDate,
+                            customerStatus:thisdata.customerStatus,//客户状态
+                            companyIntention:thisdata.companyIntention,//意向服务 
+                            _customerType:thisdata._customerType,//客户类型
+                        });
+                    };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                };               
+                this.setState({
+                	aid:ad,
+                    dataSource: theArr,
+                    pagination: this.state.pagination
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    }, 
+    loadData1(pageNo, apiUrl) {
+        this.state.data = [];
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,          
+            url:globalConfig.context + '/api/admin/customer/listPrivateCustomer',
+            data: {
+ 				pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,               
                 companyName: this.state.companyName, //名称1                
 				customerType: this.state.customerType, //客户类型1
@@ -167,10 +184,11 @@ const AchievementList = Form.create()(React.createClass({
                             adminName:thisdata.adminName,     //跟进人          
                             followDate:thisdata.followDate,
                             customerStatus:thisdata.customerStatus,//客户状态
-                            companyIntention:thisdata.companyIntention,//意向服务    
+                            companyIntention:thisdata.companyIntention,//意向服务 
+                            _customerType:thisdata._customerType,//客户类型
                         });
                     };
-                    this.state.pagination.current = data.data.pageNumber;
+                    this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.total = data.data.totalCount;
                 };               
                 this.setState({
@@ -253,9 +271,10 @@ const AchievementList = Form.create()(React.createClass({
 	      contacts: e,
 	   });		
 		},
-				
+	
     //通过ID查询这一条的信息
-    Detailload(deletedIds){
+    Detailload(deletedIds,record){
+    	this.RowClick;
     	$.ajax({
             method: "post",
             dataType: "json",
@@ -277,9 +296,14 @@ const AchievementList = Form.create()(React.createClass({
                     data: thisData,
                    	followSituation:thisData.followSituation,
             		customerStatus:thisData.customerStatus,
+            		companyIntention:thisData.companyIntention,
             		_followSituation:thisData._followSituation,
             		_customerStatus:thisData._customerStatus,
+            		_companyIntention:thisData._companyIntention,
             		cid:thisData.cid,
+            		customerType:thisData.customerType,
+            		companyName:thisData.companyName,
+            		adminName:thisData.adminName
                 });
                 if (thisData.ownerId) {
                     this.getContactsList(thisData.ownerId);
@@ -489,7 +513,8 @@ const AchievementList = Form.create()(React.createClass({
 	setModal5Visiblecancel(e) {
 	    this.setState({ 
 	    	modal5Visible:false
-	    });	   	    
+	    });	 
+	    this.reset();
 	},
 	setModal6Visiblecancel(e) {
 	    this.setState({ 
@@ -606,9 +631,11 @@ const AchievementList = Form.create()(React.createClass({
                 this.setState({
                     loading: false,
                 });
+                this.setModal8Visiblecancel()
             } else {
                 message.warning(data.error[0].message);
             };
+            //this.getNewWoman(this.state.cid)
             this.loadData();
         }.bind(this));
 		},
@@ -698,14 +725,6 @@ const AchievementList = Form.create()(React.createClass({
             };            
         };   
       	this.props.form.validateFields((err, values) => {
-//      	let theMaturityPictureUrl = [];
-//          if (this.state.maturityPictureUrl.length) {
-//              let picArr = [];
-//              this.state.maturityPictureUrl.map(function (item) {
-//                  picArr.push(item.response.data);
-//              });
-//              theMaturityPictureUrl = picArr.join(",");
-//          };
     		if (!err) {
             	this.setState({
                 loading: true
@@ -749,7 +768,7 @@ const AchievementList = Form.create()(React.createClass({
                 }.bind(this));  	
             }
     	})
-        this.setModal5Visiblecancel;
+        
     },
     //当选择联系人的列表变化时,则执行
     hundleName(e){		    	
@@ -771,7 +790,8 @@ const AchievementList = Form.create()(React.createClass({
 		
     //所有资料修改保存提交,点击保存按钮进行更新
     handleSubmit(e) {    		
-        e.preventDefault();   
+        e.preventDefault(); 
+        let deletedIds;
         let adminName;
         let customerStatus;       
         let companyIntention;
@@ -786,29 +806,17 @@ const AchievementList = Form.create()(React.createClass({
                 followSituation=rowItem.followSituation;
             };            
         };  
-        this.state.data = []
+        //this.state.data = []
         this.setState({        	
-            selectedRowKeys: [],
-            loading: deletedIds.length > 0
-        });
-        let deletedIds;
-        this.state.data = [];
-        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
-            let rowItem = this.state.selectedRows[idx];
-            if (rowItem.id) {
-                deletedIds=rowItem.id
-            };            
-        };       
-        this.setState({
-            selectedRowKeys: [],
-           
+            //selectedRowKeys: [],
+           // loading: deletedIds.length > 0
         });
         this.props.form.validateFields((err, values) => {
     	if (!err) {
             this.setState({
                 loading: true
             });          
-            let custype=values._shareType; 
+            let custype=values._customerType; 
             let customerTypechange="";
             switch(custype){
             	case "个人客户":customerTypechange=0;break;
@@ -816,48 +824,41 @@ const AchievementList = Form.create()(React.createClass({
             }      
             let companyIntentions= getCompanyIntentionOn(values.companyIntention);
             let followSituations= getfllowSituationOn(values.followSituation);         
-         
+         	let becompanyIntentions=getCompanyIntentionOn();
+         	let city=getcityArr(values.locationProvince);
+         	
        		$.ajax({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
                     url:globalConfig.context + '/api/admin/customer/updateCustomer',
                     data: {
-                        id: deletedIds,//编号id  
-                        customerTyp :customerTypechange,//客户信息  1                       
-                        createTime: values.createTime ? values.createTime.format('YYYY-MM-DD') : undefined,//时间 1\                    
-                        companyIntention: companyIntentions,
-                        companyName: values.companyName,//公司名称  1                        
+                        id: this.state.cid,//编号id  
+                        customerType:this.state.customerType,//客户信息  1                       
+                        //createTime: values.createTime ? values.createTime.format('YYYY-MM-DD') : undefined,//时间 1\                    
+						companyName: values.companyName,//公司名称  1                        
                         companyIndustry: values.companyIndustry,//公司行业                          
                         tag: values.tag,
-                        locationProvince: values.locationProvince,//省份1
+                        locationProvince:values.locationProvince ,//省份1
                         adress: values.adress,//详细地址1
                         remarks: values.remarks,//备注1
-                        followSituation:followSituations,//最新跟进1
-                        customerStatus: values.customerStatus,//客户状态1
-                        name: values.name,//客户姓名1                        
-                        mobile: values.mobile,//座机1
-                        telNum: values.telNum,//手机号码1
-                        sex: values.sex,//性别1
-                        customerPosition: values.customerPosition,//职位1
-                        wechat: values.wechat,//微信号1
-                        qq: values.qq,//qq     1                 
-                        depatrment: values.depatrment,//部门             1
-                        email: values.email,//邮箱     1                   
-                       	shareTyp:0,
-                       	customerStatus:customerStatus,
-                       	beforeCustomerStatus:customerStatus,
-               			beforeCompanyIntention:companyIntention,
-                		beforeFollowSituation:followSituation,
-                		beforeAdminName:adminName,
+                        companyIntention:this.state.companyIntention,//公司意向
+                        followSituation:this.state.followSituation,//最新跟进1
+                        customerStatus:this.state.customerStatus,//客户状态1
+                        //name: values.name,//客户姓名1                        
+//                     	beforeCustomerStatus:this.state.customerStatus,//客户状态
+//             			beforeCompanyIntention:this.state.companyIntention,
+//              		beforeFollowSituation:this.state.followSituation,//最新跟进
+                		beforeAdminName:this.state.adminName,
+                		name:this.state.companyName,
                     }
                 }).done(function (data) {                	
                     this.setState({
                         loading: false
                     });
                     if (!data.error.length) {
-                        message.success('保存成功!');
-                        this.setModal1Visiblecancel                       
+                        message.success('修改成功!');
+                               this.setModal5Visiblecancel();
                     } else {
                         message.warning(data.error[0].message);
                     }
@@ -865,7 +866,7 @@ const AchievementList = Form.create()(React.createClass({
                 }.bind(this));  	
             }
     	})
-        this.setModal5Visiblecancel;
+        
     },
     
     submitcontactman(e){
@@ -1126,19 +1127,7 @@ const AchievementList = Form.create()(React.createClass({
 				  title: '职位',
 				  dataIndex: 'customerPosition',
 				  key: 'customerPosition'	 
-			},
-			{
-				  
-				  title:"删除记录",
-				  dataIndex: 'del',
-			      key:"del",
-			      render:(text, record, index) => {													       													          
-			            <Popconfirm title="是否删除?" onConfirm={() => this.onDelete(index)}>
-			              <a href="#" style={{color:"#f00"}}>Delete</a>
-			            </Popconfirm>													         													       
-			      }
-			}
-			
+			}	
        ],
 
             columnsman:[{
@@ -1191,8 +1180,8 @@ const AchievementList = Form.create()(React.createClass({
 					                <div className="clearfix">                    	
 					                    <FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="客户类型1223" >
-					                    <span>{theData._shareType}</span>
+			                            label="客户类型" >
+					                    <span>{theData._customerType}</span>
 				                      </FormItem>
 				                  </div>
 				                  <FormItem className="half-item"
@@ -1271,18 +1260,16 @@ const AchievementList = Form.create()(React.createClass({
 		                        </FormItem>
 		                        <FormItem className="half-item"
 		                            {...formItemLayout}
-		                            label="意向服务111" >
-		                            {getFieldDecorator('companyIntention', {		                            
-		                              initialValue: getCompanyIntention(theData.companyIntention)
-		                            })(
-		                               <Select placeholder="选择服务类型" >
+		                            label="意向服务" >
+		                               <Select placeholder="选择服务类型" value={getCompanyIntention(this.state.companyIntention)} onChange={(e) => {
+										                    this.setState({ companyIntention: e}) }}>
 		                                    {
 		                                        intentionalService.map(function (item) {
 		                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 		                                        })
 		                                    }
 		                                </Select>
-		                                )}
+		                               
 		                        </FormItem>	                       
 				                    <FormItem className="half-item"
 		                            {...formItemLayout}
@@ -1301,33 +1288,25 @@ const AchievementList = Form.create()(React.createClass({
 		                        </FormItem>
 		                        <FormItem className="half-item"
 		                            {...formItemLayout}
-		                            label="最新跟进" >
-		                            {getFieldDecorator('followSituation', {		                            	
-		                                initialValue: getfllowSituation(theData.followSituation)
-		                            })(
-		                                <Select placeholder="选择跟进进度" style={{ width: 160 }} >
+		                            label="最新跟进" >		                           
+		                                <Select placeholder="选择跟进进度" value={getfllowSituation(this.state.followSituation)} style={{ width: 160 }} onChange={(e) => { this.setState({ followSituation: e}) }}>
 		                                    {
 		                                        newFollow.map(function (item) {
 		                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 		                                        })
 		                                    }
-		                                </Select>
-		                                )}
+		                                </Select>		                              
 		                        </FormItem>
 		                        <FormItem className="half-item"
 		                            {...formItemLayout}
-		                            label="客户状态999" >
-		                            {getFieldDecorator('customerStatus', {		                            	
-		                              initialValue: getcustomerStatue(theData.customerStatus)
-		                            })(
-		                                <Select placeholder="选择客户状态" style={{ width: 160 }} >
+		                            label="客户状态" >
+		                                <Select placeholder="选择客户状态" value={getcustomerStatue(this.state.customerStatus)} style={{ width: 160 }} onChange={(e) => { this.setState({ customerStatus: e }) }}>
 		                                    {
 		                                        customerStatus.map(function (item) {
 		                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 		                                        })
 		                                    }
 		                                </Select>
-		                                )}
 		                        </FormItem>	                       
 		                        <FormItem className="half-item"
 			                            {...formItemLayout}
@@ -1375,21 +1354,14 @@ const AchievementList = Form.create()(React.createClass({
 						            onOk={this.setModal7Visiblecancel}
 						            onCancel={this.setModal7Visiblecancel}>
                     				<Spin spinning={this.state.loading}>
-                    				<Button style={{ background: "#ea0862", border: "none", color: "#fff" }}
-				                        disabled={!hasSelected}
-				                        onClick={this.delectRowFollow}>删除<Icon type="minus" /></Button>
 						            <Table 
 					            	 columns={this.state.contactInformation} 					            	 
 					            	 dataSource={this.state.information}
-					            	 scroll={{ y: 300 }}
-					            	 bordered
+					            	 
 					            	 onRowClick={this.informationRowClick}
 					            	 />
 						            
-									  <FormItem wrapperCol={{ span: 12, offset: 12 }} style={{marginTop:'20px'}}>
-			                       		<Button className="set-submit" type="primary" htmlType="submit" id="change_keep" style={{marginLeft:"50px"}} onClick={this.changeAssigner }>保存</Button>
-			                       		<Button className="set-submit" type="ghost" onClick={this.handleCancel } style={{marginLeft:"30px"}} id='change_rem'>取消</Button>
-			                    	  </FormItem>  	                    																	                   
+									                      																	                   
 									</Spin>
 									</Modal>
 									<FormItem wrapperCol={{ span: 12, offset: 4 }}>
@@ -1516,8 +1488,8 @@ const AchievementList = Form.create()(React.createClass({
                     	}
                 }, {
                     title: '客户类型',
-                    dataIndex: '_shareType',
-                    key: '_shareType'
+                    dataIndex: '_customerType',
+                    key: '_customerType'
                  // render: text => { return getcustomerTyp(text); }
                 }, {
                     title: '地区',
@@ -1542,9 +1514,9 @@ const AchievementList = Form.create()(React.createClass({
                 },
                 {
                     title: '意向服务',
-                    dataIndex: 'companyIntention',
-                    key: 'companyIntention',
-                    render: text => { return getCompanyIntention(text) }
+                    dataIndex: '_companyIntention',
+                    key: '_companyIntention',
+                    //render: text => { return getCompanyIntention(text) }
                 },
                  {
                     title: '最新跟进',
@@ -1674,11 +1646,11 @@ const AchievementList = Form.create()(React.createClass({
 													    />
 													   <Column
 													      title="跟进结果"
-													      dataIndex="查看更多"
-													      key="查看更多"	
+													      dataIndex="followResult"
+													      key="followResult"	
 													      render={(text, record) => (	
 													      	<div>
-														      	<a  href="#" onClick={this.setModal6VisibleOk}>查看更多</a>
+														      	<a  href="#" onClick={this.setModal6VisibleOk}>{text}</a>
 														      	<Modal				             
 												              footer=''
 														          title="更多详情"
@@ -1908,7 +1880,7 @@ const AchievementList = Form.create()(React.createClass({
 						                            {...formItemLayout}
 						                            label="最新客户状态" >
 						                            {getFieldDecorator('customerStatus', {
-						                            	rules: [{ required: true, message: '此项为必填项!' }],
+						                            	
 						                                initialValue: ""
 						                            })(
 						                                <Select placeholder="选择客户状态" style={{width:'200px'}}>
@@ -1929,7 +1901,7 @@ const AchievementList = Form.create()(React.createClass({
 							                            {...formItemLayout}
 							                            label="最新跟进状态" >
 							                            {getFieldDecorator('followSituation', {
-							                            	rules: [{ required: true, message: '此项为必填项!' }],
+							                            	
 							                                initialValue: ""
 							                            })(
 							                                <Select placeholder="选择跟进状态" style={{width:'200px'}}>
@@ -2021,24 +1993,19 @@ const AchievementList = Form.create()(React.createClass({
         this.state.customerStatuarr = theArr;
         this.state.auditStatusOption = auditArr;
         this.state.intentionalOption = intentionalArr;
-        this.state.newOption = newArr;
-        if (window.location.search) {
-            let theObj = getSearchUrl(window.location.search);
-            if (theObj.rid) {
-                theObj.id = theObj.rid;
-                if (theObj.rid != 'null') {
-                    this.tableRowClick(theObj);
-                };
-            };
-        };       
+        this.state.newOption = newArr;  
         this.loadData();        
     },
     tableRowClick(record, index) {
         this.state.RowData = record;
         this.setModal5VisibleOk(record);
         this.setState({
-        	rowId:record.id 
+        	rowId:record.id ,
+        	before_customerStatus:record._customerStatus,
+        	before_companyIntention:record._companyIntention,
+        	before_followSituation:record._followSituation
         })
+      console.log(record);
     },
    
     //删除功能,已经完成
@@ -2061,7 +2028,7 @@ const AchievementList = Form.create()(React.createClass({
         this.state.data = []
         this.setState({        	
             selectedRowKeys: [],
-            loading: deletedIds.length > 0
+            
         });
         $.ajax({
             method: "post",
@@ -2073,7 +2040,7 @@ const AchievementList = Form.create()(React.createClass({
                 beforeCustomerStatus:customerStatus,
                 beforeCompanyIntention:companyIntention,
                 beforeFollowSituation:followSituation,
-                adminName:adminName
+                beforeAdminName:adminName
             }
         }).done(function (data) {
             if (!data.error.length) {
@@ -2099,7 +2066,7 @@ const AchievementList = Form.create()(React.createClass({
         this.state.data = []
         this.setState({        	
             selectedRowKeys: [],
-            loading: deletedIds.length > 0
+            
         });
         $.ajax({
             method: "post",
@@ -2138,7 +2105,7 @@ const AchievementList = Form.create()(React.createClass({
         };       
         this.setState({
             selectedRowKeys: [],
-            loading: deletedIds.length > 0
+            
         });
         $.ajax({
             method: "post",
@@ -2178,7 +2145,7 @@ const AchievementList = Form.create()(React.createClass({
         };
     },
     search() {
-        this.loadData();
+        this.loadData1();
     },
     reset() {
     	this.state.companyName='';  
@@ -2278,7 +2245,7 @@ const AchievementList = Form.create()(React.createClass({
 					            	 columns={this.state.columnsman} 
 					            	 rowSelection={rowSelection} 
 					            	 dataSource={this.state.dataman}
-					            	 scroll={{ y: 300 }}/>
+					            	 />
 					           				            				        
 				                <FormItem wrapperCol={{ span: 12, offset: 12 }}>
                        		<Button className="set-submit" type="primary" htmlType="submit" id="change_keep" style={{marginLeft:"50px"}} onClick={this.changeAssigner }>保存</Button>

+ 5 - 40
js/component/manageCenter/customer/myClientDesc.jsx

@@ -796,7 +796,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     url: this.props.data.id ?  globalConfig.context + '/api/admin/customer/updCustomer' : globalConfig.context + '/api/admin/customer/addCustomer',
                     data: {
                         id: this.props.data.id, //编号
-                        customerTyp :values.customerTyp ,//客户信息  1                       
+                        customerType:values.customerTyp ,//客户信息  1                       
                        // createTime: values.createTime ? values.createTime.format('YYYY-MM-DD') : undefined,//时间 1\                    
                         companyIntention: this.props.data.companyIntention,
                         companyName: values.companyName,//公司名称  1
@@ -817,10 +817,9 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         qq: values.qq,//qq     1                 
                         depatrment: values.depatrment,//部门             1
                         email: values.email,//邮箱     1                   
-                       	shareTyp:0,
-                        followDates:(values.createTime ? values.createTime.format('YYYY-MM-DD'):undefined)+" "+(values.createTim ? values.createTim.format('YYYY:MM:DD'):undefined),//时间,
+                       	shareType:0,
+                        followDates:values.createTime ? values.createTime.format('YYYY-MM-DD'):undefined,//+" "+(values.createTim ? values.createTim.format('YYYY:MM:DD'):undefined),//时间,
                         primaryFlg:0,
-
                     }
                 }).done(function (data) {
                     this.state.auditStatus = 0;
@@ -1192,39 +1191,7 @@ const AchievementDetail = React.createClass({
             dataSource: [],
         };
     },
-    getTechBrodersList() {
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/audit/techBroders",
-            success: function (data) {
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    }
-                    return;
-                };
-                let _me = this, theArr = [];
-                for (var item in data.data) {
-                    theArr.push(
-                        <Select.Option key={item}>{data.data[item]}</Select.Option>
-                    )
-                };
-                this.setState({
-                    techBrodersOption: theArr,
-                    techBrodersObj: data.data
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
+    
     getTableList() {
         this.setState({
             loading: true
@@ -1285,9 +1252,7 @@ const AchievementDetail = React.createClass({
         });
         this.props.closeDesc(false, true);
     },
-    componentWillMount() {
-        this.getTechBrodersList();
-    },
+    
     componentWillReceiveProps(nextProps) {
         if (!this.state.visible && nextProps.showDesc) {
             this.state.tabsKey = "1";

+ 4 - 6
js/component/manageCenter/customer/publicCustomer.jsx

@@ -9,7 +9,7 @@ import { beforeUploadFile,getOrderStatus, getSearchUrl,getcustomerTyp,getcityArr
 
 //查询功能和初始列表
 const PublicCustomer = React.createClass({	
-    loadData(pageNumber, detailApiUrl) {    	
+    loadData(pageNo, detailApiUrl) {    	
         this.state.data = [];
         this.setState({
             loading: true
@@ -20,7 +20,7 @@ const PublicCustomer = React.createClass({
             crossDomain: false,          
             url:globalConfig.context +'/api/admin/customer/listPublicCustomer',
             data: {
-                pageNumber: pageNumber || 1,
+                pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,               
                 companyName: this.state.companyName, //名称1                
 				customerType: this.state.customerType, //客户类型1
@@ -63,8 +63,7 @@ const PublicCustomer = React.createClass({
                             companyIntention:thisdata.companyIntention,//意向服务                                                      
                         });
                     };
-                   
-                    this.state.pagination.current = data.data.pageNumber;
+                    this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.total = data.data.totalCount;
                 };               
                 this.setState({
@@ -293,8 +292,7 @@ const PublicCustomer = React.createClass({
         this.loadData();
     },
     reset() {
-    	this.state.companyName='';  
-    	this.state.customerType = undefined;
+    	this.state.companyName='';   
         this.state.id = undefined;
         this.state.shareType = undefined;
         this.state.companyIntention  = undefined;

+ 3 - 3
js/component/manageCenter/customer/teamCustomer.jsx

@@ -11,7 +11,7 @@ import { beforeUploadFile,getOrderStatus, getSearchUrl,getcustomerTyp,getcityArr
 
 //查询功能和初始列表
 const Teamcustomer = React.createClass({
-     loadData(pageNumber, detailApiUrl) {    	
+     loadData(pageNo, detailApiUrl) {    	
         this.state.data = [];
         this.setState({
             loading: true
@@ -22,7 +22,7 @@ const Teamcustomer = React.createClass({
             crossDomain: false,          
             url:globalConfig.context +'/api/admin/customer/listTeamCustomer',
             data: {
-                pageNumber: pageNumber || 1,
+                pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,               
                 companyName: this.state.companyName, //名称1                
 				        customerType: this.state.customerType, //客户类型1
@@ -66,7 +66,7 @@ const Teamcustomer = React.createClass({
                         });
                     };
                    
-                    this.state.pagination.current = data.data.pageNumber;
+                    this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.total = data.data.totalCount;
                 };               
                 this.setState({

+ 3 - 1
js/component/tools.js

@@ -681,7 +681,9 @@ module.exports = {
             cityArr.map(function (item) {
                 if (item.value == e) {
                     theType = item.key;
-                };
+                }else if(item.key == e){
+                	theType = item.value;
+                }
             });
             return theType;
         }