Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r33048 -r33049
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 33048)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 33049)
@@ -14,7 +14,6 @@
 	} else {
 		departMode = "local";
 	}
-	// 记录cookie（3步）
 	var diposableGooodsStore = new Ext.data.JsonStore({
 		fields: ['typeName', 'typeValue'],
 		url: WWWROOT + '/disinfectSystem/diposableGoodsAction!getDisposableGoodsTypeForFilter.do',
@@ -67,8 +66,6 @@
 		var departCoding = Ext.getCmp('departSearch').getValue();
 		var goodsSearch = $Id('goodsSearch').value;
 		var batch = $Id('batch').value;
-		//goodsSearch = goodsSearch.replace(/\%/g,'%25');
-		//goodsSearch = goodsSearch.replace('#','%23');
 		var tousseType = $Id('tousseType').value;
 		var searchType = $Id('searchType').value;
 		var disposableGoodsType = Ext.getCmp("disposableGoodsType").value;
@@ -83,7 +80,6 @@
 			invoicePlanDepartCoding = "";
 		}
 
-
 		var departGroupRawValue = Ext.getCmp('departGroup').getRawValue();
 		var departGroupValue = Ext.getCmp('departGroup').getValue();
 		if (departGroupRawValue == '全部' || departGroupRawValue == '' || departGroupRawValue.trim() == '') {
@@ -387,7 +383,7 @@
 					}
 				}]
 			}, {
-				columnWidth: .4,
+				columnWidth: .25,
 				layout: 'form',
 				labelWidth: 120,
 				items: [{
@@ -399,7 +395,7 @@
 					minChars: 0,
 					valueField: 'id',
 					displayField: 'displayName',
-					anchor: '100%',
+					anchor: '95%',
 					store: tousseAndDiposableGoodsStore,
 					pageSize: 100,
 					width: 400,
@@ -474,7 +470,7 @@
 					displayField: 'value',
 					store: tousseTypeStore,
 					forceSelection: false,
-					value: '全部',
+					value: '',
 					editable: false,
 					mode: 'local',
 					triggerAction: 'all',
@@ -522,11 +518,14 @@
 								}
 							}
 							combo.setValue(combo.getCheckedValue());
+						},
+						render: function (thiz) {
+							thiz.selectAll();
 						}
 					}
 				}]
 			}, {
-				columnWidth: .2,
+				columnWidth: .25,
 				layout: 'form',
 				labelWidth: 120,
 				items: [{
@@ -545,7 +544,7 @@
 					anchor: '95%'
 				}]
 			}, {
-				columnWidth: .21,
+				columnWidth: .25,
 				layout: 'form',
 				labelWidth: 120,
 				items: [{
@@ -687,7 +686,6 @@
 				layout: 'form',
 				labelWidth: 120,
 				id: 'goodsTypeElement',
-				hidden: true,
 				items: [{
 					xtype: 'combo',
 					fieldLabel: '高值耗材类型',
@@ -701,10 +699,17 @@
 					editable: false,
 					mode: 'local',
 					triggerAction: 'all',
-					anchor: '95%'
+					anchor: '95%',
+					listeners:{
+						render:function(){
+							setTimeout(function(){
+								Ext.getCmp('goodsTypeElement').hide();
+							}, 10);
+						}
+					}
 				}]
 			}, {
-				columnWidth: 0.2,
+				columnWidth: 0.25,
 				layout: 'form',
 				labelWidth: 120,
 				id: 'patternOfReportLable',