Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r37883 -r38007 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 37883) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 38007) @@ -248,6 +248,7 @@ var userName = '<%=request.getAttribute("userName")%>'; var secondOrgUnitCoding = '<%=request.getAttribute("orgUnitCoding")%>'; var secondOrgUnitName = '<%=request.getAttribute("orgUnitName")%>'; +var source = '${param.source}'; var fromLogin = '${fromLogin}'; var cleanBasketBarcodes = '${param.cleanBasketBarcodes}'; if(fromLogin == 'true'){ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp =================================================================== diff -u -r37933 -r38007 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 37933) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 38007) @@ -1535,7 +1535,7 @@ function cancel() { if (confirm("确认取消吗?")) { - location.href = 'awaitForRecycleList.jsp?resolution=${param.resolution}'; + location.href = 'awaitForRecycleList.jsp?resolution=${param.resolution}&source=${param.source}'; } } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r37981 -r38007 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 37981) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 38007) @@ -5411,10 +5411,10 @@ } else { if (count > 0) { setTimeout(function () { - location.href = encodeURI("awaitForRecycleList.jsp?resolution=" + resolution + "&voluntarilyUrgentItems=" + voluntarilyUrgentItemsString); + location.href = encodeURI("awaitForRecycleList.jsp?resolution=" + resolution + "&voluntarilyUrgentItems=" + voluntarilyUrgentItemsString + '&source=' + source); }, 700 * count); } else { - location.href = encodeURI("awaitForRecycleList.jsp?resolution=" + resolution + "&voluntarilyUrgentItems=" + voluntarilyUrgentItemsString); + location.href = encodeURI("awaitForRecycleList.jsp?resolution=" + resolution + "&voluntarilyUrgentItems=" + voluntarilyUrgentItemsString + '&source=' + source); } } } else { @@ -5601,7 +5601,7 @@ if (saveAndNew) { location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser; } else { - location.href = "awaitForRecycleList.jsp?resolution=" + resolution; + location.href = "awaitForRecycleList.jsp?resolution=" + resolution + '&source=' + source; } } else { alertDiv(result.message); @@ -5886,7 +5886,7 @@ var result = JSON.parse(resultStr); alertDiv(result.message); if (result.success) { - location.href = 'awaitForRecycleList.jsp?resolution=' + resolution; + location.href = 'awaitForRecycleList.jsp?resolution=' + resolution + '&source=' + source; } }, error: function (XMLHttpRequest, textStatus, errorThrown) { @@ -5918,7 +5918,7 @@ btn: ['确定', '取消'] }, function (index, layero) { // 确定按钮的回调 - location.href = 'awaitForRecycleList.jsp?resolution=' + resolution; + location.href = 'awaitForRecycleList.jsp?resolution=' + resolution + '&source=' + source; }, function (index) { //取消按钮 }); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r37940 -r38007 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 37940) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 38007) @@ -124,7 +124,7 @@ var departCoding = isUndefinedOrNullOrEmpty(departCoding) ? "" : departCoding; var rememberRecycleUser = CookieManager.getCookie("rememberRecycleUser"); location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" - + rememberRecycleUser + "&departName=" + departName + "&departCoding=" + departCoding; + + rememberRecycleUser + "&departName=" + departName + "&departCoding=" + departCoding + '&source=' + source; } function cancel() { if(source == ''){ @@ -1012,7 +1012,7 @@ //快速回收 function openQuickRecyclePage() { - location.href = "expressRecycleForTouchScreen.jsp?resolution=" + resolution + "&id=" + id; + location.href = "expressRecycleForTouchScreen.jsp?resolution=" + resolution + "&id=" + id + '&source=' + source; } function onmouseoutImg() { @@ -1023,7 +1023,7 @@ } //消毒物品回收 function openDisinfectionGoodsRecyclePage() { - location.href = "disinfectionGoodsRecycleForTouchScreen.jsp?resolution=" + resolution + "&id=" + id; + location.href = "disinfectionGoodsRecycleForTouchScreen.jsp?resolution=" + resolution + "&id=" + id + '&source=' + source; } function setApplyTimeOrderValue() {