Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js =================================================================== diff -u -r33322 -r33325 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 33322) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 33325) @@ -1745,7 +1745,7 @@ LODOP.ADD_PRINT_BARCODE("17mm","13mm","30mm","10mm","128Auto", obj.barcode);// 条码1 LODOP.PRINT(); } -function buildTousseDefinitionMeterialTable_zsyy(idCardInstance,tousseDefinition,unit){ +function buildTousseDefinitionMeterialTable_zsyy(idCardInstance,tousseDefinition,unit,cardType){ if(isUndefinedOrNullOrEmpty(tousseDefinition)){ alert('包定义不能为空!'); return null; @@ -1794,7 +1794,7 @@ if(type != '一次性物品' && materialName !== '指示卡核对并及时清理'){ amount += parseInt(count); } - if(materialName == '指示卡核对并及时清理'){ + if(cardType == 'Large' && materialName == '指示卡核对并及时清理'){ count = '√' } @@ -1817,7 +1817,7 @@ if(type2 != '一次性物品' && materialName2 !== '指示卡核对并及时清理'){ amount += parseInt(count2); } - if(materialName2 == '指示卡核对并及时清理'){ + if(cardType == 'Large' && materialName2 == '指示卡核对并及时清理'){ count2 = '√' } tableHtml += "