Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r13553 -r13615 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13553) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13615) @@ -2019,6 +2019,11 @@ } checkLoadedAmount(); + + //如果是历史回收记录界面进入,则不显示终止按钮 + if('history' == params_recordType){ + $('#btn-terminate').hide(); + } } //装载数量根据其值更新背景色 Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r13571 -r13615 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 13571) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 13615) @@ -202,7 +202,7 @@ } function openHistoryRecyclingRecord(id){ - location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&id="+id; + location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&id="+id + "&recordType=" + "history"; //添加recordType,表示是历史记录 } function newRecyclingRecord(){ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r13553 -r13615 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 13553) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 13615) @@ -83,6 +83,7 @@ var params_appId = '${param.recyclingApplicationId}'; var params_barcode = '${param.barcode}'; var params_id = '${param.id}'; +var params_recordType = '${param.recordType}'; var params_type = ${supplyRoomType}; document.write(''); @@ -153,7 +154,7 @@ - +