Index: ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.jsp =================================================================== diff -u -r15445 -r16146 --- ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.jsp (.../customInvoiceForm.jsp) (revision 15445) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.jsp (.../customInvoiceForm.jsp) (revision 16146) @@ -75,7 +75,7 @@ //申请日期下拉选项数据 var applyDateDataArray = [['全部',''],['今天','${today}'],['昨天','${yesterday}'],['近三天','${lastThreeDays}'],['近一周','${lastSixDays}']]; //物品类型下拉选项数据 - var tousseTypeDataArray = [['全部',''],['一次性用品','<%=TousseItem.DIPOSABLE_YES %>'],['非一次性用品','<%=TousseItem.DIPOSABLE_NO %>']]; + var tousseTypeDataArray = [['全部',''],['一次性物品','<%=TousseItem.DIPOSABLE_YES %>'],['非一次性物品','<%=TousseItem.DIPOSABLE_NO %>']]; //已选择的条件(申请日期、物品类型、申请单号) var selectedApplyDate = ""; var selectedTousseType = ""; Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp =================================================================== diff -u -r16046 -r16146 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 16046) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 16146) @@ -88,7 +88,7 @@ //申请日期下拉选项数据 <%--var applyDateDataArray = [['全部',''],['今天','${today}'],['昨天','${yesterday}'],['近三天','${lastThreeDays}'],['近一周','${lastSixDays}']];--%> //物品类型下拉选项数据 - var tousseTypeDataArray = [['全部',''],['一次性用品','<%=TousseItem.DIPOSABLE_YES %>'],['非一次性用品','<%=TousseItem.DIPOSABLE_NO %>']]; + var tousseTypeDataArray = [['全部',''],['一次性物品','<%=TousseItem.DIPOSABLE_YES %>'],['非一次性物品','<%=TousseItem.DIPOSABLE_NO %>']]; //已选择的条件(申请日期、物品类型、申请单号) var selectedApplyDate = ""; var selectedTousseType = "";