Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
===================================================================
diff -u -r35423 -r35504
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 35423)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 35504)
@@ -561,6 +561,7 @@
 				valueField: 'name',
 				displayField: 'name',
 				listWidth: 150,
+				hideTrigger:true,
 				store: idCardBarcodePaperTypeStore,
 				value: defaultIdCardPaperType,
 				forceSelection: true,
@@ -1291,51 +1292,94 @@
 			}
 			openPort(params, function (value, isData, errorStatus) {
 				if (isData) {
-					var arr = value.split(',');
-					var uid = arr[0] || '';
-					var barcode = arr[1] || '';
-					if(barcode !== ''){
-						barcode = barcode.split('F')[0] || ''
-					}
-					if (RFIDStore.getCount() > 0) {
-						var isHas = false;
-						var tousseName = '';
-						var index = 0;
-						for (var i = 0; i < RFIDStore.getCount(); i++) {
-							if (RFIDStore.getAt(i).data.uid == uid) {
-								if (barcode !== '') {
-									RFIDStore.getAt(i).set('barcode', barcode);
+					(function(newVal){
+						var arr = newVal.split(',');
+						var uid = arr[0] || '';
+						var barcode = arr[1] || '';
+						if(barcode !== ''){
+							barcode = barcode.split('F')[0] || ''
+						}
+						if (RFIDStore.getCount() > 0) {
+							var isHas = false;
+							var tousseName = '';
+							var index = 0;
+							for (var i = 0; i < RFIDStore.getCount(); i++) {
+								if (RFIDStore.getAt(i).data.uid == uid) {
+									if (barcode !== '') {
+										RFIDStore.getAt(i).set('barcode', barcode);
+									}
+									var count = parseInt(RFIDStore.getAt(i).data.count);
+									RFIDStore.getAt(i).set('count', count + 1);
+									isHas = true;
+									tousseName = RFIDStore.getAt(i).data.tousseName;
+									index = i;
+									break;
 								}
-								var count = parseInt(RFIDStore.getAt(i).data.count);
-								RFIDStore.getAt(i).set('count', count + 1);
-								isHas = true;
-								tousseName = RFIDStore.getAt(i).data.tousseName;
-								index = i;
-								break;
 							}
-						}
-						if (isHas) {
-							if (uid && uid !== 'undefined') {
-								if (barcode !== '' && tousseName == '') {
-									Ext.Ajax.request({
-										url: WWWROOT + '/disinfectSystem/recyclingRecordAction!loadTousseInstanceInfo.do',
-										async: false,
-										params: { barcode: barcode },
-										success: function (response, options) {
-											var result = Ext.decode(response.responseText);
-											if (result.success) {
-												var tousseName = result.tousseName;
-												RFIDStore.getAt(index).set('tousseName', tousseName);
+							if (isHas) {
+								if (uid && uid !== 'undefined') {
+									if (barcode !== '' && tousseName == '') {
+										Ext.Ajax.request({
+											url: WWWROOT + '/disinfectSystem/recyclingRecordAction!loadTousseInstanceInfo.do',
+											async: false,
+											params: { barcode: barcode },
+											success: function (response, options) {
+												var result = Ext.decode(response.responseText);
+												if (result.success) {
+													var tousseName = result.tousseName;
+													RFIDStore.getAt(index).set('tousseName', tousseName);
+												}
 											}
-										}
-									});
+										});
+									}
 								}
+							} else {
+								if (uid && uid !== 'undefined') {
+									if (barcode == '') {
+										var record = new items({
+											number: RFIDStore.getCount() + 1,
+											uid: uid,
+											barcode: '',
+											tousseName: '',
+											count: 1
+										});
+										RFIDStore.add(record);
+									} else {
+										Ext.Ajax.request({
+											url: WWWROOT + '/disinfectSystem/recyclingRecordAction!loadTousseInstanceInfo.do',
+											async: false,
+											params: { barcode: barcode },
+											success: function (response, options) {
+												var result = Ext.decode(response.responseText);
+												if (result.success) {
+													var tousseName = result.tousseName;
+													var record = new items({
+														number: RFIDStore.getCount() + 1,
+														uid: uid,
+														barcode: barcode,
+														tousseName: tousseName,
+														count: 1
+													});
+													RFIDStore.add(record);
+												} else {
+													var record = new items({
+														number: RFIDStore.getCount() + 1,
+														uid: uid,
+														barcode: barcode,
+														count: 1
+													});
+													RFIDStore.add(record);
+												}
+											}
+										});
+									}
+								}
 							}
 						} else {
 							if (uid && uid !== 'undefined') {
 								if (barcode == '') {
 									var record = new items({
-										number: RFIDStore.getCount() + 1,
+										number: 1,
 										uid: uid,
 										barcode: '',
 										tousseName: '',
@@ -1352,7 +1396,7 @@
 											if (result.success) {
 												var tousseName = result.tousseName;
 												var record = new items({
-													number: RFIDStore.getCount() + 1,
+													number: 1,
 													uid: uid,
 													barcode: barcode,
 													tousseName: tousseName,
@@ -1361,7 +1405,7 @@
 												RFIDStore.add(record);
 											} else {
 												var record = new items({
-													number: RFIDStore.getCount() + 1,
+													number: 1,
 													uid: uid,
 													barcode: barcode,
 													count: 1
@@ -1373,48 +1417,7 @@
 								}
 							}
 						}
-					} else {
-						if (uid && uid !== 'undefined') {
-							if (barcode == '') {
-								var record = new items({
-									number: 1,
-									uid: uid,
-									barcode: '',
-									tousseName: '',
-									count: 1
-								});
-								RFIDStore.add(record);
-							} else {
-								Ext.Ajax.request({
-									url: WWWROOT + '/disinfectSystem/recyclingRecordAction!loadTousseInstanceInfo.do',
-									async: false,
-									params: { barcode: barcode },
-									success: function (response, options) {
-										var result = Ext.decode(response.responseText);
-										if (result.success) {
-											var tousseName = result.tousseName;
-											var record = new items({
-												number: 1,
-												uid: uid,
-												barcode: barcode,
-												tousseName: tousseName,
-												count: 1
-											});
-											RFIDStore.add(record);
-										} else {
-											var record = new items({
-												number: 1,
-												uid: uid,
-												barcode: barcode,
-												count: 1
-											});
-											RFIDStore.add(record);
-										}
-									}
-								});
-							}
-						}
-					}
+					})(value)
 				} else {
 					if (errorStatus == 'msg1') {
 						showResult(value);