Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r34767 -r35104 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 34767) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 35104) @@ -487,7 +487,7 @@ var today = '<%=request.getAttribute("today")%>'; var toussePriceFluctuation = '<%=request.getAttribute("toussePriceFluctuation")%>'; -var actionType_confirmReturn = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN%>'; //确认归还 +var ACTION_TYPE_CONFIRM_RETURN = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN%>'; //确认归还 var ACTION_TYPE_EARLY_RETURN = '<%=ForeignTousseApplication.ACTION_TYPE_EARLY_RETURN%>'; //提前归还 var ACTION_TYPE_ADD = '<%=ForeignTousseApplication.ACTION_TYPE_ADD%>'; //新增 var mouseHoverEventOfApply = '${mouseHoverEventOfApply}'; Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp =================================================================== diff -u -r33909 -r35104 --- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 33909) +++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 35104) @@ -91,6 +91,9 @@ var isIE6OrIE7 = top.Ext4.isIE6 || top.Ext4.isIE7; var grid; +var ACTION_TYPE_CONFIRM_RETURN = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN%>'; //确认归还 +var ACTION_TYPE_EARLY_RETURN = '<%=ForeignTousseApplication.ACTION_TYPE_EARLY_RETURN%>'; //提前归还 + //显示加急级别和加急数量 var SSTS_ShowUrgentLevelAndUrgentAmount = false; Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp =================================================================== diff -u -r34896 -r35104 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 34896) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 35104) @@ -20,7 +20,7 @@