Browse Source

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

dengzhiguo 6 years ago
parent
commit
3609319014

+ 4 - 4
js/component/manageCenter/customer/NEW/intentionCustomer/addIntention.jsx

@@ -61,7 +61,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
         this.state.name='';
     	this.state.content='';
     	this.state.telnum='';
-    	this.state.societyTagt=undefined;
+    	this.state.societyTagt='0';
     	this.state.customerSource='0'
     },
     componentWillReceiveProps(nextProps) {
@@ -69,7 +69,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
             this.state.name='';
 	    	this.state.content='';
 	    	this.state.telnum='';
-	    	this.state.societyTagt=undefined;
+	    	this.state.societyTagt='0';
             this.props.form.resetFields(); 
         };
     },
@@ -229,14 +229,14 @@ const AddPerson = Form.create()(React.createClass({
     componentWillMount() {
         this.state.companyNamet='';
     	this.state.telnum='';
-    	this.state.societyTagt=undefined;
+    	this.state.societyTagt='0';
     	this.state.customerSource='0';
     },
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
             this.state.companyNamet='';
 	    	this.state.telnum='';
-	    	this.state.societyTagt=undefined;
+	    	this.state.societyTagt='0';
 	    	this.state.customerSource='0';
             this.props.form.resetFields(); 
         };

+ 3 - 40
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/basic.jsx

@@ -406,48 +406,11 @@ const Basic = React.createClass({
 		                                <Input placeholder="社会同意机构代码" value={this.state.orgCode} 
 							    				onChange={(e)=>{this.setState({orgCode:e.target.value})}}/>
 		                    </FormItem>
-				           <div className="clearfix">
-	                   		<FormItem className="half-item"
-                   		   		labelCol={{ span: 4 }}
-	                            wrapperCol={{ span: 18 }}
-	                            label="高新"
-	                   		    >
-		                   		 <Radio.Group value={this.state.highTechZone} onChange={(e) => {
-				                        this.setState({highTechZone:e.target.value})
-				                    }}>
-				                        <Radio value={0}>否</Radio>
-				                        <Radio value={1}>是</Radio>
-				                  </Radio.Group>
-				            </FormItem>
-	                   	     <FormItem className="half-item"
-                   		   		labelCol={{ span: 4 }}
-	                            wrapperCol={{ span: 18 }}
-	                            label="上市"
-	                   		    >
-		                   		 <Radio.Group value={this.state.listed} onChange={(e) => {
-				                        this.setState({listed:e.target.value })
-				                    }}>
-				                        <Radio value={0}>否</Radio>
-				                        <Radio value={1}>是</Radio>
-				                  </Radio.Group>
-						     </FormItem>
-						     <FormItem className="half-item"
-                   		   		labelCol={{ span: 4 }}
-	                            wrapperCol={{ span: 18 }}
-	                            label="国际化"
-	                   		    >
-		                   		 <Radio.Group value={this.state.international} onChange={(e) => {
-				                        this.setState({international:e.target.value })
-				                    }}>
-				                        <Radio value={0}>否</Radio>
-				                        <Radio value={1}>是</Radio>
-				                  </Radio.Group>
-						     </FormItem>
-						     </div>
 		                    <div className="clearfix pictures">
 		                        <FormItem
-			                        labelCol={{ span: 4 }}
+			                        labelCol={{ span: 6 }}
 			                        wrapperCol={{ span: 18 }}
+			                        style={{marginTop:15}}
 			                        label="机构证(PIC)" >
 			                        <PicturesWall
 			                            pictureSign="PIC"
@@ -456,7 +419,7 @@ const Basic = React.createClass({
 			                            <p>图片建议:图片要清晰。</p>
 		                        </FormItem>
 		                        <FormItem
-			                        labelCol={{ span: 4 }}
+			                        labelCol={{ span: 6 }}
 			                        wrapperCol={{ span: 18 }}
 			                        label="单位logo" > 
 			                        <PicturesWall

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

@@ -352,24 +352,24 @@ const VisitDetail = React.createClass({
 						                <span>{getContactType(this.state.contactType)}</span>}
 					                </FormItem>
 					                <div className="clearfix">
-						                <FormItem className="half-item"
+						               	{!followData.readOnly&&<FormItem className="half-item"
 				                            {...formItemLayout}
 				                             label="当前联系人"
 				                             >
 						                    <span>{this.state.contacts}</span>
-						                </FormItem>
+						                </FormItem>}
 						                <FormItem className="half-item"
 				                            {...formItemLayout}
 				                             label="跟进时间"
 				                             >
 						                	<span>{this.state.followTime}</span>
 						                </FormItem>
-						                <FormItem className="half-item"
+						                {!followData.readOnly&&<FormItem className="half-item"
 				                            {...formItemLayout}
 				                             label="联系电话"
 				                             >
 						                	<span>{this.state.contactMobile}</span>
-						                </FormItem>
+						                </FormItem>}
 					                </div>
 					                <div className="clearfix">
 					                	<FormItem

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

@@ -192,29 +192,6 @@ const Basic = React.createClass({
 		                            >
 		                   		    <span>{basicData.orgCode}</span>
 		                    </FormItem>
-				           <div className="clearfix">
-	                   		<FormItem className="half-item"
-                   		   		labelCol={{ span: 4 }}
-	                            wrapperCol={{ span: 18 }}
-	                            label="高新"
-	                   		    >
-		                   		<span>{basicData.highTechZone?'是':'否'}</span>
-				            </FormItem>
-	                   	     <FormItem className="half-item"
-                   		   		labelCol={{ span: 4 }}
-	                            wrapperCol={{ span: 18 }}
-	                            label="上市"
-	                   		    >
-		                   		<span>{basicData.listed?'是':'否'}</span>
-						     </FormItem>
-						     <FormItem className="half-item"
-                   		   		labelCol={{ span: 4 }}
-	                            wrapperCol={{ span: 18 }}
-	                            label="国际化"
-	                   		    >
-		                   		<span>{basicData.international?'是':'否'}</span>
-						     </FormItem>
-						     </div>
 		                    <div className="clearfix pictures">
 		                        <FormItem
 			                        labelCol={{ span: 4 }}

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

@@ -145,7 +145,7 @@ const Visit = React.createClass({
 					this.state.paginations.current = data.data.pageNo;
 					this.state.paginations.total = data.data.totalCount;
 				};
-				if(data.data.list&&!data.data.list.lenth){
+				if(data.data&&data.data.list&&!data.data.list.lenth){
 					this.state.paginations.current = 0;
 					this.state.paginations.total = 0;
 				};

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

@@ -238,6 +238,7 @@ const VisitDetail = React.createClass({
 			    			   		<FormItem 
 			                            labelCol={{ span:4 }}
 										wrapperCol={{ span: 20 }}
+										style={{marginBottom:12}}
 			                            label="拜访方式" >
 			    			   			{!followData.readOnly?<Radio.Group value={this.state.contactType} onChange={(e) => {
 										        this.setState({ contactType: e.target.value }) 
@@ -252,24 +253,24 @@ const VisitDetail = React.createClass({
 						                }
 					                </FormItem>
 					                <div className="clearfix">
-						                <FormItem className="half-item"
+						                {!followData.readOnly&&<FormItem className="half-item"
 				                            {...formItemLayout}
 				                             label="当前联系人"
 				                             >
 						                    <span>{this.state.contacts}</span>
-						                </FormItem>
+						                </FormItem>}
 						                <FormItem className="half-item"
 				                            {...formItemLayout}
 				                             label="跟进时间"
 				                             >
 						                	<span>{this.state.followTime}</span>
 						                </FormItem>
-						                <FormItem className="half-item"
+						                {!followData.readOnly&&<FormItem className="half-item"
 				                            {...formItemLayout}
 				                             label="联系电话"
 				                             >
 						                	<span>{this.state.contactMobile}</span>
-						                </FormItem>
+						                </FormItem>}
 					                </div>
 					                <div className="clearfix">
 					                	<FormItem

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

@@ -284,75 +284,6 @@ const IntentionCustomer = Form.create()(React.createClass({
             });
         }.bind(this));  
 	},
-	//上级主管输入框失去焦点是判断客户是否存在
-	selectAuto(value,options){
-		this.setState({
-			auto:value
-		})
-	},
-	blurChange(e){
-		let theType='';
-		let contactLists=this.state.customerArr||[];
-			if (e) {
-            contactLists.map(function (item) {
-                if (item.name == e.toString()) {
-                    theType = item.id;
-                }
-           });     
-   	    }
-		this.setState({
-			theTypes:theType
-		})
-	},
-	//值改变时请求客户名称
-	httpChange(e){
-		if(e.length>=1){
-			this.supervisor(e); 
-		}	
-		this.setState({
-			auto:e
-		})
-	},
-	//转交
-	changeAssigner() {
-		if(this.state.theTypes){
-			this.setState({
-				selectedRowKeys: [],
-			});
-			let changeIds;
-			for(let idx = 0; idx < this.state.selectedRows.length; idx++) {
-				let rowItem = this.state.selectedRows[idx];
-				if(rowItem.id) {
-					changeIds = rowItem.id;
-					
-				};
-			};
-			$.ajax({
-				method: "get",
-				dataType: "json",
-				crossDomain: false,
-				url: globalConfig.context + "/api/admin/customer/transferToOther",
-				data: {
-					uid: changeIds, //这一行数据的ID
-					aid: this.state.theTypes, //指定转交人的ID 
-				}
-			}).done(function(data) {
-				if(!data.error.length) {
-					message.success('转交成功!');
-					this.setState({
-						auto:'',
-						loading: false,
-					});
-				} else {
-					message.warning(data.error[0].message);
-				};
-				this.loadData(this.state.ispage);
-			}.bind(this));
-		}else{
-			message.warning('请输入转交人姓名')
-		}
-	},
-
 	componentWillReceiveProps(nextProps) {
 		if(nextProps.ApiUrl!=this.props.ApiUrl) {
 			if(!this.state.searchMore){
@@ -414,24 +345,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                        </Button>
 	                </Popconfirm>:''
 	                }
-	                <AutoComplete
-				        className="certain-category-search"
-				        dropdownClassName="certain-category-search-dropdown"
-				        dropdownMatchSelectWidth={false}
-				        dropdownStyle={{ width: 120 }}
-				        style={{ width: '120px'}}
-				        dataSource={options}
-				        placeholder="输入转交人姓名"
-				        value={this.state.auto}
-				        onChange={this.httpChange}
-				        filterOption={true}
-				        onBlur={this.blurChange}
-				        onSelect={this.selectAuto}
-				        disabled={!hasSelected}
-				      >
-				        <Input />
-				      </AutoComplete>  
-					<Button type="primary" onClick={this.changeAssigner}  disabled={!hasSelected} >转交</Button>  
 	                <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch checked={!this.state.searchMore} onChange={this.searchSwitch} /></span>
                     <div className='clearfix' style={{marginTop:'5px'}}>
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  

+ 2 - 2
js/component/tools.js

@@ -730,7 +730,7 @@ module.exports = {
     },
     //客户状态
 	getcustomerStatue: function (e) {
-         if (e) {
+         if (e||e==0) {
             let theType = '';
             customerStatus.map(function (item) {
                 if (item.value == e) {
@@ -779,7 +779,7 @@ module.exports = {
     },
      //最新跟进
 	getfllowSituation: function (e) {
-         if (e) {
+         if (e||e==0) {
             let theType = '';
             newFollow.map(function (item) {
                 if (item.value == e) {