Index: ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js =================================================================== diff -u -r15992 -r17241 --- ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js (.../orgUnitExtView.js) (revision 15992) +++ ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js (.../orgUnitExtView.js) (revision 17241) @@ -14,7 +14,20 @@ alert("请选择要删除的组织单位!"); return false; } - OrgUnitTableManager.deleteOrgUnitByKeyIds(ids, function(){reloadTreeAndTable();}); + Ext.MessageBox.confirm("请确认","是否确定要删除选中的组织机构?",function(button, text){ + if("yes" == button){ + OrgUnitTableManager.deleteOrgUnitByKeyIds(ids, function(result){ + if(result){ + var jsonObj = Ext.decode(result); + if(jsonObj.success){ + reloadTreeAndTable(); + }else{ + showResult(jsonObj.message); + } + } + }); + } + }); } function search(searchText){ if(searchText!=null && searchText.length!=0){ @@ -190,6 +203,8 @@ {header: "部门编码", width: 150, dataIndex: 'orgUnitCoding', sortable: false, menuDisabled: true}, {header: "负责人", width: 150, dataIndex: 'principal', sortable: false, menuDisabled: true}, {header: "分管领导", width: 150, dataIndex: 'subLeadName', sortable: false, menuDisabled: true}, + {header: "拼音码", width: 150, dataIndex: 'spelling', sortable: false, menuDisabled: true}, + {header: "五笔码", width: 150, dataIndex: 'wbCode', sortable: false, menuDisabled: true}, {header: "数据来源", width: 100, dataIndex: 'source', sortable: false, menuDisabled: true}, //(陈家儒改) {id : 'order',header: "排序操作", width: 100, dataIndex: 'id', renderer : moveUpDown, sortable: false, menuDisabled: true} ]; @@ -202,6 +217,8 @@ {name: 'barcode'}, {name: 'orgUnitCoding'}, {name: 'principal'}, + {name: 'spelling'}, + {name: 'wbCode'}, {name: 'source'}, {name: 'subLeadName'} ]; @@ -286,13 +303,23 @@ columns: columns, autoExpandColumn: 'order', searchDisableIndexes:['id','barcode'], + rememberSelected:false, frame:true }, readerDetail, OrgUnitTableManager.findOrgUnitTableList, dwrCallParams //这个参数只是占位作用 ); + var store = grid.getStore(); + store.on("beforeload", function(thiz, options) { + Ext.getBody().mask("正在加载中,请稍候..."); + }); + + store.on("load", function(thiz, options) { + Ext.getBody().unmask(); + }); + viewport = new Ext.Viewport({ layout:'border', items:[{ //西面的树