Browse Source

面板启动参数解析为空时不再显示sql/用户设置用户信息保存与面板分配使用一个接口按钮

zhuth 8 years ago
parent
commit
6b8d4c1f16

+ 1 - 1
kanban-console/src/main/webapp/resources/app/store/user.js

@@ -1,6 +1,6 @@
 Ext.define('erp.store.user',{
 	extend:'Ext.data.Store',
-	fields:['code','name','password','role'],
+	fields:['code','name','password','role', 'panelCodes'],
 	proxy:{
 		type:'ajax',
 		url:'user/get/all',

+ 6 - 0
kanban-console/src/main/webapp/resources/app/view/desktop/BoardManageWindow.js

@@ -40,6 +40,12 @@ Ext.define('erp.view.desktop.BoardManageWindow',{
 					Ext.Msg.alert('警告', '有必填项未填!');
 				}
 			}
+		}, {
+			xtype: 'button',
+			text: '退出',
+			handler: function(btn) {
+				btn.ownerCt.ownerCt.close();
+			}
 		}],	
 		me.callParent(arguments);
 	},

+ 6 - 47
kanban-console/src/main/webapp/resources/app/view/desktop/BoardParamWindow.js

@@ -60,33 +60,27 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 				var paramFieldSet = form.items.items[0];
 				paramFieldSet.removeAll();
 				var comboxs = [];
