Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r34428 -r34431
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34428)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34431)
@@ -2575,10 +2575,9 @@
 					xtype: 'button',
 					margin: '0 0 0 10',
 					id:'connectRFID',
-					hidden: true,
 					text: '<span style="font-weight: bold;">' + '连接RFID设备' + '</span>',
 					handler: function () {
-						connectRFIDFun();
+						connectRFIDFun(0);
 					}
 				}]
 			}
@@ -6639,6 +6638,32 @@
 	inactivityTime();
 
 	if(sstsConfig.enableRFIDTousseIdCard && !isIE()){
+		//连接RFID设备
+		function connectRFIDFun(show){
+			if ('serial' in navigator) {
+				var params = {};
+				if(show !== 0){
+					params = {
+						usbVendorId: 6790,
+						usbProductId: 29987
+					}
+				}else {
+					params = {
+						getAllPort:true
+					}
+				}
+				openPort(params,function(value,isData,errorStatus){
+					if(isData){
+						loadIdCardByBarcode(value, true, true);
+					}else {
+						showResult(value);
+					}
+				});
+			} else {
+				showResult('你的浏览器不支持串口连接！');
+			}
+		}
+
 		connectRFIDFun();
 	}
 });
@@ -6995,43 +7020,4 @@
 	} else {
 		reflushWaitPackingTreeGrid();
 	}
-}
-
-//连接RFID设备
-function connectRFIDFun(){
-	if ('serial' in navigator) {
-		var barcode = '';
-		var data = new Uint8Array([187, 23, 9, 0, 0, 0, 0, 0, 0, 0, 0, 6, 38, 13, 10])
-		var params = {
-			filters:[
-				//桌面
-				{ usbVendorId: 6790, usbProductId: 29987 }
-			],
-			data:data
-		}
-		openPort(params,function(value,isData){
-			if(isData){
-				var dataString = "";
-				if (value.length > 20) {
-					for (var i = 0; i < value.length; i++) {
-						dataString += value[i].toString(16)
-					}
-				}
-				if (dataString !== '') {
-					dataString = dataString.toUpperCase();
-					if (dataString.indexOf('FEF') > -1 && dataString.indexOf('FF') > -1) {
-						var newData = dataString.substring(dataString.indexOf("FEF") + 3, dataString.indexOf("FF"));
-						if (barcode !== newData) {
-							barcode = newData;
-							loadIdCardByBarcode(barcode, true, true)
-						}
-					}
-				}
-			}else {
-				showResult(value);
-			}
-		});
-	} else {
-		showResult('你的浏览器不支持串口连接！');
-	}
 }
\ No newline at end of file