liting2017 7 éve%!(EXTRA string=óta)
szülő
commit
d867af2dcb

+ 1 - 1
js/component/dataDic.js

@@ -1175,7 +1175,7 @@ module.exports = {
             key: "个人客户"
         }, {
             value: '1',
-            key: "公司客户"
+            key: "机构单位"
         },
          {
             value: '2',

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

@@ -556,7 +556,7 @@ const PublicCustomer = React.createClass({
                             value={this.state.customerTypet }
                             onChange={(e) => { this.setState({ customerTypet : e }) }}>
                             <Select.Option value="0" >个人客户</Select.Option>
-                            <Select.Option value="1" >公司客户</Select.Option>
+                            <Select.Option value="1" >机构单位</Select.Option>
                             <Select.Option value="2" >团体单位</Select.Option>
                     </Select>     
                     <Select placeholder="意向服务"

+ 84 - 59
js/component/manageCenter/customer/myClient.jsx

@@ -149,7 +149,13 @@ const AchievementList = Form.create()(React.createClass({
                 },
                  success: function (data) {                	  
                 		let theArr = [];
-					    let thedata=data.data;					  
+					    let thedata=data.data;
+					    if (!thedata) {
+		                    if (data.error && data.error.length) {
+		                        message.warning(data.error[0].message);
+		                    };	
+		                    thedata = {}; 
+		                };   
 					    var email=[];
 					    var telNum=[];
 					    var watch=[];
@@ -402,6 +408,13 @@ const AchievementList = Form.create()(React.createClass({
     
     //删除历史记录
     onDelete(index){
+    	let deletedIds=this.state.rowId;                    
+        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
+            let rowItem = this.state.selectedRows[idx];                          
+            if (rowItem.id) {
+                deletedIds=rowItem.id;                                            
+            };            
+        };         
     	let deleteID=this.state.theFollowID[index];
     	$.ajax({
             method: "get",
@@ -414,8 +427,7 @@ const AchievementList = Form.create()(React.createClass({
         }).done(function (data) {
             if (!data.error.length) {
                 message.success('删除成功!');
-                this.setModal3Visiblecancel();
-                this.setModal3VisibleOk();
+                this.rescordlist(deletedIds) 
                 this.setState({
                     loading: false,
                 });
@@ -496,7 +508,7 @@ const AchievementList = Form.create()(React.createClass({
 	    });	 	   
 	},
 	setModal6Visiblecancel(e) {
-	    this.setState({ 
+	    this.setState({ 	    	
 	    	modal6Visible:false
 	    });	   	    
 	},	
@@ -506,16 +518,19 @@ const AchievementList = Form.create()(React.createClass({
 	    });	   	    
 	},
 	//点击名称时获取列表
-	  setModal5VisibleOk(e) {
-	  	this.setState({ modal5Visible:true });	//需要一个请求数据   	    
-	    this.Detailload(e.id);
-	  },
+    setModal5VisibleOk(e) {
+  	  this.setState({ modal5Visible:true });	//需要一个请求数据   	    
+      this.Detailload(e.id);
+    },
 	  //历史记录查看更多,还是历史记录接口
-	  	setModal6VisibleOk(e) {
-	    this.setState({ modal6Visible:true });	//需要一个请求数据    
-		},
-		getPictureUrl(e) {
-        this.setState({pictureUrl: e });
+  	setModal6VisibleOk(e) {    		
+        this.setState({ 
+        	followResults:this.state.datahistory[e].followResult,
+        	modal6Visible:true 
+        });	//需要一个请求数据
+	},
+	getPictureUrl(e) {
+    this.setState({pictureUrl: e });
     },
     //查看所有的联系人setModal7VisibleOk
 		contactList(index) {	 	
@@ -530,6 +545,12 @@ const AchievementList = Form.create()(React.createClass({
                  success: function (data) {                	  
                 		let theArr = [];
 					    let thedata=data.data;
+					    if (!thedata) {
+							 if (data.error && data.error.length) {
+								 message.warning(data.error[0].message);
+							};
+							thedata={}		                   
+						};
 					    let cidArr=[];
 					    for (let i = 0; i < data.data.length; i++) {
 					    	cidArr.push({
@@ -715,9 +736,9 @@ const AchievementList = Form.create()(React.createClass({
             let yearString = yearMonth.split('/').join('-');            
             let pjstringY='';                    	           
         	let days = new Date(this.state.creatMent); 
-            let hours = days.getHours().length==1?"0"+days.getHours():days.getHours();            
-            let minutes = days.getMinutes().length==1?"0"+days.getMinutes():days.getMinutes();            
-            let seconds = days.getSeconds().length==1?"0"+days.getSeconds():days.getSeconds();
+            let hours = days.getHours().length==1 ? "0"+days.getHours():days.getHours();            
+            let minutes = days.getMinutes().length==1 ? "0"+days.getMinutes():days.getMinutes();            
+            let seconds = days.getSeconds().length==1 ? "0"+days.getSeconds():days.getSeconds();
             if(this.state.creatMent.length==9){
             	pjstringY=this.state.creatMent
             }else{
@@ -1054,8 +1075,7 @@ const AchievementList = Form.create()(React.createClass({
 	    this.setState({
 	      visible: false,
 	    });
-	},
-	//点击公司名称,进行弹出框动作,同时进行资料详情查询
+	},	
     getInitialState() {
         return {        	
         	technicalPictureUrl: [],
@@ -1568,7 +1588,7 @@ const AchievementList = Form.create()(React.createClass({
             });
         }.bind(this));
     },
-    //转为公共客户功能
+    //详情tab切换数据处理
     callback(e){       	
     	if(e==1){     		
     		this.Detailload(this.state.rowId)
@@ -1752,7 +1772,7 @@ const AchievementList = Form.create()(React.createClass({
                             value={this.state.customerTypet }
                             onChange={(e) => { this.setState({ customerTypet : e }) }}>
                             <Select.Option value="0" >个人客户</Select.Option>
-                            <Select.Option value="1" >公司客户</Select.Option>
+                            <Select.Option value="1" >机构单位</Select.Option>
                             <Select.Option value="2" >团体单位</Select.Option>
                     </Select>     
                     <Select placeholder="意向服务"
@@ -1908,7 +1928,12 @@ const AchievementList = Form.create()(React.createClass({
 							        render={(text, record,index) => (
 							        	<a href="#" onClick={() => this.setModal4Visible(true,index)}>{text}</a>
 							        )}
-							      />													    
+							      />
+							       <Column
+							        title="客户状态"
+							        dataIndex="_customerStatus"
+							        key="_customerStatus"							       							        
+							      />
 							    <Column
 							      title="跟进人"
 							      dataIndex="adminName"
@@ -1928,9 +1953,9 @@ const AchievementList = Form.create()(React.createClass({
 							      title="跟进结果"
 							      dataIndex="followResult"
 							      key="followResult"	
-							      render={(text, record) => (	
-							      	<div>
-								      	<a  href="#" onClick={this.setModal6VisibleOk}>{text}</a>
+							      render={(text, record,index) => (	
+							      	  <div>
+								      	<a  href="#" onClick={()=>this.setModal6VisibleOk(index)}>查看跟进结果</a>
 								      </div>
 									)}												      
 							    />
@@ -2474,41 +2499,41 @@ const AchievementList = Form.create()(React.createClass({
 						              footer=''
 								          title="更多详情"
 								          visible={this.state.modal6Visible}
-							            onOk={this.setModal6Visiblecancel}
-							            onCancel={this.setModal6Visiblecancel}>
-								      		<Spin spinning={this.state.loading}>	
-								      			<div className="clearfix">
-				                       <FormItem 
-				                            labelCol={{ span: 5 }}
-           									wrapperCol={{ span: 18 }}
-				                            label="跟进结果" >
-				                            <span>{}</span>							                            
-				                        </FormItem>							                        
-				                    </div>
-								    <FormItem
-				                        labelCol={{ span: 5 }}
-				                        wrapperCol={{ span: 18 }}
-				                        label="附件" >
-				                        <div className="clearfix">
-				                            <Upload className="demandDetailShow-upload"
-				                                listType="picture-card"
-				                                fileList={this.state.attachment}
-				                                onPreview={(file) => {
-				                                    this.setState({
-				                                        previewImage: file.url || file.thumbUrl,
-				                                        previewVisible: true,
-				                                    });
-				                                }} >
-				                            </Upload>
-				                            <Modal maskClosable={false} footer={null}
-				                                visible={this.state.previewVisible}
-				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
-				                            </Modal>
-				                        </div>
-							              </FormItem>	
-							       			</Spin>
-								      	</Modal>
+							              onOk={this.setModal6Visiblecancel}
+							              onCancel={this.setModal6Visiblecancel}>
+								      	<Spin spinning={this.state.loading}>	
+								      		<div className="clearfix">
+							                    <FormItem 
+							                            labelCol={{ span: 5 }}
+			           									wrapperCol={{ span: 18 }}
+							                            label="跟进结果" >
+							                            <span>{this.state.followResults}</span>							                            
+							                    </FormItem>							                        
+							                </div>
+											<FormItem
+							                        labelCol={{ span: 5 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="附件" >
+							                        <div className="clearfix">
+							                            <Upload className="demandDetailShow-upload"
+							                                listType="picture-card"
+							                                fileList={this.state.attachment}
+							                                onPreview={(file) => {
+							                                    this.setState({
+							                                        previewImage: file.url || file.thumbUrl,
+							                                        previewVisible: true,
+							                                    });
+							                                }} >
+							                            </Upload>
+							                            <Modal maskClosable={false} footer={null}
+							                                visible={this.state.previewVisible}
+							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+							                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+							                            </Modal>
+							                        </div>
+										    </FormItem>	
+										</Spin>
+								    </Modal>
                 <TechAchievementDesc
                     data={this.state.RowData}
                     detailApiUrl={this.props['data-detailApiUrl']}

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

@@ -895,7 +895,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
 		                            })(
 		                                <Select placeholder="选择客户类型" style={{ width: 160 }} >
 		                                    <Select.Option value="0" >个人客户</Select.Option>
-		                                    <Select.Option value="1" >公司客户</Select.Option>
+		                                    <Select.Option value="1" >机构单位</Select.Option>
 		                                    <Select.Option value="2" >团体单位</Select.Option> 
 		                                </Select>
 		                                )}

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

@@ -91,7 +91,10 @@ const PublicCustomer = React.createClass({
                 beforeFollowSituation=rowItem.followSituation; 
                 beforeCustomerIntention=rowItem.companyIntention;
             };            
-        };  
+        }; 
+        this.setState({
+            selectedRowKeys:[],            
+        });
         this.setState({
             loading: true
         });