liting2017 7 years ago
parent
commit
c10974e9ea

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

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

+ 3 - 3
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -2072,13 +2072,13 @@ const MyClient = Form.create()(React.createClass({
                         }} >
                         <Button>上传批量内容</Button>
                     </Upload>                        
-	                {/*<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
+	               {adminData.isSuperAdmin?<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 							     <Button type="danger" style={{marginLeft:'10px'}}
 	                       			 disabled={!hasSelected} 
 	                       		 >删除<Icon type="minus" />
 	                        </Button>
-	                </Popconfirm> 
-	                */}
+	                </Popconfirm>:''
+	                }
 	                <AutoComplete
 				        className="certain-category-search"
 				        dropdownClassName="certain-category-search-dropdown"

+ 3 - 3
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -2093,11 +2093,11 @@ const IndividualCustomer = Form.create()(React.createClass({
                         <Button>上传批量内容</Button>
                     </Upload>                        
 										
-					{/*<Button style={{ marginRight:'10px' ,marginLeft:'10px'}} type='danger'
+					{adminData.isSuperAdmin?<Button style={{ marginRight:'10px' ,marginLeft:'10px'}} type='danger'
 	                        disabled={!hasSelected} 
 	                        onClick={this.delectRow}>删除<Icon type="minus" />
-	                </Button>
-	                */}
+	                </Button>:''
+	                }
 	               <AutoComplete
 				        className="certain-category-search"
 				        dropdownClassName="certain-category-search-dropdown"

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

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