liting2017 před 6 roky
rodič
revize
cc780c18e0

+ 20 - 22
js/component/manageCenter/customer/NEW/signCustomer/followDetail.jsx

@@ -33,7 +33,13 @@ const FollowDetail = React.createClass({
 					dataIndex: 'followSituation',
 					key: 'followSituation',
 					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: '最新状态',
@@ -41,7 +47,13 @@ const FollowDetail = React.createClass({
 					dataIndex: 'customerStatus',
 					key: 'customerStatus',
 					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: '跟进说明',
@@ -49,23 +61,9 @@ const FollowDetail = React.createClass({
 					dataIndex: 'remarks',
 					key: 'remarks',
 					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 }); }}
+	                             />
 					}
 				}
 			],
@@ -183,9 +181,9 @@ const FollowDetail = React.createClass({
 						businessName:thisdata.businessProjectId,
 						businessVarietiesName:thisdata.businessVarietiesName,
 						businessProjectName:thisdata.businessProjectName,
-						followSituation: String(thisdata.followSituation),
-						customerStatus: String(thisdata.customerStatus),
-						remarks: thisdata.remarks,
+						followSituation: thisdata.followSituation==null?undefined : String(thisdata.followSituation),
+						customerStatus: thisdata.customerStatus==null?undefined : String(thisdata.customerStatus),
+						remarks: thisdata.remarks
 					});
 				};
 				this.setState({

+ 0 - 1
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/basic.jsx

@@ -7,7 +7,6 @@ import { citySelect, provinceList, areaSelect ,getProvince} from '@/NewDicProvin
 import { socialAttribute, industry, newFollow, auditStatusL, lvl, currentMember, cityArr, statuslist, customerStatus, intentionalService, sex } from '@/dataDic.js';
 import { getCompanyIntention, splitUrl, getIndustry, getStatuslist, getAuditStatus, getContactType, getSocialAttribute, getfllowSituation, beforeUploadFile, getWhether, getcityArr, getcustomerStatue, getfllowSituationOn, getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '@/tools.js';
 const FormItem = Form.Item;
-
 const Basic = React.createClass({
 	getInitialState() {
 		return {

+ 3 - 3
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/basicPerson.jsx

@@ -40,9 +40,9 @@ const Basic = React.createClass({
 					};
 					thisData = {};
 				};
-				let ProvinceS = thisData.locationProvince, //getprovince
-				    citys = thisData.locationCity,
-				    Areas = thisData.locationArea,
+				let ProvinceS = thisData.province, //getprovince
+				    citys = thisData.city,
+				    Areas = thisData.area,
 				    ProvinceCity = getProvince(ProvinceS, citys, Areas),
 					month = thisData.dateOfBirthYear ? thisData.dateOfBirthYear + '/' + thisData.dateOfBirthMonth : '';
 				this.setState({

+ 19 - 21
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visitDetail.jsx

@@ -32,7 +32,13 @@ const VisitDetail = React.createClass({
 					dataIndex: 'followSituation',
 					key: 'followSituation',
 					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: '最新状态',
@@ -40,7 +46,13 @@ const VisitDetail = React.createClass({
 					dataIndex: 'customerStatus',
 					key: 'customerStatus',
 					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: '跟进说明',
@@ -48,23 +60,9 @@ const VisitDetail = React.createClass({
 					dataIndex: 'remarks',
 					key: 'remarks',
 					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,
 						businessVarietiesName:thisdata.businessVarietiesName,
 						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,
 					});
 				};

+ 3 - 37
js/component/manageCenter/customer/individualCustomer/myReject.jsx

@@ -451,9 +451,9 @@ const PublicCustomer = Form.create()(React.createClass({
 		                              </Select>
 		                   		 </FormItem>
 		                    </div>
-		                    <FormItem wrapperCol={{ span: 12, offset: 4 }}>
-		                        <Button className="set-submit" type="primary" htmlType="submit">提交审核</Button>  
-		                        <Button className="set-submit" type="ghost" onClick={this.detailsModal} style={{'marginLeft':'40px'}}>取消</Button>
+		                    <FormItem wrapperCol={{ span: 18, offset: 6 }}>
+		                        <Button  type="primary" htmlType="submit">提交审核</Button>  
+		                        <Button  type="ghost" onClick={this.detailsModal} style={{'marginLeft':'40px'}}>取消</Button>
 		                    </FormItem> 
 						</Spin>
 		            </Form >                          
@@ -463,40 +463,6 @@ const PublicCustomer = Form.create()(React.createClass({
 	}
 }));
 
-//const Tablees=Form.create()(React.createClass({
-//	//详情tab切换数据处理
-//	callbacks(e) {
-//		this.setState({
-//			callnubs: e,
-//		})
-//		if(e == '1') {
-//			
-//		}
-//		if(e == '2') {
-//			
-//		}
-//		
-//	},
-//	getInitialState() {
-//		return {
-//			callnubs: "1",
-//		}
-//	},
-//	render() {
-//		return(
-//			<div className="clearfix" style={{marginTop:'0px',marginLeft:'20px'}}>
-//			    <Tabs onChange={this.callbacks} type="card" activeKey={this.state.callnubs} style={{paddingLeft:'15px',paddingRight:'15px',marginRight:'20px'}}>
-//			         <TabPane tab="个人客户" key="1" >
-//			         	<QueryCustomer />
-//			         </TabPane>
-//					 <TabPane tab="单位客户" key="2">
-//					 	<PublicCustomer />
-//					 </TabPane>
-//			    </Tabs>
-//			</div>
-//		);
-//	}
-//}));
 export default PublicCustomer;