Index: ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.jsp
===================================================================
diff -u -r24232 -r26620
--- ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.jsp	(.../expressInvoiceView.jsp)	(revision 24232)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/expressInvoiceView.jsp	(.../expressInvoiceView.jsp)	(revision 26620)
@@ -1,3 +1,5 @@
+<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%>
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="com.forgon.disinfectsystem.entity.tousseitem.TousseItem"%>
 <%@page import="java.util.Calendar"%>
@@ -79,28 +81,9 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/invoice/invoicePrintModule.js"></script>
 
 <script type="text/javascript">
-	var project = '${profile}';
-    var SSTS_DeviceMaintenance_Create = true;
-    <operation:authorize ifAnyGranted="SSTS_DeviceMaintenance_Create">
-    SSTS_DeviceMaintenance_Create = false;
-    </operation:authorize>
-    var SSTS_DeviceMaintenance_Update = true;
-    <operation:authorize ifAnyGranted="SSTS_DeviceMaintenance_Update">
-    SSTS_DeviceMaintenance_Update = false;
-    </operation:authorize>
-    var SSTS_DeviceMaintenance_Delete = true;
-    <operation:authorize ifAnyGranted="SSTS_DeviceMaintenance_Delete">
-    SSTS_DeviceMaintenance_Delete = false;
-    </operation:authorize>
-</script>
-
-<script type="text/javascript">
  var invoicePlanType_disinfect = '<%= InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM%>';
- //申请日期下拉选项数据
- <%--var applyDateDataArray = [['全部',''],['今天','${today}'],['昨天','${yesterday}'],['近三天','${lastThreeDays}'],['近一周','${lastSixDays}']];--%>
  //物品类型下拉选项数据
- //var tousseTypeDataArray = [['一次性物品','<%=TousseItem.DIPOSABLE_YES %>'],['非一次性物品','<%=TousseItem.DIPOSABLE_NO %>']];
- var tousseTypeDataArray = [['一次性物品','一次性物品'],['普通器械包','普通器械包'],['消毒物品','消毒物品']];
+ var tousseTypeDataArray = [['<%=DisposableGoods.TYPE_NAME %>','<%=DisposableGoods.TYPE_NAME %>'],['<%=TousseDefinition.PACKAGE_TYPE_INSIDE %>','<%=TousseDefinition.PACKAGE_TYPE_INSIDE %>'],['<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION %>','<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION %>']];
  //已选择的条件(申请日期、物品类型、申请单号)
  var selectedApplyDate = "";
  var selectedTousseType = "";