-				items.map(function(item, index) {
-					var data = item.optionalValues.map(function(v) {
+				Ext.Array.each(items, function(item, index) {
+					var data = item.optionalValues ? item.optionalValues.map(function (v) {
 						return {
 							value: v,
 							name: v
 						}
-					})
-					var defaultValue = item.optionalValues.indexOf(data[0].value) != -1 ? data[0].value : '';
-					for(var p of me.resData.parameters) {
-						if(p.code == item.code) {
-							defaultValue = p.value || data[0].value;
-						}
-					}
+					}) : []
 					var combox = new Ext.form.field.ComboBox({
 						fieldLabel: item.name,
 						name: item.code,
 						store: Ext.create('Ext.data.Store', {
 							fields: ['value', 'name'],
-							data : data
+							data: data
 						}),
 						queryMode: 'local',
 						displayField: 'name',
 						valueField: 'value',
-						value: defaultValue,
+						value: item.value || '',
 						allowBlank: false,
 					});  
-					comboxs.push(combox);
+						comboxs.push(combox);
 				});
 				paramFieldSet.add(comboxs);
 				if(comboxs.length == 0) {
@@ -120,41 +114,6 @@ Ext.define('erp.view.desktop.BoardParamWindow',{
 					grid.getSelectionModel().deselectAll();
 					grid.selectModel();
 				},
-				select:function( e, record, index, eOpts ){
-					// var grid = Ext.getCmp('modelGrid');
-					// var ctr = this.body.dom.getElementsByTagName('tr')[index];
-					// var s = ctr.getElementsByTagName('td')[0].children[0].children[0];
-					// var order = grid.selectedIndex++;
-					// grid.setSelectedIndex(s, order, 'add');
-				},
-
-				deselect:function( e, record, index, eOpts ){
-					// var grid = Ext.getCmp('modelGrid');
-					// var ctr = this.body.dom.getElementsByTagName('tr')[index];
-					// var s = ctr.getElementsByTagName('td')[0].children[0].children[0];
-					// grid.selectedIndex--;
-					// var order = '';
-					// var currentOrder = grid.setSelectedIndex(s, order, 'remove');
-					// grid.resetSelectedIndex(currentOrder);
-				}
-			},
-			/** 设置选中模板项的顺序 */
-			setSelectedIndex: function(selecter, order, AR) {
-				var oldOrder = selecter.innerText;
-				selecter.innerText = order;
-				selecter.classList[AR]('selectedIndex');
-				return oldOrder;
-			},
-			/** 更新选中项的值 */
-			resetSelectedIndex: function(currentOrder) {
-				var selectedRecords = this.getSelectionModel().getSelection();
-				for(var i = 0; i < selectedRecords.length; i++) {
-					var tr = this.body.dom.getElementsByTagName('tr')[this.getStore().indexOf(selectedRecords[i])]; // 选中行tr
-					var sbox = tr.getElementsByTagName('td')[0].children[0].children[0]; // 选中行勾选框
-					if(Number(sbox.innerText) > Number(currentOrder)) {
-						sbox.innerText--;
-					}
-				}
 			},
 			loadGridData: function() {
 				var grid = this;

+ 6 - 6
kanban-console/src/main/webapp/resources/app/view/desktop/ParamValueEditor.js

@@ -18,14 +18,14 @@ Ext.define('erp.view.desktop.ParamValueEditor',{
                 xtype: 'textarea',
                 name: 'value'
             }],
-            // bbar: [{
+            // tbar: [{
             //     xtype: 'button',
-            //     text: '检测',
+            //     text: '执行SQL',
             //     handler: function(btn) {
-            //         me.save();
-            //         btn.ownerCt.ownerCt.ownerCt.close();
+            //         var sql = Ext.getCmp('paramValueForm').getForm().findField('value').getValue();
+            //         alert(sql);
             //     }
-            // }]
+            // }],
             load: function() {
                 var form = this;
                 var sql = me.paramRecord.get('optionalValues');
@@ -71,7 +71,7 @@ Ext.define('erp.view.desktop.ParamValueEditor',{
                 handler: function() {
                     var grid = Ext.getCmp('paramValueGrid');
                     grid.getStore().add({value: ''});
-                    grid.getPlugin().startEditByPosition({ row: grid.getStore().getCount() - 1, column: 0 });
+                    grid.getPlugin().startEditByPosition({ row: grid.getStore().getCount() - 1, column: 1 });
                 }
             },{
                 xtype: 'button',

+ 0 - 251
kanban-console/src/main/webapp/resources/app/view/plugin/clickOptions.js

@@ -1,251 +0,0 @@
-Ext.define('erp.view.plugin.clickOptions', {
-	ptype : 'clickoptions',
-	constructor : function(cfg) {
-		if (cfg) {
-			Ext.apply(this, cfg);
-		}
-	},
-	init : function(grid) {
-		var me = this;
-		this.grid = grid;
-		this.execable = this.isExecable();
-		if (grid.view) {
-			grid.view.on('cellcontextmenu', me.onContextMenu, me);
-			grid.view.on('containercontextmenu', me.onContainerContextMenu, me);
-		}
-	},
-	isExecable: function() {
-		return Ext.isChrome && Number(Ext.userAgent.match(/chrome\/[\d.]+/gi)[0].replace(/[^0-9.]/ig,"").substring(0, 2)) > 42;
-	},
-	onContextMenu: function(view, td, colIdx, record, tr, rowIdx, e) {
-		var me = this;
-		me.showOptions(view, td, colIdx, record, tr, rowIdx, e);
-	},
-	onContainerContextMenu:function(view,e,eOpts){
-		e.preventDefault();
-		var me = this;
-		var container = true;
-		var menu =  me.createMenu(view,null,container);
-		menu.showAt(e.getXY());
-	},
-	showOptions : function(view, td, colIdx, record, tr, rowIdx, e) {
-		var me = this, 
-			column = view.getHeaderByCell(td) ||
-				view.ownerCt.headerCt.getHeaderAtIndex(colIdx);
-		if (!column) {
-			return;
-		}
-		var dataIndex = column.dataIndex;
-		e.preventDefault();
-	    var menu = me.createMenu(view,record);
-		menu.showAt(e.getXY());
-		menu.grid = view.ownerCt;
-		menu.record = record;
-		menu.column = column;
-		menu.dataIndex = dataIndex;
-		menu.cell = view.getCell(menu.record, menu.column);
-	},
-	createMenu : function(view,record,container) {
-		var me = this;
-		return Ext.create('Ext.menu.Menu', {
-			items: [{
-				text : '修改',
-				disabled:container,
-				handler: function(item) {
-					if(me.execable) {
-						var m = item.ownerCt;
-						me.updateNode(view,record);
-					}
-				}
-			},{
-				text : '删除',
-				disabled:container,
-				handler: function(item) {
-					if(me.execable) {
-						var m = item.ownerCt;
-						me.deleteNode(view,record);
-					}
-				}
-			},{
-				text : '新增子节点',
-				disabled:container,
-				handler: function(item) {
-					if(me.execable) {
-						var m = item.ownerCt;
-						me.addChildNode(view,record);
-					}
-				}
-			},{
-		    	xtype: 'menuseparator'
-		    },{
-				text : '新增根节点',
-				handler : function(t, e) {
-					var m = t.up('menu');
-					me.addRootNode(view,record);
-		    	}
-			}]
-		});
-	},
-	updateNode:function(view,record){
-		var me = this;
-		var loader = record;
-		var win = loader.win;
-		if(!win){
-			win = me.createWin(view,record);
-			loader.win = win;
-		}
-		win.show();		
-	},
-	deleteNode:function(view,record){
-		var me = this;
-		console.log(record);
-		Ext.Msg.confirm('提示','是否确定删除当前节点及其子节点',function(btn){
-			if(btn=='yes'){
-				Ext.Ajax.request({
-					url:basePath + 'boardtemplate/deleteTemplate.action',
-					method:'post',
-					params:{
-						id:record.get('id')
-					},
-					callback:function(options,success,response){
-						var res = Ext.decode(response.responseText);
-						if(res.success){
-							Ext.Msg.alert('提示','删除成功!');
-							me.refreshTree();
-						}else if(res.exceptionInfo){
-							Ext.Msg.alert('警告',res.exceptionInfo);
-						}
-					}
-				});
-			}
-		});
-	},
-	addChildNode:function(view,record){
-		var me = this;
-		var loader = record;
-		var childWin = loader.childWin;
-		if(!childWin){
-			childWin = me.createWin(view,record,true);
-			loader.childWin = childWin;
-		}
-		childWin.show();
-	},
-	addRootNode:function(view,record){
-		var me = this;
-		var loader = view;
-		var win = loader.win;
-		if(!win){
-			win = me.createWin(view);
-			loader.win = win;
-		}
-		win.show();
-	},
-	createWin:function(view,record,ifAddChild){
-		var me = this;
-		var title;
-		var update = false;
-		if(ifAddChild){
-			title = "新增子节点";
-		}else if(record!=null){
-			title = "修改";
-			update = true;
-		}else{
-			title = "新增根节点"
-		}
-		var win = Ext.create('Ext.window.Window',{
-			title:title,
-			closeAction:'hide',
-			modal:true,
-			width:380,
-			height:250,
-			layout:'fit',
-			items:[{
-				xtype:'form',
-				border:false,
-				padding:5,
-				style:'background:white',
-				layout:'column',
-				defaults:{
-					labelWidth:60
-				},
-				items:[{
-					xtype:'textfield',
-					fieldLabel:'节点名称',
-					columnWidth:0.75,
-					margin:'0 0 10px 0',
-					name:'bt_name',
-					value:update?record.get('text'):'',
-					allowBlank:false
-				},{
-					xtype:'textarea',
-					fieldLabel:'备注',
-					columnWidth:1,
-					dataIndex:'remark',
-					name:'bt_desc',
-					value:update?record.get('desc'):''
-				},{
-					xtype:'hidden',
-					name:'bt_id',
-					value:update?record.get('id'):''
-				},{
-					xtype:'hidden',
-					name:'bt_subof',
-					value:update?record.get('parentId'):(ifAddChild?record.get('id'):0)
-				}],
-				buttons:[{
-					text:'保存',
-					formBind:true,
-					handler:function(btn){
-						var form = btn.ownerCt.ownerCt;
-						var res = me.save(form);
-						if(res){
-							view.win = null;
-						}
-					}
-				},{
-					text:'取消',
-					handler:function(btn){
-						btn.ownerCt.ownerCt.ownerCt.close();
-					}
-				}]/*,
-				listeners:{
-					afterrender:function(form){
-						form.getForm().setValues(record.data);
-					}
-				}*/
-			}]
-		});	
-		return win;
-	},
-	save:function(form){
-		var me = this;
-		var values = form.getForm().getValues();
-		if(values){
-			var data = Ext.encode(form.getForm().getValues());	
-			console.log(data);
-			Ext.Ajax.request({
-				url:basePath + 'boardtemplate/saveTemplate.action',
-				method:'post',
-				params:{
-					formStore:data
-				},
-				callback:function(options,success,response){
-					var res = Ext.decode(response.responseText);
-					if(res.success){
-						Ext.Msg.alert('提示','保存成功!');
-						form.ownerCt.close();
-						me.refreshTree();
-						return true;
-					}else if(res.exceptionInfo){
-						Ext.Msg.alert('警告',res.exceptionInfo);
-					}
-				}
-			});
-		}
-		return false;
-	},
-	refreshTree:function(){
-		var tree = Ext.getCmp('templatetree');
-		tree.setRootNode();
-	}
-});

+ 0 - 262
kanban-console/src/main/webapp/resources/app/view/plugin/tplgridcontextmenu.js

@@ -1,262 +0,0 @@
-Ext.define('erp.view.plugin.tplgridcontextmenu', {
-	ptype : 'tplgridcontextmenu',
-	constructor : function(cfg) {
-		if (cfg) {
-			Ext.apply(this, cfg);
-		}
-	},
-	init : function(grid) {
-		var me = this;
-		this.grid = grid;
-		this.execable = this.isExecable();
-		if (grid.view) {
-			grid.view.on('cellcontextmenu', me.onContextMenu, me);
-			grid.view.on('containercontextmenu', me.onContainerContextMenu, me);
-		}
-	},
-	isExecable: function() {
-		return Ext.isChrome && Number(Ext.userAgent.match(/chrome\/[\d.]+/gi)[0].replace(/[^0-9.]/ig,"").substring(0, 2)) > 42;
-	},
-	onContextMenu: function(view, td, colIdx, record, tr, rowIdx, e) {
-		var me = this;
-		me.showOptions(view, td, colIdx, record, tr, rowIdx, e);
-	},
-	onContainerContextMenu:function(view,e,eOpts){
-		e.preventDefault();
-		var me = this;
-		var container = true;
-		var menu =  me.createMenu(view,null,container);
-		menu.showAt(e.getXY());
-	},
-	showOptions : function(view, td, colIdx, record, tr, rowIdx, e) {
-		var me = this, 
-			column = view.getHeaderByCell(td) ||
-				view.ownerCt.headerCt.getHeaderAtIndex(colIdx);
-		if (!column) {
-			return;
-		}
-		var dataIndex = column.dataIndex;
-		e.preventDefault();
-	    var menu = me.createMenu(view,record);
-		menu.showAt(e.getXY());
-		menu.grid = view.ownerCt;
-		menu.record = record;
-		menu.column = column;
-		menu.dataIndex = dataIndex;
-		menu.cell = view.getCell(menu.record, menu.column);
-	},
-	createMenu : function(view,record,container) {
-		var me = this;
-		return Ext.create('Ext.menu.Menu', {
-			items: [{
-				text : '修改',
-				disabled:container,
-				handler: function(item) {
-					if(me.execable) {
-						var m = item.ownerCt;
-						me.updateNode(view,record);
-					}
-				}
-			},{
-				text : '删除',
-				disabled:container,
-				handler: function(item) {
-					if(me.execable) {
-						var m = item.ownerCt;
-						me.deleteNode(view,record);
-					}
-				}
-			},{
-		    	xtype: 'menuseparator'
-		    },{
-				text : '新增模板',
-				handler : function(t, e) {
-					var m = t.up('menu');
-					me.addRootNode(view,record);
-		    	}
-			}]
-		});
-	},
-	updateNode:function(view,record){
-		var me = this;
-		var loader = record;
-		var win = loader.win;
-		if(!win){
-			win = me.createWin(view,record);
-			loader.win = win;
-		}
-		win.show();		
-	},
-	deleteNode:function(view,record){
-		var me = this;
-		Ext.Msg.confirm('提示','是否删除该模板?',function(btn){
-			if(btn=='yes'){
-				Ext.Ajax.request({
-					url:'template/delete/'+record.get('code'),
-					method:'post',
-					callback:function(options,success,response){
-						var res = Ext.decode(response.responseText);
-						var tree = Ext.getCmp('templatetree');
-						if(res){
-							var tplEditpanel = Ext.getCmp('templateeditpanel');
-							Ext.Msg.alert('提示','删除成功!');
-							me.refreshTree(tree);
-							tree.setButtonDisabled(true);
-							tplEditpanel.clear();
-						}else if(res.exceptionInfo){
-							Ext.Msg.alert('警告',res.exceptionInfo);
-						}
-					}
-				});
-			}
-		});
-	},
-	addRootNode:function(view,record){
-		var me = this;
-		var loader = view;
-		var win = loader.win;
-		if(!win){
-			win = me.createWin(view);
-			loader.win = win;
-		}
-		win.show();
-	},
-	createWin:function(view,record){
-		var me = this;
-		var title;
-		var update = false;
-		if(record!=null){
-			title = "修改";
-			update = true;
-		}else{
-			title = "新增模板"
-		}
-		var win = Ext.create('Ext.window.Window',{
-			title:title,
-			closeAction:'hide',
-			modal:true,
-			width:380,
-			height:250,
-			layout:'fit',
-			items:[{
-				xtype:'form',
-				border:false,
-				padding:5,
-				style:'background:white',
-				layout:'column',
-				defaults:{
-					labelWidth:60
-				},
-				items:[{
-					xtype:'textfield',
-					fieldLabel:'模板名称',
-					columnWidth:0.75,
-					margin:'0 0 10px 0',
-					name:'name',
-					value:update?record.get('name'):'',
-					allowBlank:false
-				},{
-					xtype:'textarea',
-					fieldLabel:'模板备注',
-					columnWidth:1,
-					dataIndex:'remark',
-					name:'description',
-					value:update?record.get('description'):''
-				},{
-					xtype:'hidden',
-					name:'code',
-					value:update?record.get('code'):''
-				}],
-				buttons:[{
-					text:'保存',
-					formBind:true,
-					handler:function(btn){
-						var form = btn.ownerCt.ownerCt;
-						var res = me.save(form);
-						if(res){
-							view.win = null;
-						}
-					}
-				},{
-					text:'取消',
-					handler:function(btn){
-						btn.ownerCt.ownerCt.ownerCt.close();
-					}
-				}]/*,
-				listeners:{
-					afterrender:function(form){
-						form.getForm().setValues(record.data);
-					}
-				}*/
-			}]
-		});	
-		return win;
-	},
-	save:function(form){
-		var me = this;
-		var values = form.getForm().getValues();
-		if(!values.dataSourceCode){
-			var dataSource = me.getDatasource();
-			if(dataSource.length<=0){
-				Ext.Msg.alert('提示','未找到数据源,请先联系管理员进行设置!');
-			}
-			values.dataSourceCode = dataSource[0].code;
-		}
-		var type;
-		if(values){
-			var code = values.code;
-			if(code){
-				type = "updatePart";
-			}else{
-				type = "savePart";
-				delete values.code;
-			}
-			var data = Ext.encode(values);	
-			Ext.Ajax.request({
-				url:'template/' + type,
-				method:'post',
-				async:false,
-				params:{
-					json:data
-				},
-				callback:function(options,success,response){
-					var res = Ext.decode(response.responseText);
-					if(res){
-						if(typeof(res.success)!=='undefined'&&!res.success){
-							Ext.Msg.alert('警告',res.message);
-						}else{
-							Ext.Msg.alert('提示','保存成功!');
-							form.ownerCt.close();
-							me.refreshTree();
-							return true;							
-						}
-					}
-				}
-			});
-		}
-		return false;
-	},
-	getDatasource:function(){
-		var datasource = null;
-		Ext.Ajax.request({
-			url:'datasource/get',
-			method:'GET',
-			async:false,
-			callback:function(options,success,response){
-				var res = Ext.decode(response.responseText);
-				if(res){
-					if(typeof(res.success)!=='undefined'&&!res.success){
-						Ext.Msg.alert('警告',res.message);
-					}else{
-						datasource =  res.content;							
-					}
-				} 
-			}
-		});
-		return datasource;
-	},
-	refreshTree:function(){
-		var tree = Ext.getCmp('templatetree');
-		tree.getStore().reload();
-	}
-});

+ 28 - 73
kanban-console/src/main/webapp/resources/app/view/user/UserSetting.js

@@ -68,42 +68,34 @@ Ext.define('erp.view.user.UserSetting',{
 		    ],
 			listeners:{
 				afterrender:function(grid){
-					grid.store.load();
+					grid.store.load(function(record, e, success) {
+						if(!success) {
+							Ext.Msg.alert('失败', '权限不足!');
+						}
+						grid.getSelectionModel().select(0);
+					});
+				},
+				beforeselect: function() {
+					var userboardgrid = Ext.getCmp('userboardgrid');
+					// userboardgrid.getSelectionModel().setLocked(false);
 				},
 				select:function(grid, record, index, eOpts ){
 					var userboardgrid = Ext.getCmp('userboardgrid');
-					userboardgrid.getSelectionModel().setLocked(false);
-					userboardgrid.getSelectionModel().deselectAll();
+					// userboardgrid.getSelectionModel().deselectAll();
 					if(record.get('role')=='Admin'){
 						userboardgrid.getSelectionModel().selectAll(); //管理员默认全勾选
-						userboardgrid.getSelectionModel().setLocked(true);
+						// userboardgrid.getSelectionModel().setLocked(true);
 						return;
 					}
 
-					userboardgrid.getEl().mask('loading...');
-					Ext.Ajax.request({
-						url:'panel/get/byUser/' + record.get('code'),
-						method:'POST',
-						callback:function(options,success,response){
-							userboardgrid.getEl().unmask();
-							if(response.responseText == '') return;
-							var res = JSON.parse(response.responseText);
-							if(success) {
-								res = res instanceof Array ? res : [res];
-								var sc = res.map(function(r) {return r.code});
-								var selRec = new Array();
-								Ext.Array.each(userboardgrid.store.data.items,function(item){
-									if(sc.indexOf(item.get('code')) != -1){
-										selRec.push(item);
-									}
-								});
-								
-								userboardgrid.getSelectionModel().select(selRec);
-							}else {
-								Ext.Msg.alert('失败', res.message);
-							}
+					var panelCodes = record.get('panelCodes');
+					var selRec = new Array();
+					Ext.Array.each(userboardgrid.store.data.items,function(item){
+						if(panelCodes.indexOf(item.get('code')) != -1){
+							selRec.push(item);
 						}
 					});
+					userboardgrid.getSelectionModel().select(selRec);
 				}
 			},
 			tbar:[{
@@ -164,6 +156,7 @@ Ext.define('erp.view.user.UserSetting',{
 			id:'userboardgrid',
 			region:'east',
 			flex:1,
+			selectedPanelCodes: [],
 			columns:[{
 				header:'名称',
 				dataIndex:'name',
@@ -178,12 +171,6 @@ Ext.define('erp.view.user.UserSetting',{
 				text:'<span style="font-size:13px;font-weight:bold">面板</font>',
 				height:24,
 				style:'line-height:24px'
-			}, '->', {
-				xtype: 'button',
-				text: '保存',
-				handler: function() {
-					me.saveRelationPanel();
-				}
 			}],
 			store:Ext.data.StoreManager.lookup('desktopboard'),
 			selModel: Ext.create('Ext.selection.CheckboxModel'),
@@ -192,19 +179,16 @@ Ext.define('erp.view.user.UserSetting',{
 					grid.store.load();
 				},
 				select:function(grid, record, index, eOpts ){
-					var userGrid = Ext.getCmp('userSettingGrid');
-					var r = userGrid.getSelectionModel().getSelection()[0];
-					var panelCodes = r.get('panelCodes') || [];
-					panelCodes.push(record.get('code'));
-					r.set('panelCodes', panelCodes);
+					var grid = Ext.getCmp('userboardgrid');
+					grid.selectedPanelCodes.push(record.get('code'));
 				},
 				deselect:function( e, record, index, eOpts ){
-					var userGrid = Ext.getCmp('userSettingGrid');
-					var r = userGrid.getSelectionModel().getSelection()[0];
-					var panelCodes = r.get('panelCodes') || [];
-					panelCodes.splice(panelCodes.indexOf(record.get('code')), 1);
-					r.set('panelCodes', panelCodes);
+					var grid = Ext.getCmp('userboardgrid');
+					grid.selectedPanelCodes.splice(grid.selectedPanelCodes.indexOf(record.get('code')), 1);
 				}
+			},
+			getSelectedPanels: function() {
+				return this.selectedPanelCodes;
 			}
 		}];
 		this.callParent(arguments);
@@ -272,7 +256,9 @@ Ext.define('erp.view.user.UserSetting',{
 		var userboardgrid = Ext.getCmp('userboardgrid');
 		var record = grid.getSelectionModel().getSelection()[0];
 		if(record){
+			var selectedPanels = userboardgrid.getSelectedPanels();
 			var values = record.data;
+			values.panelCodes = selectedPanels;
 			var type;
 			if(!record.get('code')){
 				type = 'save';
@@ -313,37 +299,6 @@ Ext.define('erp.view.user.UserSetting',{
 			Ext.Msg.alert('提示','未选中用户!');
 		}
 	},
-	saveRelationPanel: function() {
-		var me = this;
-		var grid = me.getGrid();
-		var userboardgrid = Ext.getCmp('userboardgrid');
-		var userRecord = grid.getSelectionModel().getSelection()[0];
-
-		if(userRecord){
-			var el = userboardgrid.getEl();
-			var values = userRecord.data;
-			el.mask('loading...');
-			Ext.Ajax.request({
-				url:'panel/assignPanel/',
-				method:'POST',
-				params:{
-					userCode: values.code,
-					panelCodes: values.panelCodes
-				},
-				traditional: true,
-				callback:function(options,success,response){
-					el.unmask();
-					var res = Ext.decode(response.responseText);
-					if(success){
-					}else{
-						Ext.Msg.alert('提示','保存失败,原因:'+res.message);
-					}
-				}
-			});	
-		}else {
-			Ext.Msg.alert('提示','未选中用户!');
-		}
-	},
 	reSelect:function(grid,code){
 		var record;
 		Ext.Array.each(grid.store.data.items,function(item){