Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java =================================================================== diff -u -r16295 -r16329 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 16295) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 16329) @@ -71,7 +71,8 @@ List> searchInsideTousseOrDiposableGoods(String simpleSpell, boolean isSearchTousse); - public JSONObject searchTousseForBorrowing(String simpleSpell); + // public JSONObject searchTousseForBorrowing(String simpleSpell); + List> searchTousseForBorrowing(String simpleSpell); public String searchInsideTousse(String simpleSpell,String pages,String countOfLI); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java =================================================================== diff -u -r16315 -r16329 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 16315) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java (.../TousseDefinitionAction.java) (revision 16329) @@ -1480,16 +1480,10 @@ try { spell = java.net.URLDecoder.decode(spell, "UTF-8"); - JSONObject json = null; + // JSONObject json = null; // 根据拼音码、五笔码获取内部器械包(器械包和自制物品) - json = tousseDefinitionManager.searchTousseForBorrowing(spell); - HttpServletResponse response = StrutsParamUtils.getResponse(); - response.setCharacterEncoding("UTF-8"); - PrintWriter out; - - out = response.getWriter(); - out.print(json); - out.close(); + List> mapList = tousseDefinitionManager.searchTousseForBorrowing(spell); + PageUtil.outPutResult(PageUtil.getPagePara(), mapList); } catch (IOException e) { e.printStackTrace(); } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r16295 -r16329 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 16295) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 16329) @@ -1485,6 +1485,12 @@ return JSONObject.fromObject(map); }*/ + @Override + public List> searchTousseForBorrowing(String simpleSpell){ + List> mapList = searchTousseBySimpleCodeAndAnyTousseTypeArr(simpleSpell, new String[] { TousseDefinition.PACKAGE_TYPE_INSIDE, TousseDefinition.PACKAGE_TYPE_HOMEMADE },false); + return mapList; + } +/* public JSONObject searchTousseForBorrowing(String simpleSpell){ List> mapList = new ArrayList>(); mapList = searchTousseBySimpleCodeAndAnyTousseTypeArr(simpleSpell, @@ -1496,6 +1502,7 @@ map.put("data", mapList); return JSONObject.fromObject(map); } +*/ /** * 触摸屏回收 */ Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js =================================================================== diff -u -r15709 -r16329 --- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js (.../borrowingTousseForm.js) (revision 15709) +++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js (.../borrowingTousseForm.js) (revision 16329) @@ -36,6 +36,7 @@ * 创建借物单的明细节点 */ var tousseAndDiposableGoodsStoreForBorrowing = new Ext.data.Store({ + pageSize: 100, proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseDataForBorrowing.do', method : 'POST' @@ -657,6 +658,7 @@ displayField : 'displayName', width : 430, store : tousseAndDiposableGoodsStoreForBorrowing, + pageSize : 100, forceSelection : true, lazyInit : true, triggerAction : 'all',