dengzhiguo il y a 6 ans
Parent
commit
b70e07940f

+ 1 - 1
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -706,7 +706,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				} else {
 					message.warning(data.error[0].message);
 				};
-				this.loadData(this.state.pageNo);
+				this.loadData(Math.min(this.state.pageNo==undefined?1:this.state.pageNo,Math.ceil((this.state.pagination.total-1)/10)));
 			}.bind(this));
 		}else{
 			message.warning('请输入转交人姓名')

+ 3 - 3
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -452,7 +452,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				} else {
 					message.warning(data.error[0].message);
 				};
-				this.loadData(this.state.ispage);
+				this.loadData(Math.min(this.state.ispage==undefined?1:this.state.ispage,Math.ceil((this.state.pagination.total-1)/10)));
 			}.bind(this));
 		}else{
 			message.warning('请输入转交人姓名')
@@ -559,14 +559,14 @@ const IntentionCustomer = Form.create()(React.createClass({
                         }} >
                         <Button>上传批量内容</Button>
                     </Upload>  
-                    */}
+                    
 	               {adminData.isSuperAdmin?<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 							     <Button type="danger" style={{marginLeft:'10px'}}
 	                       			 disabled={!hasSelected} 
 	                       		 >删除<Icon type="minus" />
 	                        </Button>
 	                </Popconfirm>:''
-	                }
+	                }*/}
 	                <AutoComplete
 				        className="certain-category-search"
 				        dropdownClassName="certain-category-search-dropdown"

+ 2 - 2
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -352,13 +352,13 @@ const IntentionCustomer = Form.create()(React.createClass({
                     </span>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>                      
-	               {adminData.isSuperAdmin?<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>:''
-	                }
+	                }*/}
 	                <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 - 0
js/component/tools.js

@@ -479,6 +479,7 @@ module.exports = {
                     };
                 };
                 callback('https://view.officeapps.live.com/op/view.aspx?src=' + encodeURIComponent(location.origin + globalConfig.context + "/open/preview?" + data.data));
+            	console.log('https://view.officeapps.live.com/op/view.aspx?src=' + encodeURIComponent(location.origin + globalConfig.context + "/open/preview?" + data.data));
             }
         });
     },
@@ -500,6 +501,7 @@ module.exports = {
                     };
                 };
                 callback('https://view.officeapps.live.com/op/view.aspx?src=' + encodeURIComponent(location.origin + globalConfig.context + "/open/customer?" + data.data));
+            	console.log('https://view.officeapps.live.com/op/view.aspx?src=' + encodeURIComponent(location.origin + globalConfig.context + "/open/customer?" + data.data));
             }
         });
     },