Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r37830 -r37857 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 37830) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 37857) @@ -4975,7 +4975,7 @@ } else { //ZSYY-335:外来器械发货后可以二次回收 if(sstsConfig.enableSecondRecyclingAfterInvoiceFunction && foreignTousseInvoicedAndNoUse == 'true'){ - dialogConfirm(lastTousseNames+"("+params_barcode+")为已发货状态,是否直接进行二次回收?", function () { + dialogConfirm(lastTousseNames+"("+params_barcode+")为"+tiStatus+"状态,是否直接进行二次回收?", function () { submitFormFunction(confirmation, saveAndNew, false, print, recyclingAmountConfirm,false, '否', foreignTousseInvoicedAndNoUse); }); }else { Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r37814 -r37857 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 37814) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 37857) @@ -102,12 +102,12 @@ return addZero(parseInt(v.month, 10) + 1) + "-" + addZero(v.date) + " " + addZero(v.hours) + ":" + addZero(v.minutes); } } -function recycleTheApplication(id, barcode, cleanBasketBarcodes, foreignTousseInvoicedAndNoUse) { +function recycleTheApplication(id, barcode, cleanBasketBarcodes, foreignTousseInvoicedAndNoUse, tiStatus) { var rememberRecycleUser = CookieManager.getCookie("rememberRecycleUser"); if(cleanBasketBarcodes){ - location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source + '&cleanBasketBarcodes=' + cleanBasketBarcodes + '&foreignTousseInvoicedAndNoUse=' + foreignTousseInvoicedAndNoUse; + location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source + '&cleanBasketBarcodes=' + cleanBasketBarcodes + '&foreignTousseInvoicedAndNoUse=' + foreignTousseInvoicedAndNoUse + '&tiStatus=' + encodeURIComponent(tiStatus || ''); }else { - location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source + '&foreignTousseInvoicedAndNoUse=' + foreignTousseInvoicedAndNoUse; + location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&recyclingApplicationId=" + id + "&barcode=" + barcode + "&rememberRecycleUser=" + rememberRecycleUser + '&source=' + source + '&foreignTousseInvoicedAndNoUse=' + foreignTousseInvoicedAndNoUse + '&tiStatus=' + encodeURIComponent(tiStatus || ''); } } @@ -952,7 +952,7 @@ if(msg.cleanBasketBarcodes && msg.cleanBasketBarcodes.length > 0){ cleanBasketBarcodes = msg.cleanBasketBarcodes.join(';'); } - recycleTheApplication(id, barcode, cleanBasketBarcodes, msg.foreignTousseInvoicedAndNoUse); + recycleTheApplication(id, barcode, cleanBasketBarcodes, msg.foreignTousseInvoicedAndNoUse, msg.tiStatus); } else if (msg.departMent != "" && msg.orgUnitCoding != "") { var id = $("#inputselect").val(); var appType = $("#appTypeSelect").val(); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r37814 -r37857 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 37814) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 37857) @@ -238,6 +238,8 @@ var fromLogin = '${fromLogin}'; var cleanBasketBarcodes = '${param.cleanBasketBarcodes}'; var foreignTousseInvoicedAndNoUse = '${param.foreignTousseInvoicedAndNoUse}'; +var tiStatus = '${param.tiStatus}'; +tiStatus = decodeURIComponent(tiStatus); if(fromLogin == 'true'){ welcome(departName,userName); <%session.removeAttribute("fromLogin");%>