Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r31735 -r31737 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 31735) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 31737) @@ -3999,24 +3999,33 @@ } var reg1 = /\(部分\d+\)/g; var sub1 = tousseName.match(reg1); + var reg2 = /\([0-9-]+\)/g; + var sub2 = tousseName.match(reg2); + var reg3 = /\([0-9/]+\)/g; + var sub3 = tousseName.match(reg3); if(sub1 != null){ var s1 = sub1[0]; var regNumber = /\d+/g; var number = s1.match(regNumber); if(number != null){ tousseNumber = parseInt(number); } - }else { - var sub1 = tousseName.match(/\([0-9-]+\)/); - if(sub1 !== null){ - var s1 = sub1[0]; - s1 = s1.substring(s1.indexOf("(") + 1,s1.indexOf(")")) - var page = s1.split('-')[1]; - var sum = s1.split('-')[0]; - if(parseInt(sum) == parseInt(splitPackagesAmount)){ - tousseNumber = page; - } + }else if(sub2 != null){ + var s2 = sub2[0]; + s2 = s2.substring(s2.indexOf("(") + 1,s2.indexOf(")")); + var page = s2.split('-')[1]; + var sum = s2.split('-')[0]; + if(parseInt(sum) == parseInt(splitPackagesAmount)){ + tousseNumber = page; } + }else if(sub3 != null){ + var s3 = sub3[0]; + s3 = s3.substring(s3.indexOf("(") + 1,s3.indexOf(")")); + var page = s3.split('/')[1]; + var sum = s3.split('/')[0]; + if(parseInt(sum) == parseInt(splitPackagesAmount)){ + tousseNumber = page; + } } return tousseNumber; }