liting2017 7 years ago
parent
commit
cfccdd0373

+ 1 - 1
js/component/manageCenter/customer/customerData/companyCustomer.jsx

@@ -2023,7 +2023,7 @@ const PublicCustomer = Form.create()(React.createClass({
 	                        </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>                                         				
-					<Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px',display:adminData.isSuperAdmin?'inline-block':'none'}}
+					<Button type='danger' style={{marginRight:'10px' ,marginLeft:'10px',display:adminData.isSuperAdmin?'inline-block':'none'}}
 	                        disabled={!hasSelected}
 	                        onClick={this.delectRow}>删除<Icon type="minus" />
 	                </Button>			

+ 12 - 6
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -990,6 +990,14 @@ const MyClient = Form.create()(React.createClass({
 			message.warning('请选择地区');
 			return false;
 		};
+		if(isNaN(this.state.registeredCapital)){
+			message.warning('注册资本只能输入数字')
+			return false;
+		};
+		if(isNaN(this.state.enterpriseScale)){
+			message.warning('单位规模只能输入数字')
+			return false;
+		}
 		this.setState({
 			selectedRowKeys: [],
 		});
@@ -2065,7 +2073,7 @@ const MyClient = Form.create()(React.createClass({
                         <Button>上传批量内容</Button>
                     </Upload>                        
 	                <Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
-							     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px'}}
+							     <Button type="danger" style={{marginLeft:'10px'}}
 	                       			 disabled={!hasSelected} 
 	                       		 >删除<Icon type="minus" />
 	                        </Button>
@@ -2075,7 +2083,6 @@ const MyClient = Form.create()(React.createClass({
 				        dropdownClassName="certain-category-search-dropdown"
 				        dropdownMatchSelectWidth={false}
 				        dropdownStyle={{ width: 120 }}
-				        
 				        style={{ width: '120px'}}
 				        dataSource={options}
 				        placeholder="输入转交人姓名"
@@ -2089,8 +2096,7 @@ const MyClient = Form.create()(React.createClass({
 				        <Input />
 				      </AutoComplete>  
 					<Button type="primary" onClick={this.changeAssigner}  disabled={!hasSelected} >转交</Button>  
-	                <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                        disabled={!hasSelected}
+	                <Button type='primary' disabled={!hasSelected}
                         onClick={this.changeRow}>转为公共客户<Icon /></Button>
 	                <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <Button type="primary" className="addButton" onClick={this.addClick}>新增客户<Icon type="plus" /></Button> 
@@ -2294,7 +2300,7 @@ const MyClient = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="注册资本"
 						                            >
-						                                <Input placeholder="注册资本" value={this.state.registeredCapital} 
+						                                <Input placeholder="注册资本" value={this.state.registeredCapital}  maxLength='6'
 											    				onChange={(e)=>{this.setState({registeredCapital:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -2302,7 +2308,7 @@ const MyClient = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="单位规模"
 						                            >
-						                                <Input placeholder="单位规模" value={this.state.enterpriseScale} 
+						                                <Input placeholder="单位规模" value={this.state.enterpriseScale} maxLength='1'
 											    				onChange={(e)=>{this.setState({enterpriseScale:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"

+ 1 - 1
js/component/manageCenter/customer/customerService/myBusiness.jsx

@@ -1062,7 +1062,7 @@ const MyBusiness = Form.create()(React.createClass({
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button> 
 	                <Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
-					     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px'}}
+					     <Button style={{ marginRight:'10px' ,marginLeft:'10px'}} type='danger'
                    			 disabled={!hasSelected} 
                     		 >删除<Icon type="minus" />
            			     </Button>

+ 5 - 4
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -2093,7 +2093,7 @@ const IndividualCustomer = Form.create()(React.createClass({
                         <Button>上传批量内容</Button>
                     </Upload>                        
 										
-					<Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px'}}
+					<Button style={{ marginRight:'10px' ,marginLeft:'10px'}} type='danger'
 	                        disabled={!hasSelected} 
 	                        onClick={this.delectRow}>删除<Icon type="minus" />
 	                </Button>
@@ -2116,17 +2116,18 @@ const IndividualCustomer = Form.create()(React.createClass({
 				        <Input />
 				      </AutoComplete>  
 					<Button type="primary" onClick={this.changeAssigner}  disabled={!hasSelected} >转交</Button>  
-					<Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
+					<Button type="primary"
                         disabled={!hasSelected}
                         onClick={this.changeRow}>转为公共客户<Icon /></Button>
-	                  <Button style={{marginRight:'10px',background: "#595a5c", border: "none",color: "#fff" }}												
+	                  {/*<Button style={{marginRight:'10px'}} type="primary" 											
 	                        disabled 
 	                        onClick={this.delectRow}>锁定
 	                  </Button>
-	                  <Button style={{marginRight:'10px',background: "#11a2c6", border: "none",color: "#fff" }}												
+	                  <Button style={{marginRight:'10px'}} type="primary" 											
 	                         disabled
 	                        onClick={this.delectRow}>激活
 	                  </Button>	
+	                  */}
 	                  <Button type="primary" className="addButton" onClick={this.addClick}>新增客户<Icon type="plus" /></Button> 
                       <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className='clearfix' style={{marginTop:'5px'}}>

+ 1 - 1
js/component/manageCenter/customer/individualCustomer/queryCustomer.jsx

@@ -1953,7 +1953,7 @@ const QueryCustomer = Form.create()(React.createClass({
                     </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>                                    					
-					<Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px',display:adminData.isSuperAdmin?'inline-block':'none'}}
+					<Button type='danger' style={{marginRight:'10px' ,marginLeft:'10px',display:adminData.isSuperAdmin?'inline-block':'none'}}
 	                        disabled={!hasSelected} 
 	                        onClick={this.delectRow}>删除<Icon type="minus" />
 	                </Button>