dengzhiguo 7 gadi atpakaļ
vecāks
revīzija
80f834b106

+ 9 - 7
js/component/manageCenter/customer/myClient.jsx

@@ -322,7 +322,8 @@ const AchievementList = Form.create()(React.createClass({
 	setModal1Visiblecancel(e) {
 	    this.setState({ 
 	    	modal1Visible:false
-	    });	   	    
+	    });	
+	    this.reset();
 	},
     //点击添加跟进记录,点击最新跟进下的+号,将会查询出很多数据,展示在列表里面,
   	setModal1VisibleOk(e) {
@@ -423,7 +424,6 @@ const AchievementList = Form.create()(React.createClass({
     
     //删除历史记录
     onDelete(index){
-    	
     	let deleteID=this.state.theFollowID[index];
     	$.ajax({
             method: "get",
@@ -436,6 +436,8 @@ const AchievementList = Form.create()(React.createClass({
         }).done(function (data) {
             if (!data.error.length) {
                 message.success('删除成功!');
+                this.setModal3Visiblecancel();
+                this.setModal3VisibleOk();
                 this.setState({
                     loading: false,
                 });
@@ -743,7 +745,7 @@ const AchievementList = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url:globalConfig.context + '/api/admin/customer/addFollow',
+                    url:globalConfig.context + '/api/admin/customer/addFollowRecord',
                     data: {
                         id: deletedIds,//编号id  
                         cuid:this.state.kid,//联系人ID
@@ -1378,7 +1380,7 @@ const AchievementList = Form.create()(React.createClass({
 						          visible={this.state.modal8Visible}
 						            onOk={this.setModal8Visiblecancel}
 						            onCancel={this.setModal8Visiblecancel}>
-						            <div>
+						            <div style={{paddingRight:"50px"}}>
 				                        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="姓名" >
@@ -1479,7 +1481,7 @@ const AchievementList = Form.create()(React.createClass({
 					                        </FormItem>												                                  
 										        	</div>
 										        	<FormItem wrapperCol={{ span: 12, offset: 4 }}>
-							                        <Button className="set-submit" type="primary" htmlType="submit" onClick={this.changefollow}>保存</Button>																	                     
+							                        <Button className="set-submit" type="primary" htmlType="submit" onClick={this.changefollow} style={{marginRight:"50px"}}>保存</Button>																	                     
 							                        <Button className="set-submit" type="ghost" onClick={this.setModal8Visiblecancel}>取消</Button>																		                                                          							             														 
 							                </FormItem>	
 	        						</Modal>
@@ -1698,7 +1700,7 @@ const AchievementList = Form.create()(React.createClass({
 													      key="del"
 													      render={(text, record, index) => (													       													          
 													            <Popconfirm title="是否删除?" onConfirm={() => this.onDelete(index)}>
-													              <a href="#" style={{color:"#f00"}}>Delete</a>
+													              <a href="#" style={{color:"#f00"}}>删除</a>
 													            </Popconfirm>													         													       
 													      )}
 													    />
@@ -2190,7 +2192,7 @@ const AchievementList = Form.create()(React.createClass({
             <div className="user-content" >
                 <div className="content-title">                  
                     <span>客户管理</span>
-                    <div className="patent-addNew clearfix">                                             
+                    <div className="patent-addNew clearfix"  style={{marginRight:"22px"}}>                                             
                         <Button type="primary" className="addButton" onClick={this.addClick}>新建客户<Icon type="plus" /></Button>                        
                     </div>
                 </div>

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

@@ -908,7 +908,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
 	                            label="" >
 	                                                        
 	                    </FormItem> */}
-	                        <FormItem className="half-item"
+	                      {/*    <FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="跟单人" >
 	                            {getFieldDecorator('ownerId', {
@@ -916,7 +916,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
 	                            })(
 	                                <Input />
 	                                )}
-	                        </FormItem>
+	                        </FormItem> */}
                         </div>
                         <div className="clearfix" style={{marginLeft:'40px',marginBottom:'20px',color:'#000000'}}>公司资料:</div>	                    		                           	                                                       	                                               
                         <div>

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

@@ -96,7 +96,7 @@ const PublicCustomer = React.createClass({
             loading: true
         });      
         $.ajax({
-            method: "POST",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + '/api/admin/customer/receivePublicCustomer',

+ 1 - 1
js/component/manageCenter/topTab.jsx

@@ -494,7 +494,7 @@ const TopTab = React.createClass({
                 <div className="acc-top-tab">
                     <Row>
                         <Col style={{ display: window.showUserManage ? 'block' : 'none' }} className={this.props.active === 'userManage' ? 'active' : ''} span={2}><a href={globalConfig.context + "/admin/userManage.html"}>用户管理</a></Col>
-                        <Col style={{ display: window.showCustomer ? 'block' : 'none' }} className={this.props.active === 'myClient' ? 'active' : ''} span={2}><a href={globalConfig.context + "/admin/customer.html"}>客户管理</a></Col>
+                        <Col style={{ display: window.showCustomer ? 'block' : 'none' }} className={this.props.active === 'myClient' ? 'active' : ''} span={2}><a href={globalConfig.context + "/admin/customer.html" }>客户管理</a></Col>
                         <Col style={{ display: window.showServices ? 'block' : 'none' }} className={this.props.active === 'services' ? 'active' : ''} span={2}><a href={globalConfig.context + "/admin/servicesManage/contract.html"}>科技服务管理</a></Col>
                         <Col style={{ display: window.showAchievement ? 'block' : 'none' }} className={this.props.active === 'achievement' ? 'active' : ''} span={2}><a href={globalConfig.context + "/admin/achievement.html"}>科技成果管理</a></Col>                       
                         <Col style={{ display: window.showDemand ? 'block' : 'none' }} className={this.props.active === 'demand' ? 'active' : ''} span={2}><a href={globalConfig.context + "/admin/demand.html"}>科技需求管理</a></Col>