Index: ssts-web/src/main/webapp/systemmanage/userExtView.js =================================================================== diff -u -r14035 -r14209 --- ssts-web/src/main/webapp/systemmanage/userExtView.js (.../userExtView.js) (revision 14035) +++ ssts-web/src/main/webapp/systemmanage/userExtView.js (.../userExtView.js) (revision 14209) @@ -86,7 +86,7 @@ function deleteUser(){ var ids = grid.getSelectedValues('user.id', ';'); var userName = ";" + grid.getSelectedValues('user.name', ';') + ";"; - if(ids.Trim() == ""){ + if(ids == ""){ //(陈家儒改).trim() alert("请选择要删除的用户!"); return false; } @@ -165,7 +165,7 @@ msg : "同步用户中...
由于数据量比较大,更新时间可能比较长,请耐心等待。
如超过4分钟,页面还没有响应,请手动刷新页面!" }); mask.show(); - DataSynchronizationTableManager.syncUser({ + DataSynchronizationTableManager.syncUser({ //调用后台的类 callback:function(success){ if (success) { showResult("同步成功"); @@ -268,6 +268,7 @@ {header: "登录名", width: 100, dataIndex: 'user.name', sortable: false, menuDisabled: true}, {header: "所属科室", width: 200, dataIndex: 'user.orgUnitNames', sortable: false, menuDisabled: true, renderer : returnEmptyValueIfNull}, {header : '条码',width: 150, dataIndex: 'user.barcode', sortable: false}, + {header : '数据来源',width: 100, dataIndex: 'user.source', sortable: false}, //陳家儒: {id:'operationDescription', header: "拥有角色", width: 150, dataIndex: 'user.roleNames', sortable: false, menuDisabled: true, renderer : returnEmptyValueIfNull}, {header: "排序操作", width: 100, dataIndex: 'id', renderer : moveUpDown, hidden: true, sortable: false, menuDisabled: true}, {header: "拼音码", width: 100, dataIndex: 'user.spelling', hidden: true, sortable: false, menuDisabled: true}, @@ -282,6 +283,7 @@ {name: 'user.barcode'}, {name: 'user.name'}, {name: 'user.orgUnitNames'}, + {name: 'user.source'}, //陳家儒: {name: 'user.roleNames'} ]; @@ -291,7 +293,7 @@ {type: 'string', dataIndex: 'user.fullName'} ]}); - var tbar= [{ + var tbar= [{ //工具按鈕 text:"同步用户数据", tooltip : '同步用户数据', iconCls : 'icon_refresh', @@ -381,7 +383,7 @@ columns: columns, autoExpandColumn: 'operationDescription', isShowSearchField: true, - searchDisableIndexes : ['id','user.barcode','user.orgUnitNames','user.roleNames'], + searchDisableIndexes : ['id','user.barcode','user.orgUnitNames','user.source','user.roleNames'], frame:false }, readerDetail, @@ -391,7 +393,7 @@ viewport = new Ext.Viewport({ layout:'border', - items:[{ + items:[{ //西面的树(tp) region:'west', id:'west-panel', lines : false, @@ -464,7 +466,7 @@ } } ] - },{ + },{ //中间的数据表格 region:'center', margins:'0 5 5 0', xtype : 'panel',