Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r19627 -r19716
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 19627)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 19716)
@@ -43,7 +43,8 @@
 // 打开表单的对象
 var openFormObj = {
     tousseType : '',
-    form : ''
+    form : '',
+    tousseGroups : ''
 }
 //表单的打印状态(1是未打印,2是已打印)
 var formPrinted = 1;
@@ -53,8 +54,9 @@
  * 打开对应的表单
  * @param form			申请表单类型
  * @param tousseType	器械包类型
+ * @param tousseGroups	器械包分组（需要显示的器械包分组，为空则显示全部的器械包分组）
  */
-function openApplication(tousseType, form) {
+function openApplication(tousseType, form, tousseGroups) {
 	//限制同一个科室（供应室除外）只能申请一张申请单
 	if (sstsConfig.limitApply && form == comboApplicationForm && !isSupplyRoomUser) {
 		var existRecyclingApplication = null;
@@ -77,9 +79,9 @@
 	handleDepartStore.proxy.extraParams.applyDepartCode = "";
 	comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = "";
 	//设置打开表单的对象
-    setOpenFormObj(tousseType, form);
+    setOpenFormObj(tousseType, form, tousseGroups);
 	if (!isUndefinedOrNullOrEmpty(form)){
-		comboApplication(0, "true",false,false,true,form, false, '');
+		comboApplication(0,false,false,true,form, tousseGroups, false, '');
 	}
 }
 
@@ -88,9 +90,10 @@
  * @param tousseType 类型
  * @param form 表单类型
  */
-function setOpenFormObj(tousseType, form) {
+function setOpenFormObj(tousseType, form, tousseGroups) {
     openFormObj.tousseType = tousseType;
     openFormObj.form = form;
+    openFormObj.tousseGroups = tousseGroups;
 }
 
 /**
@@ -1732,9 +1735,9 @@
 		var status = recyclingApplication.status;
 		var type = recyclingApplication.type;
 		if(type == comboApplicationForm || type == recyclingCreateApplicationForm){
-			comboApplication(recyclingApplication.id,"true",hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, recyclingApplication.committedStatus,recyclingApplication.handleDepartCoding);
+			comboApplication(recyclingApplication.id,hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, '', recyclingApplication.committedStatus,recyclingApplication.handleDepartCoding);
 		}else if(type == tousseApplicationForm || type == diposableGoodsApplicationForm || type == disinfectGoodsApplicationForm){
-			comboApplication(recyclingApplication.id,"true",hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, recyclingApplication.committedStatus,recyclingApplication.handleDepartCoding);
+			comboApplication(recyclingApplication.id,hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, '', recyclingApplication.committedStatus,recyclingApplication.handleDepartCoding);
 		}
 		
 		//设置“申请单id”、“流水号”、“申请人”、“住院号”、“申请科室”、“结算科室”、“处理科室”、“申请时间”、“备注”、“项目”10个属性
@@ -2668,7 +2671,7 @@
 			hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 1,
 			handler : function() {
                 formPrinted = 1;
-				openApplication("",comboApplicationForm);
+				openApplication("",comboApplicationForm,'');
 			}
 		},{
 			text : sstsConfig.packageName || '申请器械包',
@@ -2678,7 +2681,7 @@
 			hidden : SSTS_PACKAGE_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isFirstSupplyRoomUser),
 			handler : function() {
                 formPrinted = 1;
-                openApplication(invoicePlanForTousseType_Tousse, tousseApplicationForm);
+                openApplication(invoicePlanForTousseType_Tousse, tousseApplicationForm, '');
 			}
 		},{
 			text : '申请一次性物品',
@@ -2688,7 +2691,7 @@
 			hidden : SSTS_DisposableGoods_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isFirstSupplyRoomUser),
 			handler : function() {
                 formPrinted = 1;
-                openApplication(invoicePlanForTousseType_Diposable, diposableGoodsApplicationForm);
+                openApplication(invoicePlanForTousseType_Diposable, diposableGoodsApplicationForm, '');
 			}
 		},{
 			text : '申请消毒物品',
@@ -2698,7 +2701,7 @@
 			hidden : SSTS_Disinfection_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isFirstSupplyRoomUser),
 			handler : function() {
                 formPrinted = 1;
-                openApplication(invoicePlanForTousseType_Tousse, disinfectGoodsApplicationForm);
+                openApplication(invoicePlanForTousseType_Tousse, disinfectGoodsApplicationForm, '');
 			}
 		},{
 			text : '申请外来器械',