Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp =================================================================== diff -u -r31240 -r33679 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 31240) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 33679) @@ -6,6 +6,7 @@ <%@page import="java.util.Calendar"%> <%@page import="com.forgon.disinfectsystem.packing.service.PackingManager,com.forgon.tools.SpringBeanManger"%> <%@page import="com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan"%> +<%@page import="com.forgon.disinfectsystem.entity.invoicemanager.Invoice"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation"%> <%@page import="com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager"%> <%@ page contentType="text/html; charset=UTF-8"%> @@ -43,6 +44,8 @@ var param_depart = '${param.depart}'; var param_departCode = '${param.departCode}'; var fontSize = '${fontSize}'; + var param_invoiceType = '${param.invoiceType}'; + var invoiceType = param_invoiceType || ''; @@ -144,6 +147,10 @@ if (notInWhiteList(sstsConfig, 'biologicalMonitoringWarning')) { biologicalMonitoringWarning = false; } + //发货计划 + var TYPE_CUSTOM = '<%=Invoice.TYPE_CUSTOM%>';//自定义发货 + var TYPE_APPLICATION = '<%=Invoice.TYPE_APPLICATION%>';//申领发货 + var TYPE_BORROWINGSINGLE = '<%=Invoice.TYPE_BORROWINGSINGLE%>';//借物单发货