Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r18585 -r18840 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 18585) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 18840) @@ -58,7 +58,7 @@ background:#FFFFFF; border:1px solid #ccc; margin:0px; - font-size:18px; + font-size:22px; color:#2e6271; } .recycleRemarkTr{ Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js =================================================================== diff -u -r18790 -r18840 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 18790) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 18840) @@ -193,6 +193,8 @@ //一次性物品申请单名字的显示(true表示名字[规格][申领规格],false或者不配按原来的方式显示) disposableGoodShowAppSpAndSp : true, //一次性物品申库存是否使用库存数量减去待发货数量 - storageUseStorageSubtractWaitDeliver : true + storageUseStorageSubtractWaitDeliver : true, + //是否统计拆包回收的器械拆分的篮筐数量 + enableSplitBasketCount : true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r18806 -r18840 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 18806) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 18840) @@ -1291,6 +1291,41 @@ } } /** + * 刷新拆包器械拆分篮筐数量的显示界面。如果没有启用拆分篮筐显示功能,或者没有报损备注,那么隐藏整行 + * @param row 行号 + */ +function refreshSplitBasketView(){ + if(sstsConfig.enableSplitBasketCount){ + //包定义id与包拆分的篮筐的映射 + var tousseDefIdBasketGroupMap = new Map(); + $('dl[class="sed clearfix"]').each(function(){ + $(this).children().each(function(){ + if($(this).attr('type') == 'hidden'){ + var hideValue = $(this).val(); + if(!isUndefinedOrNullOrEmpty(hideValue)){ + var obj = JSON.parse(hideValue); + if(obj.type == '材料'){ + tousseDefIdBasketGroupMap[obj.tousseDefinitionID] = obj.basketGroupBarcodes; + } + } + } + }); + }); + $("#tousseItemTable > tbody > tr").each(function(row,element) { + var tousseDefinitionId = $("#tousseDefinitionID" + row).val(); + var tousseType = $("#tousseType" + row).val();//省医现在希望最好是只有外来器械才显示 + var basketGroupBarcodes = tousseDefIdBasketGroupMap[tousseDefinitionId]; + if((tousseType == '外来器械包'|| tousseType == '外来器械拆分小包' ) && !isUndefinedOrNull(basketGroupBarcodes)){ + $('#splitBasket' + row).text('拆分篮筐数:' + basketGroupBarcodes.split(";").length); + $('#splitBasketTr' + row).show(); + }else{ + $('#splitBasket' + row).text(''); + $('#splitBasketTr' + row).hide(); + } + }); + } +} +/** * 刷新报损材料明细的显示,如果没有启用回收的丢失报损备注功能,或者没有报损材料,那么隐藏整行 * @param row 行号 */ @@ -1875,6 +1910,7 @@ trStr += '