liting2017 hace 6 años
padre
commit
27c9d2981d

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

@@ -203,7 +203,7 @@ const FollowDetail = React.createClass({
 		$.ajax({
 			method: "get",
 			dataType: "json",
-			url: globalConfig.context + '/api/admin/customer/toAddFollow',
+			url: globalConfig.context + '/api/admin/customer/toAddFollowOnHistory',
 			data: {
 				uid: e,
 			},

+ 1 - 0
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/businFollow.jsx

@@ -16,6 +16,7 @@ const BusinFollow =React.createClass({
 		this.setState({
 			businessFollowModul:false
 		})
+		this.props.closeBusiness(false)
 	},
 	componentWillReceiveProps(nextProps) {
 		if(nextProps.data.ufbId&&nextProps.businessFollowModul){

+ 4 - 0
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/businessDetail.jsx

@@ -217,6 +217,9 @@ const BusinessDetail =React.createClass({
 			businessModul:false
 		})
 	},
+	closeBusiness(s){
+		this.state.businessFollowModul=s
+	},
 	componentWillReceiveProps(nextProps) {
 		if(nextProps.data.businessId&&nextProps.businessModul&&nextProps.ids){
 			this.setState({
@@ -304,6 +307,7 @@ const BusinessDetail =React.createClass({
     			<BusinFollow 
     				data={this.state.busData}
     				businessFollowModul={this.state.businessFollowModul}
+    				closeBusiness = {this.closeBusiness}
     			/>
 			</div>
 		)

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

@@ -83,46 +83,6 @@ const IntentionDetail = React.createClass({
 				basicState:false
 			})
 		}
-		/*if(e == '6') {
-			this.setState({
-				IntentionState:false,
-				contactState:false,
-				accountState:false,
-				visitState:false,
-				businessState:false,
-				basicState:false
-			})
-		}
-		if(e == '7') {
-			this.setState({
-				IntentionState:false,
-				contactState:false,
-				accountState:false,
-				visitState:false,
-				businessState:false,
-				basicState:false
-			})
-		}
-		if(e == '8') {
-			this.setState({
-				IntentionState:false,
-				contactState:false,
-				accountState:false,
-				visitState:false,
-				businessState:false,
-				basicState:false
-			})
-		}
-		if(e == '9') {
-			this.setState({
-				IntentionState:false,
-				contactState:false,
-				accountState:false,
-				visitState:false,
-				businessState:false,
-				basicState:false
-			})
-		}*/
 		this.setState({
 			callnub: e,
 		})
@@ -185,18 +145,18 @@ const IntentionDetail = React.createClass({
 							    />
 						    </TabPane>
 						    <TabPane tab="账户信息" key="3">
-						    		<Account 
-						    			 closeDetail={this.closeDetail}
-								         data={this.props.IntentionData}
-								         accountState={this.state.accountState}
-						    		/>
+					    		<Account 
+					    			 closeDetail={this.closeDetail}
+							         data={this.props.IntentionData}
+							         accountState={this.state.accountState}
+					    		/>
 						    </TabPane>
 							<TabPane tab="客户拜访" key="4">
-							     <Visit
-							     		categoryArr={this.props.categoryArr}
-							     		closeDetail={this.closeDetail}
-								        data={this.props.IntentionData}
-								        visitState={this.state.visitState}
+							    <Visit
+						     		categoryArr={this.props.categoryArr}
+						     		closeDetail={this.closeDetail}
+							        data={this.props.IntentionData}
+							        visitState={this.state.visitState}
 							     />
 							</TabPane>						
 							<TabPane tab="业务意向" key="5">
@@ -206,19 +166,6 @@ const IntentionDetail = React.createClass({
 								    businessState={this.state.businessState}
 							    />
 							</TabPane>
-							{/*<TabPane tab="业务订单" key="6">
-							     	<div style={{textAlign:'center'}}></div>							
-							</TabPane>
-							<TabPane tab="技术需求" key="7">
-							     								
-							</TabPane>
-							<TabPane tab="技术成果" key="8">
-							     								
-							</TabPane>
-							<TabPane tab="技术专家" key="9">
-							     								
-							</TabPane>
-							*/}
 						</Tabs>
     			</Modal>
 			</div>

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

@@ -162,7 +162,7 @@ const FollowDetail = React.createClass({
 		$.ajax({
 			method: "get",
 			dataType: "json",
-			url: globalConfig.context + '/api/admin/customer/toAddFollow',
+			url: globalConfig.context + '/api/admin/customer/toAddFollowOnLock',
 			data: {
 				uid: e,
 			},

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

@@ -1,136 +0,0 @@
-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';
-
-const BusName = React.createClass({
-	loadData(ids) {
-		console.log(ids)
-		return ;
-		this.setState({
-			loading: true
-		})
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			url: globalConfig.context + '/api/admin/customer/toAddFollow',
-			data: {
-				uid: e,
-			},
-			success: function(data) {
-				let listArr = [];
-				let thedata = data.data;
-				if(!thedata) {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-					thedata = {};
-				};
-				for(let i = 0; i < data.data.userBusinessList.length; i++) {
-					let thisdata = data.data.userBusinessList[i];
-					listArr.push({
-						id: thisdata.id,
-						businessName: thisdata.businessName,
-						businessGlossoryId: String(thisdata.businessGlossoryId),
-						followSituation: String(thisdata.followSituation),
-						customerStatus: String(thisdata.customerStatus),
-						remarks: thisdata.remarks,
-					});
-				};
-				this.setState({
-					contacts: thedata.contacts,
-					uid: thedata.uid,
-					data: listArr,
-					identifyName: thedata.identifyName,
-					followTime: thedata.followTime,
-					businessGlossoryId: thedata.businessGlossoryId,
-					followSituation: thedata.followSituation,
-					customerStatus: thedata.customerStatus,
-					remarks: thedata.remarks,
-				});
-			}.bind(this),
-		}).always(function() {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
-
-	getInitialState() {
-		return {
-			busModul: false
-		}
-	},
-	visitCancel() {
-		this.setState({
-			busModul: false
-		})
-		this.props.closeBus(null,false,false)
-	},
-	selFn() {
-		this.setState({
-			busModul: false
-		});
-		this.props.closeBus(this.state.contactType, false, true);
-	},
-	componentWillReceiveProps(nextProps) {
-		if(nextProps.busModul) {
-			this.setState({
-				busModul: true,
-				loading: false
-			})
-			this.loadData(nextProps.businessId)
-		};
-	},
-	render() {
-		const formItemLayout = {
-			labelCol: {
-				span: 4
-			},
-			wrapperCol: {
-				span: 18
-			},
-		};
-		return(
-			<Modal	
-			      className="customeDetails"
-			      footer=''
-		          title="项目名称"
-		          width='600px'
-		          visible={this.state.busModul}
-		          onOk={this.visitCancel}
-				  onCancel={this.visitCancel}							          							          
-		        >	
-			        <Form layout="horizontal" id="demand-form" >
-		    			<Spin spinning={this.state.loading}>
-		    			   	<div className="clearfix">
-		    			   		<Form.Item 
-		                            {...formItemLayout}
-		                            label="已签单业务" >
-		    			   			<span>好东东.</span>
-				           		</Form.Item>
-		    			   		<Form.Item 
-		                            {...formItemLayout}
-		                            label="项目名称" >
-		    			   			<Radio.Group value={this.state.contactType} onChange={(e) => {
-									        this.setState({ contactType: e.target.value }) 
-					                    }}>
-					                        <Radio value={'外出'}>外出</Radio>
-					                        <Radio value={'电话电话电话电话电话电话'}>电话</Radio>
-					                        <Radio value={'QQ'}>QQ</Radio>
-					                        <Radio value={'微信'}>微信</Radio>
-					                        <Radio value={'邮箱'}>邮箱</Radio>
-					                </Radio.Group>
-				           		</Form.Item>
-				           		<Form.Item wrapperCol={{ span: 12, offset: 4 }}>
-		    			   			<Button onClick={this.selFn} type='primary'>选定</Button>
-		    			   			<Button onClick={this.visitCancel} style={{marginLeft:'40px'}}>取消</Button>
-				           		</Form.Item>
-				            </div>
-				        </Spin>
-					</Form>
-			</Modal>
-		)
-	}
-})
-export default BusName;

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

@@ -16,6 +16,7 @@ const BusinFollow =React.createClass({
 		this.setState({
 			businessFollowModul:false
 		})
+		this.props.closeBusiness(false);
 	},
 	componentWillReceiveProps(nextProps) {
 		if(nextProps.data.ufbId&&nextProps.businessFollowModul){

+ 4 - 0
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/businessDetail.jsx

@@ -217,6 +217,9 @@ const BusinessDetail =React.createClass({
 			businessModul:false
 		})
 	},
+	closeBusiness(s){
+		this.state.businessFollowModul=s
+	},
 	componentWillReceiveProps(nextProps) {
 		if(nextProps.data.businessId&&nextProps.businessModul&&nextProps.ids){
 			this.setState({
@@ -304,6 +307,7 @@ const BusinessDetail =React.createClass({
     			<BusinFollow 
     				data={this.state.busData}
     				businessFollowModul={this.state.businessFollowModul}
+    				closeBusiness = {this.closeBusiness}
     			/>
 			</div>
 		)

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

@@ -5,7 +5,6 @@ import {Modal,Form,layout,Radio,Button,Input,Spin,Table,Select,Popconfirm,messag
 import {intentionalService,newFollow,customerStatus} from '@/dataDic.js';
 import {getCompanyIntention,getfllowSituation,getcustomerStatue} from '@/tools.js';
 const FormItem =Form.Item;
-import BusName from '../../followDetail/businessName.jsx';
 
 const VisitDetail = React.createClass({
 	getInitialState(){

+ 1 - 1
js/component/manageCenter/set/userManagementS/jurisdiction.jsx

@@ -58,7 +58,7 @@ const Jurisdiction = Form.create()(React.createClass({
 				render: (text, recard) => {
 					return(
 						<div>
-							<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.addNextURL(recard)}} style={{marginRight:'15px'}}>新建下级权限</Button>
+							{recard.children.length>0&&<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.addNextURL(recard)}} style={{marginRight:'15px'}}>新建下级权限</Button>}
 	                        <Popconfirm
 	                                title={"是否真的删除?"}
 	                                onConfirm={(e)=>{this.delectRow(recard)}}

+ 5 - 4
js/component/manageCenter/set/userManagementS/user.jsx

@@ -13,7 +13,8 @@ const User = Form.create()(React.createClass({
 		this.state.data = [];
 		this.setState({
 			userDetaile:false,
-			loading: true
+			loading: true,
+			page:pageNo
 		});
 		var admin=window.adminData.isSuperAdmin||'';
 		var departmentId=window.adminData.departmentId||'';
@@ -158,7 +159,6 @@ const User = Form.create()(React.createClass({
 	},
 	tableRowClick(record, index) {
 		this.rolesArrS(record)
-
 		this.setState({
 			userDetaile:true,
 			showDesc: true,
@@ -422,7 +422,7 @@ const User = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.page);
 		}.bind(this));
 	},
 	addClick() {
@@ -433,9 +433,10 @@ const User = Form.create()(React.createClass({
 		});
 	},
 	closeDesc(e, s) {
+		this.state.userDetaile=false;
 		this.state.showDesc = e;
 		if(s) {
-			this.loadData();
+			this.loadData(this.state.page);
 		};
 	},
 	search() {