liting2017 6 vuotta sitten
vanhempi
commit
9a6abf7f0c

+ 2 - 2
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/basicPerson.jsx

@@ -264,8 +264,8 @@ const Basic = React.createClass({
 				postalAddress: this.state.postalAddress,
 				introduction: this.state.introduction,
 				positiveIdUrl: thecompanyLogoUrl.length != 0 ? thecompanyLogoUrl : '',
-				oppositeIdUrl: thecompanyLogoUrls != 0 ? thecompanyLogoUrls : '',
-				headPortraitUrl: theorgCodeUrl != 0 ? theorgCodeUrl : '',
+				oppositeIdUrl: thecompanyLogoUrls.length != 0 ? thecompanyLogoUrls : '',
+				headPortraitUrl: theorgCodeUrl.length != 0 ? theorgCodeUrl : '',
 				investment: this.state.investment,
 				professionalTitle: this.state.professionalTitle,
 				workUnit: this.state.workUnit,

+ 17 - 13
js/component/manageCenter/customer/NEW/signCustomer/followDetail.jsx

@@ -174,18 +174,23 @@ const FollowDetail = React.createClass({
 					};
 					thedata = {};
 				};
-				for(let i = 0; i < data.data.userBusinessList.length; i++) {
-					let thisdata = data.data.userBusinessList[i];
-					listArr.push({
-						id: thisdata.businessId,
-						businessName:thisdata.businessProjectId,
-						businessVarietiesName:thisdata.businessVarietiesName,
-						businessProjectName:thisdata.businessProjectName,
-						followSituation: thisdata.followSituation==null?undefined : String(thisdata.followSituation),
-						customerStatus: thisdata.customerStatus==null?undefined : String(thisdata.customerStatus),
-						remarks: thisdata.remarks
-					});
-				};
+				if(data.data.userBusinessList[0]!=null) {
+					for(let i = 0; i < data.data.userBusinessList.length; i++) {
+						let thisdata = data.data.userBusinessList[i];
+						if(thisdata!=null){
+							listArr.push({
+								key:i,
+								businessName:thisdata.businessProjectId,
+								businessVarietiesName:thisdata.businessVarietiesName,
+								businessProjectName:thisdata.businessProjectName,
+								followSituation: thisdata.followSituation==null?undefined : String(thisdata.followSituation),
+								customerStatus: thisdata.customerStatus==null?undefined : String(thisdata.customerStatus),
+								remarks: thisdata.remarks
+							});
+						}
+					};
+				}
+				
 				this.setState({
 					contacts: thedata.contacts,
 					uid: thedata.uid,
@@ -385,7 +390,6 @@ const FollowDetail = React.createClass({
 					                 	<div className="clearfix" >
 		                    			    <Spin spinning={this.state.loading}>
 										      <Table 
-										         rowKey={record => record.id}
 								            	 pagination={false}
 								            	 columns={this.state.intentionList} 
 								            	 dataSource={this.state.data}

+ 12 - 12
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visit.jsx

@@ -65,18 +65,18 @@ const Visit = React.createClass({
 				dataIndex: 'result',
 				key: 'result'
 			}
-//			,{
-//				title: '操作',
-//				dataIndex: 'ttt',
-//				key: 'ttt',
-//				render: (text, record, index) => {
-//					return <div>
-//                          {!record.readOnly?<Popconfirm title="是否删除?" onConfirm={(e)=>{this.visitDelet(record)}} okText="删除" cancelText="不删除">
-//							    <Button style={{marginRight:'10px',color:'#ffffff',background:'#f00',border:'none'}} onClick={(e)=>{e.stopPropagation()}}>删除</Button>
-//							</Popconfirm>:''}
-//                      </div>
-//				}
-			//}
+			,{
+				title: '操作',
+				dataIndex: 'ttt',
+				key: 'ttt',
+				render: (text, record, index) => {
+					return <div>
+                            {!record.readOnly?<Popconfirm title="是否删除?" onConfirm={(e)=>{this.visitDelet(record)}} okText="删除" cancelText="不删除">
+							    <Button style={{marginRight:'10px',color:'#ffffff',background:'#f00',border:'none'}} onClick={(e)=>{e.stopPropagation()}}>删除</Button>
+							</Popconfirm>:''}
+                        </div>
+				}
+			}
 		],
 		}
 	},

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

@@ -100,6 +100,7 @@ const VisitDetail = React.createClass({
 				for(let i = 0; i < data.data.userBusinessList.length; i++) {
 					let thisdata = data.data.userBusinessList[i];
 					theArr.push({
+						key:i,
 						readOnly:this.props.followData.readOnly,
 						id: thisdata.ufbId,
 						businessName:thisdata.businessProjectId,
@@ -314,7 +315,6 @@ const VisitDetail = React.createClass({
 					                 	<div className="clearfix">
 		                    			    <Spin spinning={this.state.loading}>
 										      <Table 
-										         rowKey={record => record.id}
 								            	 pagination={false}
 								            	 columns={this.state.intentionList} 
 								            	 dataSource={this.state.data}