Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r19547 -r20103
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 19547)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 20103)
@@ -1,6 +1,6 @@
 var entityName = "发货单";
 var grid;
-var tousseTypeDataArray = [['一次性物品','一次性物品'],['器械包','器械包'],['敷料包','敷料包'],['消毒物品','消毒物品'],['自定义器械包','自定义器械包'],['外来器械包','外来器械包'],['外来器械拆分小包','外来器械拆分小包'],['外部代理灭菌','外部代理灭菌']];
+var tousseTypeDataArray = [['全部','全部'],['一次性物品','一次性物品'],['器械包','器械包'],['敷料包','敷料包'],['消毒物品','消毒物品'],['自定义器械包','自定义器械包'],['外来器械包','外来器械包'],['外来器械拆分小包','外来器械拆分小包'],['外部代理灭菌','外部代理灭菌']];
 var rd = new Ext.data.JsonReader({
 	fields : [
 	    {name : 'id'},
@@ -1840,8 +1840,7 @@
 			}
 		},
 		anchor : '95%'
-	},
-	{
+	},{
 		text : '物品类型:'
 	},{
 		xtype : 'multiSelect',
@@ -1852,7 +1851,7 @@
 		allowBlank : true,
 		editable : false,
 		fieldLabel:'类型',
-		width : 300,
+		width : 150,
 		emptyText:'请选择物品类型',
 		mode:'local',
 		store : new Ext.data.SimpleStore({
@@ -1863,14 +1862,62 @@
 		triggerAction : 'all',
 		listeners : {
 			select : function(combo, record, index){
-				refreshList();
-			},
-			render : function() {
-				Ext.getCmp('tousseType').selectAll();
+				if (record.get('value') == '全部') {
+					if (record.get('checked')) {
+						combo.selectAll()
+					} else {
+						combo.deselectAll()
+					}
+				}
+			    grid.dwrReload();
 			}
 		},
 		anchor : '95%'
     },{
+		text : '申请单类型:',
+		hidden: !sstsConfig.accordingToApplyTypeFilter
+	},{
+		xtype: 'multiSelect',
+		hidden: !sstsConfig.accordingToApplyTypeFilter,
+		store : new Ext.data.Store({
+	        proxy: new Ext.data.HttpProxy({
+	        	url : WWWROOT + '/disinfectSystem/invoicePlanAction!getAllApplyType.do?neddCustomDeliveryType=yes',
+	            method: 'POST'
+	        }),
+	        reader: new Ext.data.JsonReader({
+	                root: 'data',
+	                totalProperty: 'totalCount'
+	            }, [{name: 'applyType', mapping: 'applyType'}]
+	        )
+	    }),
+		fieldLabel: '请单类型',
+		displayField: 'applyType',
+		valueField: 'applyType',
+		allowBlank : true,
+		editable : false,
+		width : 150,
+		emptyText:'请选择申请单类型',
+		triggerAction: 'all',
+		listWidth: 200,
+		mode: 'remote',
+		//这个要设置成false,不然多选鼠标离开之后,combo上面的值不会显示
+		forceSelection : false,
+		listeners: {
+			select: function (combo, record, index) {
+				if (record.get('applyType') == '全部') {
+					if (record.get('checked')) {
+						combo.selectAll()
+					} else {
+						combo.deselectAll()
+					}
+				}
+				
+				var dom = document.getElementById('parm_s_applyType');
+			    dom.value = combo.getValue();
+			    grid.dwrReload();
+			}
+		}
+	},{
 		type : 'button',
 		text : '打印'+entityName,
 		hidden : !(sstsConfig.printInvoiceVersion==2),