Bläddra i källkod

Merge branch 'master' of ssh://git.jishutao.com:55555/jishutao/web

dengzhiguo 6 år sedan
förälder
incheckning
b10487fd4f

+ 10 - 4
js/component/manageCenter/customer/NEW/intentionCustomer/followDetail/businessName.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import { Radio, Form, Modal, message, layout, Spin, Button } from 'antd';
+import { Radio, Form, Modal, message, layout, Spin, Button,Tag } from 'antd';
 
 const BusName = React.createClass({
 	loadData(ids) {
@@ -67,9 +67,8 @@ const BusName = React.createClass({
 					theData.map(item => {
 						businessProjectName.push(item.businessProjectName)
 					})
-					let busStr = businessProjectName.join(' -- ');
 					this.setState({
-						businessData: busStr
+						businessData: businessProjectName
 					})
 				}
 			}.bind(this)
@@ -127,6 +126,7 @@ const BusName = React.createClass({
 			},
 		};
 		const projectData = this.state.projectData || [];
+		const businessData = this.state.businessData ||[]
 		return(
 			<Modal	
 			      className="customeDetails"
@@ -143,7 +143,13 @@ const BusName = React.createClass({
 		    			   		<Form.Item 
 		                            {...formItemLayout}
 		                            label="已签单业务" >
-		    			   			<span>{this.state.businessData}</span>
+		    			   			{
+		    			   				businessData.map((item,index)=>{
+		    			   					console.log(item)
+		    			   					return <Tag key={index} color='#2db7f5'>{item}</Tag>
+		    			   				})
+		    			   			}
+		    			   			<span>{}</span>
 				           		</Form.Item>
 		    			   		<Form.Item 
 		                            {...formItemLayout}

+ 1 - 0
js/component/manageCenter/customer/NEW/signCustomer/followDetail.jsx

@@ -183,6 +183,7 @@ const FollowDetail = React.createClass({
 						if(thisdata!=null){
 							listArr.push({
 								key:i,
+								id:thisdata.businessId,
 								businessName:thisdata.businessProjectId,
 								businessVarietiesName:thisdata.businessVarietiesName,
 								businessProjectName:thisdata.businessProjectName,