|  | @@ -32,7 +32,13 @@ const VisitDetail = React.createClass({
 | 
												
													
														
															|  |  					dataIndex: 'followSituation',
 |  |  					dataIndex: 'followSituation',
 | 
												
													
														
															|  |  					key: 'followSituation',
 |  |  					key: 'followSituation',
 | 
												
													
														
															|  |  					render: (text, record, index) => {
 |  |  					render: (text, record, index) => {
 | 
												
													
														
															|  | -						return  <span>{getfllowSituation(text)}</span>
 |  | 
 | 
												
													
														
															|  | 
 |  | +						return <Select  placeholder="选择最新进度" value={record.followSituation}  onChange={(e) => { record.followSituation = e; this.setState({ data: this.state.data }); }}>
 | 
												
													
														
															|  | 
 |  | +                                    {
 | 
												
													
														
															|  | 
 |  | +                                        newFollow.map(function (item) {
 | 
												
													
														
															|  | 
 |  | +                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 | 
												
													
														
															|  | 
 |  | +                                        })
 | 
												
													
														
															|  | 
 |  | +                                    }
 | 
												
													
														
															|  | 
 |  | +                               </Select>
 | 
												
													
														
															|  |  					}
 |  |  					}
 | 
												
													
														
															|  |  				}, {
 |  |  				}, {
 | 
												
													
														
															|  |  					title: '最新状态',
 |  |  					title: '最新状态',
 | 
												
											
												
													
														
															|  | @@ -40,7 +46,13 @@ const VisitDetail = React.createClass({
 | 
												
													
														
															|  |  					dataIndex: 'customerStatus',
 |  |  					dataIndex: 'customerStatus',
 | 
												
													
														
															|  |  					key: 'customerStatus',
 |  |  					key: 'customerStatus',
 | 
												
													
														
															|  |  					render: (text, record, index) => {
 |  |  					render: (text, record, index) => {
 | 
												
													
														
															|  | -						return <span>{getcustomerStatue(text)}</span>
 |  | 
 | 
												
													
														
															|  | 
 |  | +						return <Select value={record.customerStatus} placeholder="选择最新状态" onChange={(e) => { record.customerStatus = e; this.setState({ data: this.state.data }); }}>
 | 
												
													
														
															|  | 
 |  | +                                    {
 | 
												
													
														
															|  | 
 |  | +                                        customerStatus.map(function (item) {
 | 
												
													
														
															|  | 
 |  | +                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 | 
												
													
														
															|  | 
 |  | +                                        })
 | 
												
													
														
															|  | 
 |  | +                                    }
 | 
												
													
														
															|  | 
 |  | +                               </Select>
 | 
												
													
														
															|  |  					}
 |  |  					}
 | 
												
													
														
															|  |  				}, {
 |  |  				}, {
 | 
												
													
														
															|  |  					title: '跟进说明',
 |  |  					title: '跟进说明',
 | 
												
											
												
													
														
															|  | @@ -48,23 +60,9 @@ const VisitDetail = React.createClass({
 | 
												
													
														
															|  |  					dataIndex: 'remarks',
 |  |  					dataIndex: 'remarks',
 | 
												
													
														
															|  |  					key: 'remarks',
 |  |  					key: 'remarks',
 | 
												
													
														
															|  |  					render: (text, record, index) => {
 |  |  					render: (text, record, index) => {
 | 
												
													
														
															|  | -						return(
 |  | 
 | 
												
													
														
															|  | -							<div>
 |  | 
 | 
												
													
														
															|  | -								<span title={text}>{text&&text.length>14?(text.substr(0,14)+'…'):text}</span>
 |  | 
 | 
												
													
														
															|  | -							</div>
 |  | 
 | 
												
													
														
															|  | -							)
 |  | 
 | 
												
													
														
															|  | -					}
 |  | 
 | 
												
													
														
															|  | -				}, {
 |  | 
 | 
												
													
														
															|  | -					title: '操作',
 |  | 
 | 
												
													
														
															|  | -					width:120,
 |  | 
 | 
												
													
														
															|  | -					dataIndex: 'rrr',
 |  | 
 | 
												
													
														
															|  | -					key: 'rrr',
 |  | 
 | 
												
													
														
															|  | -					render: (text, record, index) => {
 |  | 
 | 
												
													
														
															|  | -						return <div>
 |  | 
 | 
												
													
														
															|  | -                            <Popconfirm title="是否删除?" onConfirm={(e)=>{this.intentionDelet(record,index)}} okText="删除" cancelText="不删除">
 |  | 
 | 
												
													
														
															|  | -							    <Button style={{marginRight:'10px',color:'#ffffff',background:'#f00',border:'none'}}>删除</Button>
 |  | 
 | 
												
													
														
															|  | -							</Popconfirm>
 |  | 
 | 
												
													
														
															|  | -                        </div>
 |  | 
 | 
												
													
														
															|  | 
 |  | +						return <Input value={record.remarks} placeholder="跟进说明" 
 | 
												
													
														
															|  | 
 |  | +	                             onChange={(e) => { record.remarks = e.target.value; this.setState({ data: this.state.data }); }}
 | 
												
													
														
															|  | 
 |  | +	                             />
 | 
												
													
														
															|  |  					}
 |  |  					}
 | 
												
													
														
															|  |  				}
 |  |  				}
 | 
												
													
														
															|  |  			],
 |  |  			],
 | 
												
											
												
													
														
															|  | @@ -100,8 +98,8 @@ const VisitDetail = React.createClass({
 | 
												
													
														
															|  |  						businessName:thisdata.businessProjectId,
 |  |  						businessName:thisdata.businessProjectId,
 | 
												
													
														
															|  |  						businessVarietiesName:thisdata.businessVarietiesName,
 |  |  						businessVarietiesName:thisdata.businessVarietiesName,
 | 
												
													
														
															|  |  						businessProjectName:thisdata.businessProjectName,
 |  |  						businessProjectName:thisdata.businessProjectName,
 | 
												
													
														
															|  | -						followSituation: String(thisdata.followSituation),
 |  | 
 | 
												
													
														
															|  | -						customerStatus: String(thisdata.customerStatus),
 |  | 
 | 
												
													
														
															|  | 
 |  | +						followSituation: thisdata.followSituation==null?undefined : String(thisdata.followSituation),
 | 
												
													
														
															|  | 
 |  | +						customerStatus: thisdata.customerStatus==null?undefined : String(thisdata.customerStatus),
 | 
												
													
														
															|  |  						remarks: thisdata.remarks,
 |  |  						remarks: thisdata.remarks,
 | 
												
													
														
															|  |  					});
 |  |  					});
 | 
												
													
														
															|  |  				};
 |  |  				};
 |