liting2017 7 years ago
parent
commit
c0054047ea

+ 102 - 45
js/component/manageCenter/customer/customerData/companyCustomer.jsx

@@ -413,7 +413,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					  dataIndex: 'name',
 					  key: 'name',	
 					  render: (text, record, index) => {
-	                  return adminData.name=="管理员"?<Input value={record.name} placeholder="姓名" key={record.id}
+	                  return adminData.name=="管理员"?<Input value={record.name} placeholder="姓名" key={record.id} required="required"
 	                           onChange={(e) => { record.name = e.target.value; 
 	                           	this.setState({ contactList: this.state.contactList }); }} style={{width:'120px'}}/>:<span>{text}</span>
 	                  }
@@ -438,7 +438,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					  dataIndex: 'mobile',
 					  key: 'mobile',
 					  render: (text, record, index) => {
-	                  return adminData.name=="管理员"?<Input value={record.mobile} placeholder="手机号码" key={record.id}
+	                  return adminData.name=="管理员"?<Input value={record.mobile} placeholder="手机号码" key={record.id} required="required"
 	                  onChange={(e) => { record.mobile = e.target.value; this.setState({ contactList: this.state.contactList }); }} style={{width:'120px'}}/>:<span>{text}</span>
 	            }
 				},{
@@ -495,30 +495,22 @@ const PublicCustomer = Form.create()(React.createClass({
                     dataIndex: 'name',
                     key: 'name',                                        
                 }, {
-                    title: '客户类型',
-                    dataIndex: 'type',
-                    key: 'type',
-                    render: text => { return getcustomerTyp(text) }
-                 
-                }, {
                     title: '地区',
                     dataIndex: 'locationProvince',
                     key: 'locationProvince', 
-                }, {
-                    title: '联系人',
-                    dataIndex: 'contacts',
-                    key: 'contacts',                    
                 }, 
-                {
-                    title: '联系电话',
-                    dataIndex: 'contactMobile',
-                    key:'contactMobile',                   
-                },
                  {
                     title: '行业',
                     dataIndex: 'industry',
                     key: 'industry',
                 },
+                 {
+                    title: '公共客户',
+                    dataIndex: 'type',
+                    key: 'type',
+                    render: text => { return getWhether(text) }
+                 
+                },
                 {
                     title: '创建时间',
                     dataIndex: 'createTime',
@@ -566,6 +558,17 @@ const PublicCustomer = Form.create()(React.createClass({
                     key: 'currentMemberStatus',
                     render:text => {return getCurrentMember(text)}
                 },
+                {
+                    title: '操作',
+                    dataIndex: 'abc',
+                    key: 'abc',
+                    render: (text, record, index) => {                    	
+                        return record.publics?<div>
+                               <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
+                                onClick={(e)=>{this.changeRow(record)}}>领取<Icon /></Button>  
+                        </div>:<span>无权限</span>
+                    }
+                } 
             ],
             data:[],
             dataman:[],
@@ -903,21 +906,11 @@ const PublicCustomer = Form.create()(React.createClass({
             this.loadData();
         }.bind(this));
     }, 
-    
-    //转为公共客户
-    changeRow() {
-        let deletedIds;       
-        let adminName;
-        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
-            let rowItem = this.state.selectedRows[idx];
-            if (rowItem.id) {
-                deletedIds=rowItem.id;               
-                adminName=rowItem.adminName;               
-            };            
-        };       
+    //领取
+    changeRow(uids) { 
         this.setState({
-            selectedRowKeys: [],
-            
+        	loading: true,
+            selectedRowKeys: [],   
         });
         $.ajax({
             method: "get",
@@ -925,12 +918,12 @@ const PublicCustomer = Form.create()(React.createClass({
             crossDomain: false,           
             url: globalConfig.context + "/api/admin/customer/transferToPublic",  
             data: {
-                id: deletedIds,
-				        beforeAdminName:adminName,
+                id: uids.uid,
+				AdminName:uids.adminName,
             }
 		        }).done(function (data) {
 		            if (!data.error.length) {
-		                message.success('已转为公共客户!');
+		                message.success('领取成功!');
 		                this.setState({
 		                    loading: false,
 		                });
@@ -1045,6 +1038,10 @@ const PublicCustomer = Form.create()(React.createClass({
     //基本信息提交
     newSubmit(e){
     	e.preventDefault(); 
+    	if(!this.state.ProvinceCity[1]){
+    		message.warning('请选择地区');
+    		return false;
+    	};
     	this.state.data=[];
         this.setState({        	
             selectedRowKeys: [],           
@@ -1242,6 +1239,12 @@ const PublicCustomer = Form.create()(React.createClass({
 	//拜访保存函数
     visitSubmit(e){
     	e.preventDefault();
+    	let GlossoryId;
+    	this.state.data.map(function(item){
+    		if(!item.businessGlossoryId){
+    			GlossoryId=true 
+    		}
+    	})
     	if(this.state.contactType==undefined){
     		message.warning('请选择拜访方式')
     		return false;
@@ -1252,6 +1255,10 @@ const PublicCustomer = Form.create()(React.createClass({
 		  		return false;
 		  	}
     	};
+    	if(GlossoryId){
+    		message.warning("请选择业务名称!")
+    		return false;
+    	};
 	        this.setState({        	
 	            selectedRowKeys: [],           
 	        });
@@ -1739,6 +1746,10 @@ const PublicCustomer = Form.create()(React.createClass({
     //账户信息保存
     accountSave(e){
     	e.preventDefault(); 
+    	if(!this.state.mobile){
+    		message.warning('手机号码不能为空!')
+    		return false;
+    	}
     	this.state.data=[];
         this.setState({        	
             selectedRowKeys: [],           
@@ -1912,12 +1923,8 @@ const PublicCustomer = Form.create()(React.createClass({
                     <Button onClick={this.reset}>重置</Button>                                         				
 					<Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px',display:adminData.name=="管理员"?'inline-block':'none'}}
 	                        disabled={!hasSelected}
-	                        
 	                        onClick={this.delectRow}>删除<Icon type="minus" />
-	                </Button>	
-                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                        disabled={!hasSelected}
-                        onClick={this.changeRow}>领取<Icon /></Button>		
+	                </Button>			
 	                <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className='clearfix' style={{marginTop:'5px'}}>
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
@@ -2025,20 +2032,24 @@ const PublicCustomer = Form.create()(React.createClass({
 						                        <span>{theInformation.unitName}</span>
 						                    </FormItem>
 					                    </div>
-					                    <div className="clearfix" style={{paddingLeft:'60px'}}>
+					                   <div className="clearfix" style={{paddingLeft:'60px'}}>
 					                    	<FormItem className="half-item" 
 					                         labelCol={{ span: 4 }}
 					                         wrapperCol={{ span: 18 }}
 					                        label="行业"
 					                         > 
-												    <Select placeholder="选择行业" value={this.state.industry} onChange={(e) => {
-								                        this.setState({industry:e})}}>
+					                         {getFieldDecorator('industry', {
+						                        	    rules: [{ required: true, message: '此项为必填项!' }],
+						                            	initialValue: this.state.industry
+				                                 })(
+												    <Select placeholder="选择行业" >
 				                                      {
 				                                        industryList.map(function (item) {
 				                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                        })
 				                                      }
 				                                    </Select>
+				                                  )}
 					                   		 </FormItem>
 					                   		 <FormItem className="half-item" 
 					                           labelCol={{ span: 4 }}
@@ -2046,9 +2057,10 @@ const PublicCustomer = Form.create()(React.createClass({
 					                           label="社会属性"
 					                         > 
 						                        {getFieldDecorator('societyTag', {
+						                        	    rules: [{ required: true, message: '此项为必填项!' }],
 						                            	initialValue: theInformation.societyTag
 				                                 })(
-												    <Select placeholder="客户社会属性" >
+												    <Select placeholder="客户社会属性(必填项)" >
 				                                    {
 				                                        socialAttribute.map(function (item) {
 				                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -2062,7 +2074,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市"
+					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市(必填项)"
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />                
 						                   </FormItem>
 						                   <FormItem className="half-item"
@@ -2364,7 +2376,52 @@ const PublicCustomer = Form.create()(React.createClass({
 						                            >
 						                            <span>{theInformation.orgCode}</span>
 						                    </FormItem>
-						                     
+						                    <div className="clearfix pictures">
+						                        <FormItem
+							                        labelCol={{ span: 4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="机构证(PIC)" >
+							                        <div className="clearfix">
+							                            <Upload className="demandDetailShow-upload"
+							                                listType="picture-card"
+							                                fileList={this.state.orgCodeUrl}
+							                                onPreview={(file) => {
+							                                    this.setState({
+							                                        previewImage: file.url || file.thumbUrl,
+							                                        previewVisible: true,
+							                                    });
+							                                }} >
+							                            </Upload>
+							                            <Modal maskClosable={false} footer={null}
+							                                visible={this.state.previewVisible}
+							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+							                                <img alt="" style={{ width: '100%' }} src={this.state.orgCodeUrl || ''} />
+							                            </Modal>
+							                        </div>     
+						                        </FormItem>
+						                        <FormItem
+							                        labelCol={{ span: 4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="单位logo" > 
+							                        <div className="clearfix">
+							                            <Upload className="demandDetailShow-upload"
+							                                listType="picture-card"
+							                                fileList={this.state.companyLogoUrl}
+							                                onPreview={(file) => {
+							                                    this.setState({
+							                                        previewImage: file.url || file.thumbUrl,
+							                                        previewVisible: true,
+							                                    });
+							                                }} >
+							                            </Upload>
+							                            <Modal maskClosable={false} footer={null}
+							                                visible={this.state.previewVisible}
+							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+							                                <img alt="" style={{ width: '100%' }} src={this.state.companyLogoUrl || ''} />
+							                            </Modal>
+							                        </div> 
+							                    </FormItem>
+							                </div>
 							                <div className="clearfix">
 							                    <FormItem
 						                        labelCol={{ span: 2 }}

+ 37 - 19
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -413,7 +413,7 @@ const MyClient = Form.create()(React.createClass({
 					  dataIndex: 'name',
 					  key: 'name',	
 					  render: (text, record, index) => {
-	                  return <Input value={record.name} placeholder="姓名" key={record.id}
+	                  return <Input value={record.name} placeholder="姓名(必填项)" key={record.id} required="required"
 	                           onChange={(e) => { record.name = e.target.value; 
 	                           	this.setState({ contactList: this.state.contactList }); }} style={{width:'120px'}}/>
 	            }
@@ -438,7 +438,7 @@ const MyClient = Form.create()(React.createClass({
 					  dataIndex: 'mobile',
 					  key: 'mobile',
 					  render: (text, record, index) => {
-	                  return <Input value={record.mobile} placeholder="手机号码" key={record.id}
+	                  return <Input value={record.mobile} placeholder="手机号码(必填项)" key={record.id} required="required"
 	                  onChange={(e) => { record.mobile = e.target.value; this.setState({ contactList: this.state.contactList }); }} style={{width:'120px'}}/>
 	            }
 				},{
@@ -937,7 +937,11 @@ const MyClient = Form.create()(React.createClass({
     },
     //基本信息提交
     newSubmit(e){
-    	e.preventDefault(); 
+    	e.preventDefault();
+    	if(!this.state.ProvinceCity[1]){
+    		message.warning('请选择地区');
+    		return false;
+    	};
     	this.state.data=[];
         this.setState({        	
             selectedRowKeys: [],           
@@ -973,7 +977,7 @@ const MyClient = Form.create()(React.createClass({
                         societyTag:values.societyTag,
                         introduction:values.introduction,
                         unitName:this.state.unitName,
-                        industry:this.state.industry,
+                        industry:values.industry,
                         locationProvince:(this.state.ProvinceCity)[0],//省-
                         locationCity:(this.state.ProvinceCity)[1],//市
                         locationArea:(this.state.ProvinceCity)[2],//区
@@ -1030,6 +1034,7 @@ const MyClient = Form.create()(React.createClass({
                     thisData = {};
                 }; 
                 let ProvinceCityArr=[];
+                
                 let ProvinceS=thisData.locationProvince;  //getprovince
                 let citys=thisData.locationCity;
                 let Areas=thisData.locationArea;
@@ -1128,6 +1133,12 @@ const MyClient = Form.create()(React.createClass({
 	//拜访保存函数
     visitSubmit(e){
     	e.preventDefault();
+    	let GlossoryId;
+    	this.state.data.map(function(item){
+    		if(!item.businessGlossoryId){
+    			GlossoryId=true 
+    		}
+    	})
     	if(this.state.contactType==undefined){
     		message.warning('请选择拜访方式')
     		return false;
@@ -1138,9 +1149,10 @@ const MyClient = Form.create()(React.createClass({
 		  		return false;
 		  	}
     	};
-	        this.setState({        	
-	            selectedRowKeys: [],           
-	        });
+    	if(GlossoryId){
+    		message.warning("请选择业务名称!")
+    		return false;
+    	};
 	        this.setState({
 	          loading: true
 	    	}); 
@@ -1305,7 +1317,7 @@ const MyClient = Form.create()(React.createClass({
 	},
 	//新增联系人保存函数
 	submitcontactman(e){
-		e.preventDafault();
+		e.preventDefault();
 	},
 	//获取联系人下拉框
 	getNewWoman(ids) {  
@@ -1567,7 +1579,8 @@ const MyClient = Form.create()(React.createClass({
 		})
 	},
 	//tab2联系人保存
-	contactSave() {
+	contactSave(e) {
+		e.preventDefault();
         this.setState({
             loading: true
         });
@@ -1624,11 +1637,11 @@ const MyClient = Form.create()(React.createClass({
     },
     //账户信息保存
     accountSave(e){
-    	e.preventDefault(); 
-    	this.state.data=[];
-        this.setState({        	
-            selectedRowKeys: [],           
-        });
+    	e.preventDefault();
+    	if(!this.state.mobile){
+    		message.warning('手机号码不能为空!')
+    		return false;
+    	}
         this.setState({
           loading: true
     	}); 	
@@ -1945,14 +1958,18 @@ const MyClient = Form.create()(React.createClass({
 					                         wrapperCol={{ span: 18 }}
 					                        label="行业"
 					                         > 
-												    <Select placeholder="选择行业" value={this.state.industry} onChange={(e) => {
-								                        this.setState({industry:e})}}>
+					                         {getFieldDecorator('industry', {
+						                        	    rules: [{ required: true, message: '此项为必填项!' }],
+						                            	initialValue: this.state.industry
+				                                 })(
+												    <Select placeholder="选择行业" >
 				                                      {
 				                                        industryList.map(function (item) {
 				                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                        })
 				                                      }
 				                                    </Select>
+				                                  )}
 					                   		 </FormItem>
 					                   		 <FormItem className="half-item" 
 					                           labelCol={{ span: 4 }}
@@ -1960,9 +1977,10 @@ const MyClient = Form.create()(React.createClass({
 					                           label="社会属性"
 					                         > 
 						                        {getFieldDecorator('societyTag', {
+						                        	    rules: [{ required: true, message: '此项为必填项!' }],
 						                            	initialValue: theInformation.societyTag
 				                                 })(
-												    <Select placeholder="客户社会属性" >
+												    <Select placeholder="客户社会属性(必填项)" >
 				                                    {
 				                                        socialAttribute.map(function (item) {
 				                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1976,7 +1994,7 @@ const MyClient = Form.create()(React.createClass({
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市"
+					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市(必填项)"
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />                
 						                   </FormItem>
 						                   <FormItem className="half-item"
@@ -2190,7 +2208,7 @@ const MyClient = Form.create()(React.createClass({
 						    					<FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="注册手机号" >
-							                         <Input value={this.state.mobile}  onChange={(e) => { this.setState({ mobile: e.target.value }); }} style={{width:'200px',marginRight:'50px'}}/>
+							                         <Input value={this.state.mobile} onChange={(e) => { this.setState({ mobile: e.target.value }); }} style={{width:'200px',marginRight:'50px'}}/>
 							                    	 <Button onClick={this.modifyPassworld}>修改密码</Button>
 							                    </FormItem>
 							                    <FormItem className="half-item"

+ 22 - 12
js/component/manageCenter/customer/customerData/myClientDesc.jsx

@@ -13,6 +13,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
     },
 
     handleSubmit(e) {
+    	e.preventDefault();
     	if(this.state.companyNamet.length>64){
     		message.warning('客户名称字数不超过64个')
     		return false;
@@ -29,8 +30,6 @@ const AchievementDetailForm = Form.create()(React.createClass({
     		message.warning('请填写社会属性!')
     		return false;
     	};
-    	
-        e.preventDefault();
         this.props.form.validateFields((err, values) => {                                 
             if (!err) {
                 this.setState({
@@ -42,9 +41,9 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     crossDomain: false,
                     url: globalConfig.context + '/api/admin/customer/addCustomer',
                     data: {
-                        name: this.state.companyNamet, 
-                        contacts:this.state.content,
-                        contactMobile: this.state.telnum,
+                        name: values.companyNamet, 
+                        contacts:values.content,
+                        contactMobile: values.telnum,
                         societyTag:this.state.societyTagt,
                         type:'1'
                     }
@@ -108,24 +107,36 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     	<FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="公司名称" >
-	                         <Input value={this.state.companyNamet} placeholder="公司名称(64字以内)" 
-	                              onChange={(e) => { this.setState({ companyNamet: e.target.value }); }} required="required"/>
+                    	     {getFieldDecorator('name', {
+                                rules: [{ required: true, message: '此项为必填项!' }],
+                                initialValue: this.state.name
+                            })(
+                                <Input placeholder="公司名称" />
+                                )}
 	                    </FormItem>
                     </div>
                     <div className="clearfix">
                     	<FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="联系人" >
-	                              <Input value={this.state.content}  placeholder="联系人" 
-	                                 onChange={(e) => { this.setState({ content: e.target.value }); }} required="required"/>
+	                            {getFieldDecorator('content', {
+	                                rules: [{ required: true, message: '此项为必填项!' }],
+	                                initialValue: this.state.content
+                                })(
+                                    <Input placeholder="联系人" />
+                                )}     
 	                    </FormItem>
                     </div>
                     <div className="clearfix">
                     	<FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="联系电话" >
-	                              <Input value={this.state.telnum} placeholder="联系电话" 
-	                                    onChange={(e) => { this.setState({ telnum: e.target.value }); }} required="required"/>
+	                            {getFieldDecorator('telnum', {
+	                                rules: [{ required: true, message: '此项为必填项!' }],
+	                                initialValue: this.state.telnum
+                                })(
+                               		<Input placeholder="联系电话" />
+                                )}        
 	                    </FormItem>
                     </div>
                     <div className="clearfix">
@@ -133,7 +144,6 @@ const AchievementDetailForm = Form.create()(React.createClass({
                           {...formItemLayout}
                            label="社会属性"
                          > 
-	                    
 							    <Select placeholder="客户社会属性"  value={this.state.societyTagt} onChange={(e) => { this.setState({ societyTagt: e}); }}> 
                                 {
                                     socialAttribute.map(function (item) {

+ 41 - 35
js/component/manageCenter/customer/customerService/myBusiness.jsx

@@ -1106,42 +1106,48 @@ const MyBusiness = Form.create()(React.createClass({
 					                        })
 					                      }
 						               </Select>
-                   		            </FormItem>
-			    			   	    <FormItem className="half-item"
-			                           {...formItemLayout}
-			                             >
-					                	<Button type="primary" onClick={this.newContacts} style={{marginLeft:'160px'}}>添加新联系人</Button>
-					                </FormItem>
-			    			   		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="意向时间" >	
-			                               <DatePicker placeholder="更新日期" value={moment(this.state.createYear,'YYYY-MM-DD')} onChange={(time) => {this.setState({createYear: time});}}/>					                               			                               		                           
-					                       <TimePicker placeholder="更新时间" value={moment(this.state.creatMent, 'HH:mm:ss')} onChange={(time) => { this.setState({creatMent: time}); }}/>	
-		            				</FormItem> 
-		    			   		    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                             label="客户名称"
-			                             >
-					                    <AutoComplete
-										        className="certain-category-search"
-										        dropdownClassName="certain-category-search-dropdown"
-										        dropdownMatchSelectWidth={false}
-										        dropdownStyle={{ width: 300 }}
-										        size="large"
-										        style={{ width: '100%' }}
-										        dataSource={options}
-										        placeholder="输入名称"
-										        optionLabelProp="value"
-										        onChange={this.httpChange}
-										        onSelect={this.autoChange}
-										        filterOption={true}
-										        onBlur={this.blurChange}
-										      >
-										        <Input />
-										      </AutoComplete>
-						            </FormItem></div>
+			    			           <span style={{color:'red'}}> *</span>
+	                   		            </FormItem>
+				    			   	    <FormItem className="half-item"
+				                           {...formItemLayout}
+				                             >
+						                	<Button type="primary" onClick={this.newContacts} style={{marginLeft:'160px'}}>添加新联系人</Button>
+						                </FormItem>
+						                <div className="clearfix">
+					    			   		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="意向时间" >	
+					                               <DatePicker placeholder="更新日期" value={moment(this.state.createYear,'YYYY-MM-DD')} onChange={(time) => {this.setState({createYear: time});}}/>					                               			                               		                           
+							                       <TimePicker placeholder="更新时间" value={moment(this.state.creatMent, 'HH:mm:ss')} onChange={(time) => { this.setState({creatMent: time}); }}/>	
+				            				</FormItem> 
+			    			   		        <FormItem className="half-item"
+				                            {...formItemLayout}
+				                             label="客户名称"
+				                             >
+						                    <AutoComplete
+											        className="certain-category-search"
+											        dropdownClassName="certain-category-search-dropdown"
+											        dropdownMatchSelectWidth={false}
+											        dropdownStyle={{ width: 300 }}
+											        size="large"
+											        style={{ width: '200px' }}
+											        dataSource={options}
+											        placeholder="输入名称"
+											        optionLabelProp="value"
+											        onChange={this.httpChange}
+											        onSelect={this.autoChange}
+											        filterOption={true}
+											        onBlur={this.blurChange}
+											      >
+											        <Input style={{width:'200px'}}/>
+											      </AutoComplete>
+			    			    				  <span style={{color:'red'}}> *</span>
+											      
+							                </FormItem>
+			    			    	    </div>
+						            </div>
 
-}
+										}	
 			    			     	<FormItem className="half-item"
 				                            {...formItemLayout}
 				                             label="营销员"

+ 9 - 22
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -295,7 +295,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 					  dataIndex: 'createTime',
 					  key: 'createTime'	 
 				},{
-					  title: '客户名',
+					  title: '客户名',
 					  dataIndex: 'identifyName',
 					  key: 'identifyName'	 
 				},{
@@ -370,7 +370,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 					  dataIndex: 'followTime',
 					  key: 'followTime'	 
 				},{
-					  title: '客户名',
+					  title: '客户名',
 					  dataIndex: 'identityName',
 					  key: 'identityName'	 
 				},{
@@ -495,7 +495,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 	            ],    
             columns: [               
                 {
-                    title: '客户名',
+                    title: '客户名',
                     dataIndex: 'name',
                     key: 'name',                                        
                 }, {
@@ -1777,7 +1777,7 @@ const IndividualCustomer = Form.create()(React.createClass({
         let contactArr=this.state.contactList; 
        	contactArr.map(function(item){
        	  	 if(!item.name){
-       	  	 	err='客户名不能为空!' ;
+       	  	 	err='客户名不能为空!' ;
        	  	 }
        	  	 if(!item.mobile){
        	  	 	err='手机号码不能为空!';
@@ -2134,14 +2134,6 @@ const IndividualCustomer = Form.create()(React.createClass({
 	                            <Select.Option value="0" >否</Select.Option>
 	                            <Select.Option value="1" >是</Select.Option>
 	                        </Select>
-	                        <span>高新:</span>
-	                        <Select placeholder="高新"
-	                            style={{ width: 60 }}
-	                            value={this.state.highTechZoneSearch}
-	                            onChange={(e) => { this.setState({ highTechZoneSearch: e }) }}>
-	                            <Select.Option value="0" >否</Select.Option>
-	                            <Select.Option value="1" >是</Select.Option>
-	                        </Select>
 	                        <span>上市:</span>
 	                        <Select placeholder="上市"
 	                            style={{ width: 60 }}
@@ -2200,14 +2192,9 @@ const IndividualCustomer = Form.create()(React.createClass({
 					                    	<FormItem className="half-item"
 							                    labelCol={{ span: 6 }}
 							                    wrapperCol={{ span: 16 }}
-							                    label="客户名"
+							                    label="客户名"
 						                        >
-					                    	 {getFieldDecorator('name', {
-						                            	rules: [{ required: true, message: '此项为必填项!' }],
-						                                initialValue: theInformation.name
-						                            })(
-					                    	    <Input placeholder="客户名称" />                      
-						                    )}
+					                    	 <span>{this.state.name}</span>
 						                    </FormItem>
 					                    </div>
 					                    <div className="clearfix" >
@@ -2631,7 +2618,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 					                <div className="clearfix">
 						                <FormItem className="half-item"
 				                            {...formItemLayout}
-				                             label="客户名"
+				                             label="客户名"
 				                             >
 						                   <span>{this.state.identityName}</span>
 						                </FormItem>
@@ -2852,7 +2839,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="客户名称" >
+					                            label="客户" >
 					                        <span>{this.state.identifyName}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
@@ -2918,7 +2905,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="客户名" >
+					                            label="客户名" >
 					                        <span>{this.state.identifyNames}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"

+ 1 - 0
js/component/manageCenter/customer/individualCustomer/myClient.less

@@ -83,6 +83,7 @@
 .ant-modal-footer button:first-child{margin-left: 80px;margin-right: 30px;}
 .ant-modal-title{font-size: 20px;}
 .pictures{padding-top: 20px;}
+.ContactsList{float: right;}
 #demand-form {
     .half-item {
         float: left;

+ 51 - 10
js/component/manageCenter/customer/individualCustomer/myClientDesc.jsx

@@ -12,7 +12,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
         };
     },
     handleSubmit(e) {
-    	if(this.state.content.length>64){
+    	if(this.state.companyNamet.length>64){
     		message.warning('联系人字数不超过64个')
     		return false;
     	};
@@ -32,8 +32,13 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     crossDomain: false,
                     url: globalConfig.context + '/api/admin/customer/addCu',
                     data: {
-                        name: this.state.companyNamet, 
-                        contactMobile: this.state.telnum,
+                        name: values.companyNamet, 
+                        contactMobile: values.telnum,
+                        depatrment:this.state.depatrments,
+                        position:this.state.positions,
+                        wechat:this.state.wechats,
+                        qq:this.state.qqs,
+                        email:this.state.emails,
                         type:'0'
                     }
                 }).done(function (data) { 
@@ -91,17 +96,53 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     <div className="clearfix">
                     	<FormItem className="half-item"
 	                            {...formItemLayout}
-	                            label="客户名称" >
-	                         <Input value={this.state.companyNamet} placeholder="公司名称" 
-	                              onChange={(e) => { this.setState({ companyNamet: e.target.value }); }} required="required"/>
+	                            label="客户姓名" >   
+	                           {getFieldDecorator('companyNamet', {
+	                                rules: [{ required: true, message: '此项为必填项!' }],
+	                                initialValue: this.state.companyNamet
+                                })(
+                                    <Input placeholder="客户姓名" />
+                                )} 
 	                    </FormItem>
-                    </div>
-                    <div className="clearfix">
                     	<FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="联系电话" >
-	                              <Input value={this.state.telnum} placeholder="联系电话"  
-	                                    onChange={(e) => { this.setState({ telnum: e.target.value }); }} required="required"/>
+	                    		{getFieldDecorator('telnum', {
+	                                rules: [{ required: true, message: '此项为必填项!' }],
+	                                initialValue: this.state.telnum
+                                })(
+                                    <Input placeholder="联系电话" />
+                                )} 
+	                    </FormItem>
+	                    <FormItem className="half-item"
+	                            {...formItemLayout}
+	                            label="联系人部门" >
+	                              <Input value={this.state.depatrments} placeholder="联系人部门"  
+	                                    onChange={(e) => { this.setState({ depatrments: e.target.value }); }} />
+	                    </FormItem>
+	                    <FormItem className="half-item"
+	                            {...formItemLayout}
+	                            label="联系人职务" >
+	                              <Input value={this.state.positions} placeholder="联系人职务"  
+	                                    onChange={(e) => { this.setState({ positions: e.target.value }); }} />
+	                    </FormItem>
+	                    <FormItem className="half-item"
+	                            {...formItemLayout}
+	                            label="微信" >
+	                              <Input value={this.state.wechats} placeholder="微信"  
+	                                    onChange={(e) => { this.setState({ wechats: e.target.value }); }} />
+	                    </FormItem>
+	                    <FormItem className="half-item"
+	                            {...formItemLayout}
+	                            label="联系人QQ" >
+	                              <Input value={this.state.qqs} placeholder="联系人QQ"  
+	                                    onChange={(e) => { this.setState({ qqs: e.target.value }); }} />
+	                    </FormItem>
+	                    <FormItem className="half-item"
+	                            {...formItemLayout}
+	                            label="电子邮箱" >
+	                              <Input value={this.state.emails} placeholder="电子邮箱"  
+	                                    onChange={(e) => { this.setState({ emails: e.target.value }); }} />
 	                    </FormItem>
                     </div>
                     <FormItem wrapperCol={{ span: 12, offset: 4 }}>

File diff suppressed because it is too large
+ 3052 - 12
js/component/manageCenter/customer/individualCustomer/queryCustomer.jsx


+ 1 - 1
js/component/tools.js

@@ -795,7 +795,7 @@ module.exports = {
             return theType;
         }
     },
-    //是否实名认证currentMember
+    //是否实名认证
      getCertification: function (e) {
          if (e) {
             let theType = '';

+ 7 - 1
template/template.html

@@ -6,6 +6,10 @@
     <title>
         <%= htmlWebpackPlugin.options.title %>
     </title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap.min.css">
+
+
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap-theme.min.css">
     <!--<script>
            window.userData = {
                mobile: "13600000000",
@@ -28,7 +32,9 @@
 </head>
 
 <body>
-    <div id="root"></div>
+    <div id="root">
+    	
+    </div>
 </body>
 
 </html>