Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp =================================================================== diff -u -r14735 -r14765 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 14735) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 14765) @@ -1,4 +1,3 @@ - <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> <%@page import="com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance"%> @@ -9,6 +8,7 @@ <%@page import="com.forgon.tools.SpringBeanManger"%> <%@page import="com.forgon.directory.acegi.tools.AcegiHelper"%> + @@ -33,15 +33,28 @@ - - + + + + <% String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); String orgUnitName = AcegiHelper.getLoginUser().getCurrentOrgUnitName(); @@ -55,19 +68,78 @@ request.setAttribute("orgUnitName",orgUnitName); %> + + + + + + + +
+

+
+ + + + +
+ +
+
+ + + + + + + +
+ +
+
+ + +
+
+ +
+
+
+ + + + + +
+
+
+ + +
+
+
    +
+
+
+ +
+ - - - - - - - -
-

-
- - - - -
- -
-
- - - - - - - -
- -
-
- - -
-
- -
-
-
- - - - - -
-
-
- - -
-
-
    -
-
-
- -
- - + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r14296 -r14765 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 14296) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 14765) @@ -1,4 +1,3 @@ - <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> @@ -8,6 +7,7 @@ <%@page import="com.forgon.directory.acegi.tools.AcegiHelper"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance,com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError,com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> + @@ -16,7 +16,6 @@ 消毒供应中心质量追溯管理系统 - @@ -35,10 +34,6 @@ - - - + + + + <% String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); String orgUnitName = AcegiHelper.getLoginUser().getCurrentOrgUnitName(); @@ -105,21 +108,20 @@ + + + - - + +