Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp
===================================================================
diff -u -r23582 -r23934
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp	(.../departmentMonthlyDetailDSInvoiceItemView.jsp)	(revision 23582)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp	(.../departmentMonthlyDetailDSInvoiceItemView.jsp)	(revision 23934)
@@ -62,5 +62,9 @@
     <input type="hidden" id="parm_s_monthSearch" name="parm_s_monthSearch" value="">
     <input type="hidden" id="parm_s_departSearch" name="parm_s_departSearch" value="">
 </form>
+<!-- 构造form表单,用于向后台post提交参数,解决各种特殊符号(如#等)的问题 -->
+<form id="reportHiddenForm" style="display:none;" target="thisIframe" method="post">
+	<input type="hidden" id="goodsNameSearch" name="goodsNameSearch" value="">
+</form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r23582 -r23934
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 23582)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 23934)
@@ -26,8 +26,8 @@
 		var departCoding = $Id('departCoding').value;
 		var goodsSearch = $Id('goodsSearch').value;
 		var batch = $Id('batch').value;
-			goodsSearch = goodsSearch.replace(/\%/g,'%25');
-			goodsSearch = goodsSearch.replace('#','%23');
+			//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;
@@ -57,7 +57,7 @@
 		if(sstsConfig.enableDiscountPrice){
 			jasperreportFileName = "DepartmentMonthDetailDiscountPrice.jasper";
 		}
-		window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?"
+		/*window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?"
 				+ "reportName=departmentMonthDetail&jasperreportName=" + jasperreportFileName
 				+ "&departSearch=" + departSearch 
 				+ "&startTime=" + startTime 
@@ -70,9 +70,23 @@
 				+ "&departCoding=" + departCoding
 				+ "&disposableGoodsType=" + disposableGoodsType
 				+ "&showCustonTousseAmount=" + showCustonTousseAmount,
-				 'thisIframe', '_self');
-		
-						
+				 'thisIframe', '_self');*/
+		var url = WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?"
+				+ "reportName=departmentMonthDetail&jasperreportName=" + jasperreportFileName
+				+ "&departSearch=" + departSearch 
+				+ "&startTime=" + startTime 
+				+ "&endTime=" + endTime
+				+ "&goodsSearch=" + goodsSearch
+				+ "&tousseType=" + tousseType
+				+ "&goodsType=" + goodsType
+				+ "&searchType=" + searchType
+				+ "&batch=" + batch 
+				+ "&departCoding=" + departCoding
+				+ "&disposableGoodsType=" + disposableGoodsType
+				+ "&showCustonTousseAmount=" + showCustonTousseAmount;
+		document.getElementById("goodsNameSearch").value = goodsSearch;
+		document.getElementById("reportHiddenForm").action = url;
+		document.getElementById("reportHiddenForm").submit();
 	}
 
 	Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {};
@@ -272,6 +286,34 @@
 			},{
 				columnWidth : .25,
 				layout : 'form',
+				labelWidth : 100,
+				hidden : !sstsConfig.departMonthReportAndDetailReportEnableSupplyRoomCondition,
+				items : [{
+				    xtype : 'combo',
+					id : 'orgUnitCoding',
+					name : 'orgUnitCoding',
+					queryParam : 'spell',
+					fieldLabel : '供应室',
+					minChars : 0,
+					valueField : 'id',
+					displayField : 'name',
+					store : departJsonStore,
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true,
+					anchor : '95%',
+					listeners:{
+						select:function(combo, record, index){
+							Ext.getCmp("departCoding").setValue(record.get('id'));
+						}
+					}
+				}]
+			},{
+				columnWidth : .25,
+				layout : 'form',
 				labelWidth : 90,
 				items : [{
 					xtype : 'combo',
@@ -432,5 +474,5 @@
 		//departSearch.disable();
 	}
 	
-	reloadReport()
+	reloadReport();
 });
\ No newline at end of file
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r23164 -r23934
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 23164)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 23934)
@@ -560,7 +560,8 @@
 					null);
 			String searchType = StrutsParamUtils.getPraramValue("searchType",
 					null);
-			String goodsSearch = StrutsParamUtils.getPraramValue("goodsSearch",
+			//由于是中文,且还含有特殊符号(如#),所以改由form进行post提交,参数名另取防止与原ext的元素id相同
+			String goodsSearch = StrutsParamUtils.getPraramValue("goodsNameSearch",
 					null);
 			String batch = StrutsParamUtils.getPraramValue("batch", null);
 			String disposableGoodsType = StrutsParamUtils.getPraramValue("disposableGoodsType", "");