Index: ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
===================================================================
diff -u -r18549 -r18588
--- ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 18549)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 18588)
@@ -34,6 +34,48 @@
 	{name : 'userecordDepartCoding'}
 ]);
 
+var departRecord = Ext.data.Record.create([
+      {name : 'id'}, 
+      {name : 'name'}
+  ]);                      
+
+var departJsonStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do',
+		method : 'POST'
+	}),
+	reader : new Ext.data.JsonReader({
+		root : 'data'
+	},departRecord
+	),
+	listeners:{
+		load : function(thiz,records,options){
+			if(records.length != 1){
+				// thiz.insert(0, new departRecord({id:"-1",name:"全部"}));
+				// Ext.getCmp('departSearch').setValue("全部");
+			}else{
+				Ext.getCmp('departSearch').setValue(records[0].data.name);
+			}
+		}
+	}
+});
+departJsonStore.load();
+
+//材料
+var materialStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionDatas.do?selectType=material',
+		method : 'POST'
+	}),
+	reader : new Ext.data.JsonReader({
+		totalProperty : 'totalCount',
+		root : 'data'
+	}, [
+	    {name : 'id',mapping : 'id'},
+	    {name : 'name',mapping : 'name'}
+	])
+});
+
 //添加材料发货
 function addMaterialInvoice(id) {
 	//var myMask = new top.Ext.LoadMask(top.Ext.getBody() , {msg:"正在加载，请稍候..."});
@@ -843,7 +885,24 @@
     }
     
 }
-
+function initQueryValueAndReload() {
+	var departSearch = $Id('departSearch').value;
+	var startDate = $Id('startDate').value;
+	var endDate = $Id('endDate').value;
+	var code = Ext.getCmp('code').getValue();
+	if(startDate || endDate){
+		if(!compareDate(startDate,endDate)){
+			showResult("开始时间不能大于结束时间");
+			return;
+		}
+	}
+	
+	$Id('parm_s_startDate').value = startDate;
+	$Id('parm_s_endDate').value = endDate;
+	$Id('parm_s_keyWord').value = code;
+	$Id('parm_s_departSearch').value = departSearch;
+	grid.dwrReload();
+}
 /**
  * 修改记录
  * modifyRecord函数 触发modify函数调用，并传入当前列的值以及record.data对象
@@ -917,12 +976,6 @@
 			deleteMaterialInvoice(grid);
 		}
 	}, {
-		text : '刷新列表',
-		iconCls : 'btn_ext_refresh1',
-		handler : function() {
-			grid.dwrReload();
-		}
-	}, {
         text : '批量打印',
         iconCls : 'icon_print',
         handler : function() {
@@ -943,7 +996,96 @@
 		plugins: filters,
 		autoExpandColumn : 'operationRemark',
 		renderTo : 'gridDiv',
-		frame : false
+		frame : false,
+		listeners: {
+		render : function(grid) {
+		
+    	var tbar2 = new Ext.Toolbar ({
+    		items : [{
+					text : '申请科室:'
+				},{
+				    xtype : 'combo',
+					id : 'departSearch',
+					name : 'departSearch',
+					queryParam : 'spell',
+					minChars : 0,
+					width : 165,
+					valueField : 'name',
+					displayField : 'name',
+					 store : departJsonStore,
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true,
+					anchor : '95%'
+			},{
+				text : '物品名称:'
+			},{
+				xtype : 'combo',
+				id : 'code',
+				name : 'code',
+				queryParam : 'spell',
+				minChars : 0,
+				valueField : 'id',
+				displayField : 'name',
+				width : 165,
+				store : materialStore,
+				forceSelection : true,
+				lazyInit : true,
+				triggerAction : 'all',
+				hideTrigger : true,
+				typeAhead : false,
+				allowBlank : true,
+				anchor : '97%',
+				listeners : {
+					select : function(combo, record, index) {
+						Ext.getCmp('code').setValue(record.data.id);
+					}
+				}
+			},{
+				text : '开始日期:'
+			},{
+				xtype : 'datefield',
+				id : 'startDate',
+				name : 'startDate',
+				editable:true,
+				format:'Y-m-d',
+				altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+				allowBlank : true,
+				readOnly : false,
+				width : 100,
+				anchor : '95%'
+			},{
+				text : '结束日期:'
+			},{
+				xtype : 'datefield',
+				id : 'endDate',
+				name : 'endDate',
+				readOnly : false,
+				editable:false,
+				altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+				format:'Y-m-d',
+				allowBlank : true,
+				width : 100,
+				anchor : '95%'
+			   },{
+				text : '刷新列表',
+				iconCls : 'btn_ext_refresh1',
+				handler : function() {
+					initQueryValueAndReload();
+				}
+				}
+			   ]
+	        });
+	        tbar2.render(grid.tbar);
+	        	// 自动加载列表
+	       // Ext.getCmp('tousseType').selectAll();
+			// refreshList();
+	       }
+	}
+			
 	}, readerDetail,
 		InvoiceTableManager.findMaterialInvoiceTableList,
 		null