Index: ssts-web/src/main/webapp/logon.jsp =================================================================== diff -u -r23674 -r25305 --- ssts-web/src/main/webapp/logon.jsp (.../logon.jsp) (revision 23674) +++ ssts-web/src/main/webapp/logon.jsp (.../logon.jsp) (revision 25305) @@ -504,8 +504,7 @@ } function getUserName(){ if(barcodeTemp.length >= 9){ - var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length); - return barcode; + return barcodeTemp; } var usernameValue = document.getElementById("j_username_display").value; return usernameValue; Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r25299 -r25305 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 25299) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 25305) @@ -42,9 +42,9 @@ } -//测试是否为有效的条码 +//测试是否为有效的条码,9到11位 function isValidBarcode(text){ - var re = /^([0-9]{9})$/; + var re = /^([0-9]{9,11})$/; if(re.test(text)){ return true; }