Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
===================================================================
diff -u -r14417 -r16317
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java	(.../SupplierManagerImpl.java)	(revision 14417)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java	(.../SupplierManagerImpl.java)	(revision 16317)
@@ -182,6 +182,23 @@
 	}
 
 	@Override
+	public List<Map<String, Object>> searchSupplier(String inputText, String type) {
+		String sql = "where (po.spelling like '%" + inputText
+				   + "%' or po.wbCode like '%" + inputText
+				   + "%' or po.companyName like '%" + inputText
+				   + "%') and po.rentTousse = '" + type + "'";
+		@SuppressWarnings("unchecked")
+		List<Supplier> suppliers = objectDao.findBySql(Supplier.class.getSimpleName(), sql);
+		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
+		for (Supplier supplier : suppliers) {
+			Map<String, Object> temp = new HashMap<String, Object>();
+			temp.put("id", supplier.getId());
+			temp.put("name", supplier.getCompanyName());
+			mapList.add(temp);
+		}
+		return mapList;
+	}
+	/*@Override
 	public JSONObject searchSupplier(String inputText, String type) {
 		String sql = "where (po.spelling like '%" + inputText
 				   + "%' or po.wbCode like '%" + inputText
@@ -200,7 +217,7 @@
 		map.put("totalCount", suppliers.size());
 		map.put("data", mapList);
 		return JSONObject.fromObject(map);
-	}
+	}*/
 
 	@Override
 	public List<Supplier> getSupplierList(String type, String searchString) {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java
===================================================================
diff -u -r14417 -r16317
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java	(.../SupplierManager.java)	(revision 14417)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java	(.../SupplierManager.java)	(revision 16317)
@@ -1,6 +1,7 @@
 package com.forgon.disinfectsystem.basedatamanager.supplier.service;
 
 import java.util.List;
+import java.util.Map;
 
 import net.sf.json.JSONObject;
 
@@ -30,8 +31,9 @@
 
 	public List<Supplier> getSupplierProvidingTousse();
 	
-	public JSONObject searchSupplier(String inputText,String type);
-	
+	List<Map<String, Object>> searchSupplier(String inputText, String type);
+	// public JSONObject searchSupplier(String inputText,String type);
+
 	public String getSupplierByType(String type, String searchString, String returnFields);
 	
 	public List<Supplier> getSupplierList(String type, String searchString);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java
===================================================================
diff -u -r14417 -r16317
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java	(.../SupplierAction.java)	(revision 14417)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java	(.../SupplierAction.java)	(revision 16317)
@@ -11,6 +11,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.forgon.tools.util.PageUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
@@ -226,17 +227,8 @@
 			}
 			//供应商类型
 			String type = StrutsParamUtils.getPraramValue("supplierType", "");
-			JSONObject json = supplierManager.searchSupplier(supplierName,type);
-			HttpServletResponse response = StrutsParamUtils.getResponse();
-			response.setCharacterEncoding("UTF-8");
-			PrintWriter out;
-			try {
-				out = response.getWriter();
-				out.print(json);
-				out.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
+			List<Map<String, Object>> mapList = supplierManager.searchSupplier(supplierName, type);
+			PageUtil.outPutResult(PageUtil.getPagePara(), mapList);
 
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/godownEntryForm.js
===================================================================
diff -u -r14829 -r16317
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/godownEntryForm.js	(.../godownEntryForm.js)	(revision 14829)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/barcodeInformation/godownEntryForm.js	(.../godownEntryForm.js)	(revision 16317)
@@ -7,6 +7,7 @@
 
 	// 全部一次性物品
 	var allDiposableGoodsStore = new Ext.data.Store({
+        pageSize: 100,
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do?allItems=yes',
 			method : 'POST'
@@ -24,6 +25,7 @@
 	});
 
 	var supplierStore = new Ext.data.Store({
+        pageSize : 100,
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/supplierAction!getSupplierData.do?supplierType='+encodeURI(SUPPLIER_TYPE_SUPPLIER),
 			method : 'POST'
@@ -69,6 +71,8 @@
 			valueField : 'id',
 			displayField : 'name',
 			store : allDiposableGoodsStore,
+            pageSize : 100,
+            listWidth: 500,
 			forceSelection : true,
 			lazyInit : false,
 			triggerAction : 'all',
@@ -117,6 +121,7 @@
 			valueField : 'name',
 			displayField : 'name',
 			store : supplierStore,
+            pageSize : 100,
 			forceSelection : true,
 			lazyInit : false,
 			triggerAction : 'all',