Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js =================================================================== diff -u -r33869 -r34829 --- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 33869) +++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 34829) @@ -282,6 +282,8 @@ combineBasketItemStatisticsAndBasketItemDetailsInTheSterilizationLoadingModule:true, //加急发货计划背景颜色 colorChangeRuleOfInvoicPlanToSendGoodsList:2, + //回收时是否显示普通器械包的植入物使用情况 + enableDisplaysTheImplantUsageOfTheTousseInRecycling:true, //启用器械包进度条 enableTousseStatusProgressBar:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp =================================================================== diff -u -r34710 -r34829 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 34710) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 34829) @@ -67,6 +67,9 @@ piece.innerText = "件"; document.getElementById("materials").appendChild(piece); var showDisposableGoods = (parentPageName == '')?false:true; + if(!sstsConfig.enableDisplaysTheImplantUsageOfTheTousseInRecycling){ + document.getElementById('implantAmountOfUseRecord').style.display = 'none'; + } var params = "{tousseName:'" + tousseName + "',tousseDefinitionID:'"+tousseDefinitionID+"',showDisposableGoods:'"+showDisposableGoods+"'}"; TousseDefinitionTableManager.getTousseIncludeMaterialsWithOutDisposableGoods(params,function(result){ var json = JSON.parse(result); @@ -100,9 +103,12 @@ }else { trData += ''; trData += ''; - trData += ''+materialName+''; - trData += ''+materialAmount+''; + trData += ''+materialName+''; + trData += ''+materialAmount+''; trData += ''+emptyStringIfUndefinedOrNull(json[i].detachable)+''; + if(sstsConfig.enableDisplaysTheImplantUsageOfTheTousseInRecycling){ + trData += ''+emptyStringIfUndefinedOrNull(json[i].implantAmountOfUseRecord)+''; + } trData += ''+emptyStringIfUndefinedOrNull(json[i].washMethod)+''; trData += ''+emptyStringIfUndefinedOrNull(json[i].washQualityCheckPoint)+''; trData += ''+emptyStringIfUndefinedOrNull(json[i].functionCheck)+''; @@ -895,7 +901,7 @@ .image-box .box .w7{font-size:14px;font-weight: bold;} .image-box .box .w8,.image-box .box .w9,.image-box .box .w10{font-size:14px;} .image-box .table {height: 100%;} -.image-box .table th{font-size:16px;} +.image-box .table th{font-size:16px;text-align: center;} .image-box .box table td{padding:0;} .checkbox-material{ width: 15px; @@ -1003,9 +1009,10 @@ - + +
材料名称材料名称 数量 是否可拆植入物使用数量 清洗方式 清洗质量检查关注点 功能检查