Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r31712 -r31734 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 31712) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 31734) @@ -1781,7 +1781,7 @@ var labelType = printSummaryObj.labelType; // 处理包名,去掉部分几,同时获取包编号 printSummaryObj.packageNumber = 1; - printSummaryObj.packageNumber = getTousseNumber(printSummaryObj.name); + printSummaryObj.packageNumber = getTousseNumber(printSummaryObj.name,printSummaryObj.splitPackagesAmount); printSummaryObj.nameWithoutPartInfo = deleteTousseNumber(printSummaryObj.name); var pageType = printSummaryObj.pageType; @@ -3992,7 +3992,7 @@ }) return name; } -function getTousseNumber(tousseName) { +function getTousseNumber(tousseName,splitPackagesAmount) { var tousseNumber = 1; if(isUndefinedOrNull(tousseName)){ return tousseNumber; @@ -4006,6 +4006,14 @@ if(number != null){ tousseNumber = parseInt(number); } + }else { + var sub1 = tousseName.match(/\([0-9-]+\)/)[0]; + sub1 = sub1.substring(sub1.indexOf("(") + 1,sub1.indexOf(")")) + var page = sub1.split('-')[1]; + var sum = sub1.split('-')[0]; + if(parseInt(sum) == parseInt(splitPackagesAmount)){ + tousseNumber = page; + } } return tousseNumber; }