Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp =================================================================== diff -u -r34829 -r34907 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 34829) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 34907) @@ -37,6 +37,7 @@ var parentMaterialId = '${param.materialId}'; var parentImgName = '${param.imgName}'; var pageSource = '${param.pageSource}'; +var invoicePlanId = '${param.invoicePlanId}'; parentImgName = decodeURI(parentImgName); parentMaterialId = decodeURI(parentMaterialId); materialName = decodeURI(materialName); @@ -70,7 +71,7 @@ if(!sstsConfig.enableDisplaysTheImplantUsageOfTheTousseInRecycling){ document.getElementById('implantAmountOfUseRecord').style.display = 'none'; } - var params = "{tousseName:'" + tousseName + "',tousseDefinitionID:'"+tousseDefinitionID+"',showDisposableGoods:'"+showDisposableGoods+"'}"; + var params = "{tousseName:'" + tousseName + "',tousseDefinitionID:'"+tousseDefinitionID+"',showDisposableGoods:'"+showDisposableGoods+"',invoicePlanId:'"+invoicePlanId+"'}"; TousseDefinitionTableManager.getTousseIncludeMaterialsWithOutDisposableGoods(params,function(result){ var json = JSON.parse(result); var dataLength = 0; @@ -743,7 +744,7 @@ if(!isUndefinedOrNullOrEmpty(tousseDefinitionID)){ if(parentMaterialId !== ''){ onMaterialItemClick(parentMaterialId,''); - var params = "{tousseName:'" + tousseName + "',tousseDefinitionID:'"+tousseDefinitionID+"'}"; + var params = "{tousseName:'" + tousseName + "',tousseDefinitionID:'"+tousseDefinitionID+"',invoicePlanId:'"+invoicePlanId+"'}"; TousseDefinitionTableManager.getTousseIncludeMaterialsWithOutDisposableGoods(params,function(result){ var json = JSON.parse(result); var zindex = ''; Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r34862 -r34907 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 34862) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 34907) @@ -2876,9 +2876,10 @@ }); } } else if (tousseType == '器械包') { + var invoicePlanId = $('#recyclingApplicationId').val(); $.magnificPopup.open({ items: [{ - src: 'tousseImage.jsp?resolution=' + resolution + '&tousseDefinitionID=' + tousseDefinitionID + '&tousseName=' + encodeURIComponent(tousseName) + '&number=' + 1 + '&pageSource=recycleForTouchScreen', + src: 'tousseImage.jsp?resolution=' + resolution + '&tousseDefinitionID=' + tousseDefinitionID + '&tousseName=' + encodeURIComponent(tousseName) + '&number=' + 1 + '&invoicePlanId=' + invoicePlanId + '&pageSource=recycleForTouchScreen', type: 'iframe' }, {