dengzhiguo 6 gadi atpakaļ
vecāks
revīzija
1db5b8c27e

+ 12 - 4
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -303,6 +303,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 						qualification:thisDetail.qualification,//企业资质情况
 						cooperationSituation:thisDetail.cooperationSituation,//企业与高校院所
 						informationMaintainer:thisDetail.informationMaintainer,//资料维护人
+						informationMaintainerName:thisDetail.informationMaintainerName,//资料维护人
 						coreTechnology:thisDetail.coreTechnology,//核心技术
 						accomplishSituation:thisDetail.accomplishSituation,//客户已完成项目情况
 				});
@@ -416,6 +417,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				qualification:this.state.qualification,//企业资质情况
 				cooperationSituation:this.state.cooperationSituation,//企业与高校院所
 				informationMaintainer:this.state.informationMaintainer,//资料维护人
+				informationMaintainerName:thisDetail.informationMaintainerName,//资料维护人
 				coreTechnology:this.state.coreTechnology,//核心技术
 				accomplishSituation:this.state.accomplishSituation,//客户已完成项目情况
 			}
@@ -599,7 +601,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">                  
-                    <span>{!intentionState?'我的单位意向客户':'我的个人意向客户'}</span>
+                    <span>客户资料维护</span>
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="客户名称"
@@ -637,7 +639,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				        disabled={!hasSelected}
 				      >
 				        <Input />
-				      </AutoComplete>  
+				    </AutoComplete>  
 					<Button type="primary" onClick={this.changeAssigner}  disabled={!hasSelected} >转交</Button>  
                 </div>                                               
                 <div className="patent-table">
@@ -653,7 +655,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                 <Modal	
 				      className="customeDetails"
 				      footer=''
-			          title="客户跟进详情"
+			          title="客户资料(绝密)"
 			          width='1000px'
 			          visible={this.state.visitModul}
 			          onOk={this.visitOk}
@@ -668,6 +670,12 @@ const IntentionCustomer = Form.create()(React.createClass({
 			                        >
 		                    	 <span>{this.state.identifyName}</span>
 			                    </FormItem>
+			                    <FormItem className="half-item"
+				                     {...formItemLayout}
+				                    label="资料所属人"
+			                        >
+		                    	 <span>{this.state.informationMaintainerName}</span>
+			                    </FormItem>
 		                    </div>
 		                    <div className="clearfix" >
 		                    	<FormItem className="half-item" 
@@ -894,7 +902,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				                    </FormItem>
 				                </div> 
 			                    <Button className="setSubmit" type="primary" htmlType="submit">保存</Button>  
-		                        <Button  type="ghost" onClick={this.detailsModal}>取消</Button>
+		                        <Button  type="ghost" onClick={this.visitCancel}>取消</Button>
 		                    </div>		                	
 					    </Spin>
 					</Form>		

+ 5 - 10
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/intentionDetail.jsx

@@ -101,7 +101,7 @@ const IntentionDetail = React.createClass({
 		if(nextProps.modalVisible && nextProps.IntentionData.id) {
 			this.setState({
 				modalVisible:true,
-				callnub:'1',
+				callnub:(this.props.detailApi.indexOf('Organization'))>0?"2":'1',
 			})
 		};
 		this.setState({
@@ -121,22 +121,17 @@ const IntentionDetail = React.createClass({
 			          footer=''
 			        >				    
 					     <Tabs onChange={this.callback} activeKey={this.state.callnub}>
+						    {this.props.detailApi.indexOf('Organization')>0?"":
 						    <TabPane tab="基本信息" key="1">
-						        {this.props.detailApi.indexOf('Organization')>0?<Basic 
-						        	detailApi={this.props.detailApi}
-						        	closeDetail={this.closeDetail}
-						        	data={this.props.IntentionData}
-						        	IntentionState={this.state.IntentionState}
-						        	basicState={this.state.basicState}
-						        />:<BasicPerson 
+						        <BasicPerson 
 						        	detailApi={this.props.detailApi}
 						        	closeDetail={this.closeDetail}
 						        	data={this.props.IntentionData}
 						        	IntentionState={this.state.IntentionState}
 						        	basicState={this.state.basicState}
 						        />
-						       }
-							</TabPane>
+						       
+							</TabPane>}
 						    <TabPane tab="联系人信息" key="2">
 						        <ContactPerson 
 							        closeDetail={this.closeDetail}

+ 5 - 10
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/intentionDetail.jsx

@@ -101,7 +101,7 @@ const IntentionDetail = React.createClass({
 		if(nextProps.modalVisible && nextProps.IntentionData.id) {
 			this.setState({
 				modalVisible:true,
-				callnub:'1',
+				callnub:(this.props.detailApi.indexOf('Organization'))>0?"2":'1',
 			})
 		};
 		this.setState({
@@ -121,22 +121,17 @@ const IntentionDetail = React.createClass({
 			          footer=''
 			        >				    
 					     <Tabs onChange={this.callback} activeKey={this.state.callnub}>
+						    {this.props.detailApi.indexOf('Organization')>0?"":
 						    <TabPane tab="基本信息" key="1">
-						        {this.props.detailApi.indexOf('Organization')>0?<Basic 
-						        	detailApi={this.props.detailApi}
-						        	closeDetail={this.closeDetail}
-						        	data={this.props.IntentionData}
-						        	IntentionState={this.state.IntentionState}
-						        	basicState={this.state.basicState}
-						        />:<BasicPerson 
+						        <BasicPerson 
 						        	detailApi={this.props.detailApi}
 						        	closeDetail={this.closeDetail}
 						        	data={this.props.IntentionData}
 						        	IntentionState={this.state.IntentionState}
 						        	basicState={this.state.basicState}
 						        />
-						       }
-							</TabPane>
+						       
+							</TabPane>}
 						    <TabPane tab="联系人信息" key="2">
 						        <ContactPerson 
 							        closeDetail={this.closeDetail}