Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r21844 -r22079
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 21844)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 22079)
@@ -159,6 +159,7 @@
     <input type="hidden" id="parm_s_status" name="parm_s_status" value="all">
     <input type="hidden" id="parm_s_departCodes" name="parm_s_departCodes" value="all">
     <input type="hidden" id="parm_s_tousseGroupId" name="parm_s_tousseGroupId" value="all">
+    <input type="hidden" id="parm_s_tousseTypes" name="parm_s_tousseTypes">
     <input type="hidden" id="parm_s_applyType" name="parm_s_applyType">
     <input type="hidden" id="parm_s_print" name="parm_s_print" value="all">
 </form>
@@ -188,13 +189,9 @@
 var foreignTousseApplicationForm = '<%=InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION%>';//外来器械包申请单
 var expansionTousseForm = '<%=InvoicePlan.TYPE_TOUSSE_EXPANSION_FORM%>';//普通器械包扩充申请单
 var expensiveGoodsForm = '<%=InvoicePlan.TYPE_EXPENSIVEGOODS_FORM%>';//高值耗材申请单
-var tousseTypeCustom = '<%=TousseDefinition.PACKAGE_TYPE_CUSTOM%>';//自定义器械包
 var tousseTypeDisinfect = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>;<%=TousseDefinition.PACKAGE_TYPE_STERILIZATION%>';//消毒物品和灭菌物品
 var endCause = ${endCause};
-var tousseType_tousse = '<%=TousseDefinition.PACKAGE_TYPE_INSIDE%>';
-var tousseType_disinfectGoods = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>';
 var tousseType_diposableGoods = '一次性物品';
-var tousseType_foreignTousse = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
 
 //包大小定义
 var PACKAGE_SIZE_HUGE = '<%=TousseDefinition.PACKAGE_SIZE_HUGE%>';
@@ -230,6 +227,15 @@
 }
 var TYPE_SUPPLIER = encodeURIComponent('<%=Supplier.SUPPLIER_TYPE_RENTTOUSSE%>');
 
+var ALL = '全部';
+var tousseType_tousse = '<%=TousseDefinition.PACKAGE_TYPE_INSIDE%>';  //器械包
+var PACKAGE_TYPE_DRESSING = '<%=TousseDefinition.PACKAGE_TYPE_DRESSING%>';  //敷料包
+var tousseType_disinfectGoods = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>';  //消毒物品
+var PACKAGE_TYPE_FOREIGNPROXY = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY%>';  //外部代理灭菌
+var tousseType_foreignTousse = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';  //外来器械包
+var tousseTypeCustom = '<%=TousseDefinition.PACKAGE_TYPE_CUSTOM%>';  //自定义器械包
+
+
 var SSTS_RecycApplication_Create = true;
 <operation:authorize ifAnyGranted="SSTS_RecycApplication_Create">
 SSTS_RecycApplication_Create = false;