Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js =================================================================== diff -u -r14678 -r16315 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js (.../departmentAppTemplateForm.js) (revision 14678) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js (.../departmentAppTemplateForm.js) (revision 16315) @@ -98,6 +98,7 @@ }); //器械包数据源 var tousseStore = new Ext.data.Store({ + pageSize: 100, proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchComboTousseData.do', method : 'POST' @@ -116,6 +117,7 @@ }); //一次性物品数据源 var diposableGoodsStore = new Ext.data.Store({ + pageSize : 100, proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do?allItems=no', method : 'POST' @@ -269,12 +271,14 @@ }); var departJsonStore = new Ext.data.Store({ + pageSize: 100, proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do', method : 'POST' }), reader : new Ext.data.JsonReader({ - root : 'data' + root : 'data', + totalProperty : 'totalCount', },[ {name : 'id',mapping : 'id'}, {name : 'name',mapping : 'name'} @@ -400,6 +404,8 @@ displayField : 'name', width : 285, store : departJsonStore, + pageSize : 100, + listConfig: {width: 300}, forceSelection : true, lazyInit : true, triggerAction : 'all', @@ -517,6 +523,8 @@ displayField : 'displayName', width : 280, store : tousseStore, + pageSize : 100, + listConfig: {width: 300}, forceSelection : true, lazyInit : true, triggerAction : 'all', @@ -612,6 +620,8 @@ displayField : 'displayName', width : 280, store : diposableGoodsStore, + pageSize : 100, + listConfig: {width: 300}, forceSelection : true, lazyInit : true, triggerAction : 'all', Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java =================================================================== diff -u -r16295 -r16315 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 16295) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 16315) @@ -1681,14 +1681,8 @@ try { spell = java.net.URLDecoder.decode(spell, "UTF-8"); Map result = tousseDefinitionManager.searchComboGoods(spell, TousseDefinition.PACKAGE_TYPE_INSIDE_AND_DISINFECTION,false,false,null); - JSONObject json = JSONObject.fromObject(result); - HttpServletResponse response = StrutsParamUtils.getResponse(); - response.setCharacterEncoding("UTF-8"); - PrintWriter out; - - out = response.getWriter(); - out.print(json); - out.close(); + List> data = (List>) result.get("data"); + PageUtil.outPutResult(PageUtil.getPagePara(), data); } catch (IOException e) { e.printStackTrace(); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java =================================================================== diff -u -r16274 -r16315 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 16274) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 16315) @@ -1046,16 +1046,7 @@ } } } - HttpServletResponse response = StrutsParamUtils.getResponse(); - try { - response.setCharacterEncoding("utf-8"); - JSONObject returnObj = new JSONObject(); - returnObj.put("data", jsonArray); - response.getWriter().print(returnObj.toString()); - response.getWriter().close(); - } catch (IOException e) { - e.printStackTrace(); - } + PageUtil.outPutResult(PageUtil.getPagePara(), jsonArray); } /**