Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r29914 -r29947
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29914)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29947)
@@ -19,7 +19,6 @@
 var idCardBarcode = '';
 var idCardInstanceID = '';
 var idCardInfo = null;
-
 var currentIDCardInfo = null;
 var idCardTaskNode = null;
 var MATERIAL_NAME_IDCARD = "器械包标识牌";
@@ -4485,6 +4484,91 @@
 	});
 }
 
+
+//点击器械包的时候触发事件
+function itemClickFunction(record,storeId,isChecked,isEnd){
+	var tousseName = record.get('tousseName');
+	var sterilingMethod = record.get('sterilingMethod');
+	var packageType = record.get('packageType');
+	var tousseType = record.get('tousseType');
+	var isTraceable = record.get('isTraceable');
+	var isPrint = record.get('isPrint');
+	var isReview = record.get('isReview');
+	var vedioName = record.get('uuid_vedioNames');
+	var td_id;
+	if(storeId == 'basketTreeGrid'){
+		td_id = (record.get('tousseID') == '')?record.raw.td_id:record.get('tousseID');
+		showPackButton(isPrint,isReview,tousseType);
+	}else {
+		td_id = record.get('tousseID');
+		lastSelectTaskId = record.get('taskId');
+		//不为回收任务时,不显示装配与打印按钮,只有任务类型为回收任务时才显示
+		if (record.get('taskType') != taskType_recyclingRecord) {
+			showPackButton(isPrint, isReview, tousseType);
+		} else {
+			Ext4.getCmp('save_print').hide();
+			Ext4.getCmp('packingLableBtn').hide();
+		}
+	}
+	var isLeaf = record.get('leaf');
+	if(!isLeaf){
+		if(record.get('checked') == false){
+			record.set('checked', true);
+			if(storeId == 'basketTreeGrid'){
+				basketColumnTreeGrid.getView().fireEvent('checkchange',record,record.get('checked'));
+			}else {
+				waitPackColumnTreeGrid.getView().fireEvent('checkchange', record, record.get('checked'));
+			}
+		}
+	}
+	var root;
+	if(storeId == 'basketTreeGrid'){
+		root = basketStore.getRootNode();
+	}else {
+		var waitPackingTreeGrid = Ext4.getCmp("waitPackingTreeGrid");
+		root = waitPackingTreeGrid.getRootNode();
+	}
+	var arr = [];
+	Ext4.each(root.childNodes, function(pNode){
+		if(pNode.get('checked') == true){
+			if(isChecked == true || (isChecked == false && pNode.get('tousseName') !== tousseName)){
+				arr.push(pNode)
+			}
+		}
+	})
+	if(arr.length == 1 && isEnd == false){
+		itemClickFunction(arr[0],storeId,isChecked,true);
+		return
+	}else {
+		updateNoteWindow(record);
+		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable);
+		lastSelectTousseName = tousseName;
+		lastSelectimageTypeTousse = imageType_tousse;
+		lastSelectVedioName = vedioName;
+		lastSelectTdId = td_id;
+		if(packingPageAutoSetSterilizationProgramAfterSelectTousse){
+			Ext4.getCmp('sterilingType').setValue(sterilingMethod);
+			//根据灭菌程序设置灭菌方式的值
+			setSterilingModeValueBySterilingType(sterilingMethod);
+		}
+		Ext4.getCmp('packageType').setValue(packageType);
+		lastSelectedTousseName = tousseName;
+		// 显示丢失报损按钮
+		showOrHideErrorAndDamageBtn();
+		var idCardBarcodeTemp = record.get("idCardBarcode");
+		if(idCardBarcodeTemp != ""){
+			loadIdCardByBarcode(idCardBarcodeTemp,false);
+		}else {
+			if(storeId !== 'basketTreeGrid'){
+				clearInputedIDCardInfo();
+			}
+		}
+		refreshErrorAndDamageRemark(record);
+		refreshRemarks(record);
+		refreshRecyclingItemRemark(record);
+	}
+}
+
 basketColumnTreeGrid = Ext4.create('columnTreeGrid', {
 	id : 'basketTreeGrid',
 	height: (document.body.clientHeight - 30)/2,
@@ -4494,53 +4578,11 @@
 	listeners:{
 		// cellclick事件改为select事件，便于selenium进行测试
 		itemclick : function( thiz, record, index, eOpts ){
-			var tousseName = record.get('tousseName');
-       		var sterilingMethod = record.get('sterilingMethod');
-       		var packageType = record.get('packageType');
-       		var tousseType = record.get('tousseType');
-       		var isTraceable = record.get('isTraceable');
-       		var isPrint = record.get('isPrint');
-       		var isReview = record.get('isReview');
-       		var vedioName = record.get('uuid_vedioNames');
-       		var td_id = (record.get('tousseID') == '')?record.raw.td_id:record.get('tousseID');
-       		updateNoteWindow(record);
-       		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable);
-       		lastSelectTousseName = tousseName;
-    		lastSelectimageTypeTousse = imageType_tousse;
-    		lastSelectVedioName = vedioName;
-    		lastSelectTdId = td_id;
-       		if(packingPageAutoSetSterilizationProgramAfterSelectTousse){
-       			Ext4.getCmp('sterilingType').setValue(sterilingMethod);
-       			//根据灭菌程序设置灭菌方式的值
-       			setSterilingModeValueBySterilingType(sterilingMethod);
-       		}
-       		Ext4.getCmp('packageType').setValue(packageType);
-       		lastSelectedTousseName = tousseName;
-       		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-           	var selNodes = waitPackingTreeGrid.getView().getChecked();
-       		Ext4.each(selNodes, function(pNode){
-				 pNode.set("checked", false);
-			});
-       		showPackButton(isPrint,isReview,tousseType);
-       		// 显示丢失报损按钮
-       		showOrHideErrorAndDamageBtn();
-       		var idCardBarcodeTemp = record.get("idCardBarcode");
-       		if(idCardBarcodeTemp != ""){
-       			loadIdCardByBarcode(idCardBarcodeTemp,false);
-       		}
-			refreshErrorAndDamageRemark(record);
-			refreshRemarks(record);
-       		refreshRecyclingItemRemark(record);
-           	var isLeaf = record.get('leaf');
-           	if(!isLeaf){
-               	if(record.get('checked') == false){
-               		record.set('checked', true);
-               		basketColumnTreeGrid.getView().fireEvent('checkchange',record,record.get('checked'));
-           		}
-           	}else{
-           		return false;
-           	}
-           	
+			if(record.get('checked') == true){
+				itemClickFunction(record,'basketTreeGrid',false,false);
+				return
+			}
+			itemClickFunction(record,'basketTreeGrid',true,true);
 	   },
 	   load: {
 		fn: function(store){
@@ -4762,66 +4804,11 @@
 	listeners:{
 		// cellclick事件改为select事件，便于selenium进行测试
 		itemClick : function( thiz, record, index, eOpts ){
-			var isTraceable = record.get('isTraceable');
-       		var tousseName = record.get('tousseName');
-       		var sterilingMethod = record.get('sterilingMethod');
-       		var packageType = record.get('packageType');
-       		var tousseType = record.get('tousseType');
-       		var isPrint = record.get('isPrint');
-       		var isReview = record.get('isReview');
-       	    var vedioName = record.get('uuid_vedioNames');
-			var td_id = record.get('tousseID');
-			var taskId = record.get('taskId');
-            updateNoteWindow(record);
-       		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable);
-       		lastSelectTousseName = tousseName;
-    		lastSelectimageTypeTousse = imageType_tousse;
-    		lastSelectVedioName = vedioName;
-			lastSelectTdId = td_id;
-			lastSelectTaskId = taskId;
-       		if(packingPageAutoSetSterilizationProgramAfterSelectTousse){
-       			Ext4.getCmp('sterilingType').setValue(sterilingMethod);
-       			//根据灭菌程序设置灭菌方式的值
-       			setSterilingModeValueBySterilingType(sterilingMethod);
-       		}
-       		Ext4.getCmp('packageType').setValue(packageType);
-       		lastSelectedTousseName = tousseName;
-       		//将上部分grid中的复选框置为不选中
-       		var basketTreeGrid = Ext4.getCmp('basketTreeGrid');
-       		var selNodes = basketTreeGrid.getView().getChecked();
-       		Ext4.each(selNodes, function(pNode){
-       			pNode.set("checked", false);
-       		});
-       		
-       		//不为回收任务时,不显示装配与打印按钮,只有任务类型为回收任务时才显示
-       		if(record.get('taskType') != taskType_recyclingRecord){
-       			showPackButton(isPrint,isReview,tousseType);
-       			
-       		}else{
-       			Ext4.getCmp('save_print').hide();
-       			Ext4.getCmp('packingLableBtn').hide();
-       		}
-       		
-       		var idCardBarcodeTemp = record.get("idCardBarcode");
-       		if(idCardBarcodeTemp != ""){
-       			loadIdCardByBarcode(idCardBarcodeTemp,false);
-       		}else{
-       			clearInputedIDCardInfo();
-       		}
-       		// 显示丢失报损按钮
-       		showOrHideErrorAndDamageBtn();
-			refreshErrorAndDamageRemark(record);
-			refreshRemarks(record);
-       		refreshRecyclingItemRemark(record);
-			var isLeaf = record.get('leaf');
-           	if(!isLeaf){
-           		if(record.get('checked') == false){
-               		record.set('checked', true); 
-               		waitPackColumnTreeGrid.getView().fireEvent('checkchange',record,record.get('checked'));
-				}
-			}else{
-				return false;
+			if(record.get('checked') == true){
+				itemClickFunction(record,'waitPackingTreeGrid',false,false);
+				return
 			}
+			itemClickFunction(record,'waitPackingTreeGrid',true,true);
 		},
 		load: {
 			fn: function(store){