Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r29267 -r29269 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 29267) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 29269) @@ -931,8 +931,6 @@ printSummaryObj.materials = newMaterials; } } - var isSubstring1 = false; - var isSubstring2 = false; var remarkObj = {}; var remarkObj2 = {}; var remark1 = ''; @@ -953,12 +951,10 @@ remark2 = tempStr.substring(90,temp.length); remark1 = tempStr.substring(45,90); temp = tempStr.substring(0,45); - isSubstring2 = true; }else if(temp.length > 45){ var tempStr = temp; remark1 = tempStr.substring(45,temp.length); temp = tempStr.substring(0,45); - isSubstring1 = true; } } if (item.labelAfterText){ @@ -969,24 +965,6 @@ } } } - if(item.dataIndex == 'remark1'){ - remarkObj = { - str :remark1, - top:item.position[0], - left:item.position[1], - width:item.position[2], - height:item.position[3] - } - } - if(item.dataIndex == 'remark2'){ - remarkObj2 = { - str :remark2, - top:item.position[0], - left:item.position[1], - width:item.position[2], - height:item.position[3] - } - } if (item.type == 'html'){ // 如果有格式化的方法,那么直接调用格式化的方法,不用下面的getMaterialsTabHtml if(!isUndefinedOrNullOrEmpty(item.formatter)){ @@ -1017,14 +995,28 @@ } LODOP.ADD_PRINT_TEXT(item.position[0], item.position[1], item.position[2], item.position[3], text); } - + + if(item.dataIndex == 'remark1'){ + remarkObj = { + str :remark1, + top:item.position[0], + left:item.position[1], + width:item.position[2], + height:item.position[3] + } + LODOP.ADD_PRINT_TEXT(remarkObj.top, remarkObj.left, remarkObj.width, remarkObj.height,remarkObj.str); + } + if(item.dataIndex == 'remark2'){ + remarkObj2 = { + str :remark2, + top:item.position[0], + left:item.position[1], + width:item.position[2], + height:item.position[3] + } + LODOP.ADD_PRINT_TEXT(remarkObj2.top, remarkObj2.left, remarkObj2.width, remarkObj2.height,remarkObj2.str); + } } - if(isSubstring1){ - LODOP.ADD_PRINT_TEXT(remarkObj.top, remarkObj.left, remarkObj.width, remarkObj.height,remarkObj.str); - } - if(isSubstring2){ - LODOP.ADD_PRINT_TEXT(remarkObj2.top, remarkObj2.left, remarkObj2.width, remarkObj2.height,remarkObj2.str); - } } // 打印可带边框的表格信息