|  | @@ -77,15 +77,7 @@ const AchievementList = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |              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
 | 
	
		
			
				|  |  | -//            	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,//最新跟进进度		
 | 
	
		
			
				|  |  | +                pageSize: this.state.pagination.pageSize,                	
 | 
	
		
			
				|  |  |              },
 | 
	
		
			
				|  |  |              success: function (data) {            	
 | 
	
		
			
				|  |  |                  let theArr = [];
 | 
	
	
		
			
				|  | @@ -147,14 +139,14 @@ const AchievementList = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |              data: {
 | 
	
		
			
				|  |  |   				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,//最新跟进进度		
 | 
	
		
			
				|  |  | +                companyName: this.state.companyNamet, //名称1                
 | 
	
		
			
				|  |  | +				customerType: this.state.customerTypet, //客户类型1
 | 
	
		
			
				|  |  | +              	locationProvince:this.state.locationProvincet,//地区
 | 
	
		
			
				|  |  | +				customerStatus:this.state.customerStatust,//客户状态1
 | 
	
		
			
				|  |  | +				contactName:this.state.contactNamet,//联系人姓名1							
 | 
	
		
			
				|  |  | +				contactTel:this.state.contactTelt,//联系人手机
 | 
	
		
			
				|  |  | +				companyIntention:this.state.companyIntentiont,//意向服务
 | 
	
		
			
				|  |  | +                followSituation:this.state.followSituationt,//最新跟进进度		
 | 
	
		
			
				|  |  |              },
 | 
	
		
			
				|  |  |              success: function (data) {            	
 | 
	
		
			
				|  |  |                  let theArr = [];
 | 
	
	
		
			
				|  | @@ -339,10 +331,20 @@ const AchievementList = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |          this.getNewWoman(deletedIds);        
 | 
	
		
			
				|  |  |  	},
 | 
	
		
			
				|  |  |  	//点击出现函数
 | 
	
		
			
				|  |  | -	setModal2VisibleOk(e) {
 | 
	
		
			
				|  |  | +	setModal2VisibleOk(e) {		
 | 
	
		
			
				|  |  |  	    this.setState({ 
 | 
	
		
			
				|  |  | -	    	modal2Visible:true
 | 
	
		
			
				|  |  | -	    });  
 | 
	
		
			
				|  |  | +	    	modal2Visible:true	    	
 | 
	
		
			
				|  |  | +	    });	    
 | 
	
		
			
				|  |  | +    	this.state.hotst=undefined;
 | 
	
		
			
				|  |  | +    	this.state.hott=undefined;
 | 
	
		
			
				|  |  | +    	this.state.paymentIdt='';
 | 
	
		
			
				|  |  | +    	this.state.entIdt='';
 | 
	
		
			
				|  |  | +    	this.state.payt='';
 | 
	
		
			
				|  |  | +    	this.state.paymt='';
 | 
	
		
			
				|  |  | +    	this.state.paytIdtt='';
 | 
	
		
			
				|  |  | +    	this.state.paentIdt='';
 | 
	
		
			
				|  |  | +    	this.state.payIdt='';
 | 
	
		
			
				|  |  | +    	this.state.emailst='';
 | 
	
		
			
				|  |  |  	},
 | 
	
		
			
				|  |  |  	//点击消失函数
 | 
	
		
			
				|  |  |  	setModal2Visiblecancel(e) {
 | 
	
	
		
			
				|  | @@ -897,16 +899,16 @@ const AchievementList = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |                      url: globalConfig.context + '/api/admin/customer/addContacter',
 | 
	
		
			
				|  |  |                      data: {
 | 
	
		
			
				|  |  |                          cid: deletedIds,//编号id
 | 
	
		
			
				|  |  | -                        sex:this.state.hot,//性别
 | 
	
		
			
				|  |  | -                        primaryFlg:this.state.hots,//是否是主要联系人
 | 
	
		
			
				|  |  | -                        name:this.state.paymentId,//联系人姓名
 | 
	
		
			
				|  |  | -                        mobile:this.state.paym,//座机
 | 
	
		
			
				|  |  | -                        telNum:this.state.pay,//电话
 | 
	
		
			
				|  |  | -                        qq:this.state.entId,//qq
 | 
	
		
			
				|  |  | -                       	wechat:this.state.payId,//微信
 | 
	
		
			
				|  |  | -                       	customerPosition:this.state.paentId,//职位
 | 
	
		
			
				|  |  | -                       	depatrment:this.state.paytId,//部门
 | 
	
		
			
				|  |  | -                       	email:this.state.emails,//邮箱                  
 | 
	
		
			
				|  |  | +                        sex:this.state.hott,//性别
 | 
	
		
			
				|  |  | +                        primaryFlg:this.state.hotst,//是否是主要联系人
 | 
	
		
			
				|  |  | +                        name:this.state.paymentIdt,//联系人姓名
 | 
	
		
			
				|  |  | +                        mobile:this.state.paymt,//座机
 | 
	
		
			
				|  |  | +                        telNum:this.state.payt,//电话
 | 
	
		
			
				|  |  | +                        qq:this.state.entIdt,//qq
 | 
	
		
			
				|  |  | +                       	wechat:this.state.payIdtt,//微信
 | 
	
		
			
				|  |  | +                       	customerPosition:this.state.paentIdt,//职位
 | 
	
		
			
				|  |  | +                       	depatrment:this.state.paytIdt,//部门
 | 
	
		
			
				|  |  | +                       	email:this.state.emailst,//邮箱                  
 | 
	
		
			
				|  |  |                      }
 | 
	
		
			
				|  |  |                  }).done(function (data) {                	
 | 
	
		
			
				|  |  |                      this.setState({
 | 
	
	
		
			
				|  | @@ -918,6 +920,7 @@ const AchievementList = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |                      } else {
 | 
	
		
			
				|  |  |                          message.warning(data.error[0].message);
 | 
	
		
			
				|  |  |                      }
 | 
	
		
			
				|  |  | +                    this.setModal1VisibleOk();
 | 
	
		
			
				|  |  |                      //this.loadData();
 | 
	
		
			
				|  |  |                  }.bind(this));
 | 
	
		
			
				|  |  |              }
 | 
	
	
		
			
				|  | @@ -1755,8 +1758,8 @@ const AchievementList = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  								                        labelCol={{ span: 4 }}
 | 
	
		
			
				|  |  |  								                        wrapperCol={{ span: 14 }}
 | 
	
		
			
				|  |  |  								                        label="是否是主要联系人:"  style={{marginRight:'10px'}}>
 | 
	
		
			
				|  |  | -								                        <Radio.Group value={this.state.hots} onChange={(e) => {
 | 
	
		
			
				|  |  | -										                    this.setState({ hots: e.target.value })
 | 
	
		
			
				|  |  | +								                        <Radio.Group value={this.state.hotst} onChange={(e) => {
 | 
	
		
			
				|  |  | +										                    this.setState({ hotst: e.target.value })
 | 
	
		
			
				|  |  |  										                    }}>
 | 
	
		
			
				|  |  |  										                        <Radio value={0}>是</Radio>
 | 
	
		
			
				|  |  |  										                        <Radio value={1}>否</Radio>
 | 
	
	
		
			
				|  | @@ -1766,8 +1769,8 @@ const AchievementList = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  									                        labelCol={{ span: 4 }}
 | 
	
		
			
				|  |  |  									                        wrapperCol={{ span: 14 }}
 | 
	
		
			
				|  |  |  									                        label="性别:"  style={{marginRight:'10px',marginTop: '-15px'}}>
 | 
	
		
			
				|  |  | -									                        <Radio.Group value={this.state.hot} onChange={(e) => {
 | 
	
		
			
				|  |  | -											                    this.setState({ hot: e.target.value })
 | 
	
		
			
				|  |  | +									                        <Radio.Group value={this.state.hott} onChange={(e) => {
 | 
	
		
			
				|  |  | +											                    this.setState({ hott: e.target.value })
 | 
	
		
			
				|  |  |  											                    }}>
 | 
	
		
			
				|  |  |  											                        <Radio value={0}>男</Radio>
 | 
	
		
			
				|  |  |  											                        <Radio value={1}>女</Radio>
 | 
	
	
		
			
				|  | @@ -1777,50 +1780,50 @@ const AchievementList = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  											        <Row style={{ paddingLeft:'50px' }}>
 | 
	
		
			
				|  |  |  								                        <Col span={2}>姓名:</Col>
 | 
	
		
			
				|  |  |  						                                <Col span={8}>
 | 
	
		
			
				|  |  | -						                                    <Input value={this.state.paymentId}
 | 
	
		
			
				|  |  | -						                                        onChange={(e) => { this.setState({ paymentId: e.target.value }) }} />
 | 
	
		
			
				|  |  | +						                                    <Input value={this.state.paymentIdt}
 | 
	
		
			
				|  |  | +						                                        onChange={(e) => { this.setState({ paymentIdt: e.target.value }) }} />
 | 
	
		
			
				|  |  |  						                                </Col>
 | 
	
		
			
				|  |  |  						                                <Col span={2} style={{ marginLeft: '50px' }}>QQ号:</Col>
 | 
	
		
			
				|  |  |  						                                <Col span={8}>
 | 
	
		
			
				|  |  | -						                                    <Input value={this.state.entId}
 | 
	
		
			
				|  |  | -						                                        onChange={(e) => { this.setState({ entId: e.target.value }) }} />
 | 
	
		
			
				|  |  | +						                                    <Input value={this.state.entIdt}
 | 
	
		
			
				|  |  | +						                                        onChange={(e) => { this.setState({ entIdt: e.target.value }) }} />
 | 
	
		
			
				|  |  |  						                                </Col>
 | 
	
		
			
				|  |  |  					                                </Row>
 | 
	
		
			
				|  |  |  								                    <Row style={{ marginTop: '20px',paddingLeft:'50px' }}>
 | 
	
		
			
				|  |  |  								                        <Col span={2}>手机号:</Col>
 | 
	
		
			
				|  |  |  						                                <Col span={8}>
 | 
	
		
			
				|  |  | -						                                    <Input value={this.state.pay}
 | 
	
		
			
				|  |  | -						                                        onChange={(e) => { this.setState({ pay: e.target.value }) }} />
 | 
	
		
			
				|  |  | +						                                    <Input value={this.state.payt}
 | 
	
		
			
				|  |  | +						                                        onChange={(e) => { this.setState({ payt: e.target.value }) }} />
 | 
	
		
			
				|  |  |  						                                </Col>
 | 
	
		
			
				|  |  |  						                                <Col span={2} style={{ marginLeft: '50px' }}>座机号:</Col>
 | 
	
		
			
				|  |  |  						                                <Col span={8}>
 | 
	
		
			
				|  |  | -						                                    <Input value={this.state.paym}
 | 
	
		
			
				|  |  | -						                                        onChange={(e) => { this.setState({ paym: e.target.value }) }} />
 | 
	
		
			
				|  |  | +						                                    <Input value={this.state.paymt}
 | 
	
		
			
				|  |  | +						                                        onChange={(e) => { this.setState({ paymt: e.target.value }) }} />
 | 
	
		
			
				|  |  |  						                                </Col>
 | 
	
		
			
				|  |  |  					                                </Row>
 | 
	
		
			
				|  |  |  	
 | 
	
		
			
				|  |  |  					                                <Row style={{ marginTop: '20px' ,paddingLeft:'50px'}}>
 | 
	
		
			
				|  |  |  								                        		<Col span={2}>部门:</Col>
 | 
	
		
			
				|  |  |  						                                <Col span={8}>
 | 
	
		
			
				|  |  | -						                                    <Input value={this.state.paytId}
 | 
	
		
			
				|  |  | -						                                        onChange={(e) => { this.setState({ paytId: e.target.value }) }} />
 | 
	
		
			
				|  |  | +						                                    <Input value={this.state.paytIdtt}
 | 
	
		
			
				|  |  | +						                                        onChange={(e) => { this.setState({ paytIdtt: e.target.value }) }} />
 | 
	
		
			
				|  |  |  						                                </Col>
 | 
	
		
			
				|  |  |  						                                <Col span={2} style={{ marginLeft: '50px' }}>职位:</Col>
 | 
	
		
			
				|  |  |  						                                <Col span={8}>
 | 
	
		
			
				|  |  | -						                                    <Input value={this.state.paentId}
 | 
	
		
			
				|  |  | -						                                        onChange={(e) => { this.setState({ paentId: e.target.value }) }} />
 | 
	
		
			
				|  |  | +						                                    <Input value={this.state.paentIdt}
 | 
	
		
			
				|  |  | +						                                        onChange={(e) => { this.setState({ paentIdt: e.target.value }) }} />
 | 
	
		
			
				|  |  |  						                                </Col>
 | 
	
		
			
				|  |  |  					                                </Row>	
 | 
	
		
			
				|  |  |  					                                <Row style={{ marginTop: '20px',paddingLeft:'50px' }}>						                       
 | 
	
		
			
				|  |  |  						                                 <Col span={2}>微信号:</Col>
 | 
	
		
			
				|  |  |  						                                	<Col span={8}>
 | 
	
		
			
				|  |  | -						                                    <Input value={this.state.payId}
 | 
	
		
			
				|  |  | -						                                        onChange={(e) => { this.setState({ payId: e.target.value }) }} />
 | 
	
		
			
				|  |  | +						                                    <Input value={this.state.payIdt}
 | 
	
		
			
				|  |  | +						                                        onChange={(e) => { this.setState({ payIdt: e.target.value }) }} />
 | 
	
		
			
				|  |  |  						                                </Col>
 | 
	
		
			
				|  |  |  						                                <Col span={2} style={{ marginLeft: '50px' }}>邮箱:</Col>
 | 
	
		
			
				|  |  |  						                                <Col span={8}>
 | 
	
		
			
				|  |  | -						                                    <Input value={this.state.emails}
 | 
	
		
			
				|  |  | -						                                        onChange={(e) => { this.setState({ emails: e.target.value }) }} />
 | 
	
		
			
				|  |  | +						                                    <Input value={this.state.emailst}
 | 
	
		
			
				|  |  | +						                                        onChange={(e) => { this.setState({ emailst: e.target.value }) }} />
 | 
	
		
			
				|  |  |  						                                </Col>
 | 
	
		
			
				|  |  |  					                                </Row>
 | 
	
		
			
				|  |  |  					                                <Row style={{ marginTop: '20px',paddingLeft:'50px' ,marginBottom:'50px'}}>
 | 
	
	
		
			
				|  | @@ -2145,18 +2148,18 @@ const AchievementList = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |          this.loadData1();
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      reset() {
 | 
	
		
			
				|  |  | -    	this.state.companyName='';  
 | 
	
		
			
				|  |  | -    	this.state.customerType = undefined;
 | 
	
		
			
				|  |  | +    	this.state.companyNamet='';  
 | 
	
		
			
				|  |  | +    	this.state.customerTypet = undefined;
 | 
	
		
			
				|  |  |          this.state.id = undefined;
 | 
	
		
			
				|  |  | -        this.state.shareType = undefined;
 | 
	
		
			
				|  |  | -        this.state.companyIntention  = undefined;
 | 
	
		
			
				|  |  | -        this.state.followSituation  = undefined;
 | 
	
		
			
				|  |  | -        this.state.locationProvince  = undefined;
 | 
	
		
			
				|  |  | -        this.state.customerStatus  = undefined;
 | 
	
		
			
				|  |  | -        this.state.contactName   = undefined;
 | 
	
		
			
				|  |  | -        this.state.contactTel = undefined;
 | 
	
		
			
				|  |  | -        this.state.contactName = undefined;  
 | 
	
		
			
				|  |  | -        this.state.releaseDate = [];
 | 
	
		
			
				|  |  | +        this.state.shareTypet = undefined;
 | 
	
		
			
				|  |  | +        this.state.companyIntentiont  = undefined;
 | 
	
		
			
				|  |  | +        this.state.followSituationt  = undefined;
 | 
	
		
			
				|  |  | +        this.state.locationProvincet  = undefined;
 | 
	
		
			
				|  |  | +        this.state.customerStatust  = undefined;
 | 
	
		
			
				|  |  | +        this.state.contactNamet   = undefined;
 | 
	
		
			
				|  |  | +        this.state.contactTelt = undefined;
 | 
	
		
			
				|  |  | +        this.state.contactNamet = undefined;  
 | 
	
		
			
				|  |  | +        this.state.releaseDatet = [];
 | 
	
		
			
				|  |  |          this.loadData(); 
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      searchSwitch() {
 | 
	
	
		
			
				|  | @@ -2193,35 +2196,35 @@ const AchievementList = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |                  </div>
 | 
	
		
			
				|  |  |                  <div className="user-search">                    
 | 
	
		
			
				|  |  |                      <Input placeholder="公司名称"
 | 
	
		
			
				|  |  | -                        value={this.state.companyName}
 | 
	
		
			
				|  |  | -                        onChange={(e) => { this.setState({ companyName: e.target.value }); }} /> 
 | 
	
		
			
				|  |  | +                        value={this.state.companyNamet}
 | 
	
		
			
				|  |  | +                        onChange={(e) => { this.setState({ companyNamet: e.target.value }); }} /> 
 | 
	
		
			
				|  |  |                      <Select placeholder="客户类型" style={{ width: 120 }}
 | 
	
		
			
				|  |  | -                            value={this.state.customerType }
 | 
	
		
			
				|  |  | -                            onChange={(e) => { this.setState({ customerType : e }) }}>
 | 
	
		
			
				|  |  | +                            value={this.state.customerTypet }
 | 
	
		
			
				|  |  | +                            onChange={(e) => { this.setState({ customerTypet : e }) }}>
 | 
	
		
			
				|  |  |                              <Select.Option value="0" >个人客户</Select.Option>
 | 
	
		
			
				|  |  |                              <Select.Option value="1" >公司客户</Select.Option>
 | 
	
		
			
				|  |  |                      </Select>     
 | 
	
		
			
				|  |  |                      <Select placeholder="意向服务"
 | 
	
		
			
				|  |  |                              style={{ width: 160 }}
 | 
	
		
			
				|  |  | -                            value={this.state.companyIntention}
 | 
	
		
			
				|  |  | -                            onChange={(e) => { this.setState({ companyIntention: e }) }}>
 | 
	
		
			
				|  |  | +                            value={this.state.companyIntentiont}
 | 
	
		
			
				|  |  | +                            onChange={(e) => { this.setState({ companyIntentiont: e }) }}>
 | 
	
		
			
				|  |  |                              {this.state.intentionalOption}
 | 
	
		
			
				|  |  |                      </Select>
 | 
	
		
			
				|  |  |                      <Select placeholder="跟进进度"
 | 
	
		
			
				|  |  |                              style={{ width: 160 }}
 | 
	
		
			
				|  |  | -                            value={this.state.followSituation}
 | 
	
		
			
				|  |  | -                            onChange={(e) => { this.setState({ followSituation: e }) }}>
 | 
	
		
			
				|  |  | +                            value={this.state.followSituationt}
 | 
	
		
			
				|  |  | +                            onChange={(e) => { this.setState({ followSituationt: e }) }}>
 | 
	
		
			
				|  |  |                              {this.state.newOption}
 | 
	
		
			
				|  |  |                      </Select>
 | 
	
		
			
				|  |  |                      <Select placeholder="地区"
 | 
	
		
			
				|  |  |                              style={{ width: 160 }}
 | 
	
		
			
				|  |  | -                            value={this.state.locationProvince}
 | 
	
		
			
				|  |  | -                            onChange={(e) => { this.setState({ locationProvince: e }) }}>
 | 
	
		
			
				|  |  | +                            value={this.state.locationProvincet}
 | 
	
		
			
				|  |  | +                            onChange={(e) => { this.setState({ locationProvincet: e }) }}>
 | 
	
		
			
				|  |  |                              {this.state.auditStatusOption}
 | 
	
		
			
				|  |  |                      </Select>
 | 
	
		
			
				|  |  |                      <Select placeholder="客户状态" style={{ width: 120 }}
 | 
	
		
			
				|  |  | -                            value={this.state.customerStatus}
 | 
	
		
			
				|  |  | -                            onChange={(e) => { this.setState({customerStatus: e }) }}>                           
 | 
	
		
			
				|  |  | +                            value={this.state.customerStatust}
 | 
	
		
			
				|  |  | +                            onChange={(e) => { this.setState({customerStatust: e }) }}>                           
 | 
	
		
			
				|  |  |                              {this.state.customerStatuarr}
 | 
	
		
			
				|  |  |                      </Select>
 | 
	
		
			
				|  |  |                      <Button type="primary" onClick={this.search}>搜索</Button>
 | 
	
	
		
			
				|  | @@ -2259,11 +2262,11 @@ const AchievementList = Form.create()(React.createClass({
 | 
	
		
			
				|  |  |                      <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
 | 
	
		
			
				|  |  |                      <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
 | 
	
		
			
				|  |  |  		                <Input placeholder="联系人姓名" style={{width:'140px',marginRight:'10px'}}
 | 
	
		
			
				|  |  | -		                    value={this.state.contactName}
 | 
	
		
			
				|  |  | -		                    onChange={(e) => { this.setState({ contactName: e.target.value }); }} /> 
 | 
	
		
			
				|  |  | +		                    value={this.state.contactNamet}
 | 
	
		
			
				|  |  | +		                    onChange={(e) => { this.setState({ contactNamet: e.target.value }); }} /> 
 | 
	
		
			
				|  |  |  		                <Input placeholder="手机号码" style={{width:'140px',marginRight:'10px'}}
 | 
	
		
			
				|  |  | -		                    value={this.state.contactTel }
 | 
	
		
			
				|  |  | -		                    onChange={(e) => { this.setState({ contactTel: e.target.value }); }} />
 | 
	
		
			
				|  |  | +		                    value={this.state.contactTelt }
 | 
	
		
			
				|  |  | +		                    onChange={(e) => { this.setState({ contactTelt: e.target.value }); }} />
 | 
	
		
			
				|  |  |  		            </div>        
 | 
	
		
			
				|  |  |                  </div>                                               
 | 
	
		
			
				|  |  |                  <div className="patent-table">
 |