Index: ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialAppropriationView.js
===================================================================
diff -u -r18549 -r18614
--- ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialAppropriationView.js	(.../materialAppropriationView.js)	(revision 18549)
+++ ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialAppropriationView.js	(.../materialAppropriationView.js)	(revision 18614)
@@ -721,7 +721,7 @@
 		filters:[
 	        {type: 'string',  dataIndex: 'serialNumber'},
 	        {type: 'string',  dataIndex: 'operator'},
-	        {type: 'string',  dataIndex: 'warehouseName'},
+	        {type: 'string',  dataIndex: 'wareHouseName'},
 	        {type: 'string',  dataIndex: 'targetWareHouseName'},
 	        {type: 'date',  dataIndex: 'time'},
 	        {type: 'string',  dataIndex: 'remark'}
@@ -796,7 +796,7 @@
 	}
 	var startDayofMonth = dt.getFullYear() + "/" + v + "/01";
 	var tBarForm = new TBarForm();
-	tBarForm.setKeyWordStore(WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionData.do');
+	tBarForm.setKeyWordStore(WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionDatas.do?selectType=material',100);//100每页显示多少条记录
 	var queryForm = tBarForm.initForm();
 	
 	var tableContent;