Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32863 -r32901
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32863)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32901)
@@ -2314,7 +2314,6 @@
 			id :"save_print",
 			text:'<span style="font-weight: bold;">' +  packingBtnText + '</span>',
 			handler : function() {
-				//reloadBasketTreeGrid(false);return
 				packingTousseBtnClick0(this,true);
 //				packing = true;
 //				this.disable();
@@ -3740,8 +3739,7 @@
 							if (btn == 'yes') {
 								packingTousseBtnClick_DeferredExecution('是')
 							}else {
-								Ext4.getCmp('save_print').enable();
-								hidePackingTousseBtnClick_mask();
+								onPackingTousseBtnClickComplete();
 							}
 					});
 					return
@@ -3760,11 +3758,14 @@
 			 var haveIDCard = pNode.get('haveIDCard');
 			 // 跳过有标识牌的器械包
 			 if(haveIDCard){
-				 return;
+				showResult("【"+pTousseName+"】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+				onPackingTousseBtnClickComplete();
+				return;
 			 }
 			 //器械包装配数量
 			 var packingAmount = pNode.get('amount');
 			 if(packingAmount <= 0){
+				onPackingTousseBtnClickComplete();
 			    return;
 			 }
 			 
@@ -3856,17 +3857,20 @@
 					}
 					if(status == '待确认'){
 						showResult(tousseName+",有器械丢失，请确认！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+						onPackingTousseBtnClickComplete();
 						return;
 					}
 					var errorDamageAmount = 0;
 					var errorOrDamageAmount = 0;
 					if(!allowPackingWhenUnSupplementMaterial){
 						if(errors != null && errors.length > 0){
 							showResult("材料缺失，不够组成器械包，请补充缺失器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+							onPackingTousseBtnClickComplete();
 							return;
 						}
 						if(damages != null && damages.length > 0){
 							showResult("材料已报损，不够组成器械包，请补充报损器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+							onPackingTousseBtnClickComplete();
 							return;
 						}
 					}else {
@@ -3945,14 +3949,12 @@
 			});
 		}
 		if(!packedPhotographed1){
-			hidePackingTousseBtnClick_mask();
-			Ext4.getCmp('save_print').enable();
+			onPackingTousseBtnClickComplete();
 			showResult(msg1Array.join(",")+'已经做了拆包，请点击拆包进入完成操作!');
 			return;
 		}
 		if(!packedPhotographed2){
-			hidePackingTousseBtnClick_mask();
-			Ext4.getCmp('save_print').enable();
+			onPackingTousseBtnClickComplete();
 			showResult(msg2Array.join(",")+'还未上传照片，不能装配，请先上传照片!');
 			return;
 		}
@@ -4008,8 +4010,7 @@
 								if (btn == 'yes') {
 									packingTousseBtnClick_DeferredExecution('是')
 								}else {
-									Ext4.getCmp('save_print').enable();
-									hidePackingTousseBtnClick_mask();
+									onPackingTousseBtnClickComplete();
 								}
 						});
 						return
@@ -4049,11 +4050,13 @@
 						// 跳过有标识牌的器械包
 						if(haveIDCard){
 							showResult("【"+tousseName+"】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+							onPackingTousseBtnClickComplete();
 							return;
 						}
 						var status = cNode.get("status");
 						if(status == '待确认'){
 							showResult("【"+tousseName+"】有器械丢失，请先确认！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+							onPackingTousseBtnClickComplete();
 							return false;
 						}
 						 var taskId = cNode.get("taskId");
@@ -4307,6 +4310,8 @@
 								},
 								error : function(req, textStatus) {
 									showResult('装配失败!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+									uncheck();
+									return;
 								}
 							});
 						}
@@ -4317,6 +4322,8 @@
     					message = '装配失败!';
     				}
     				showResult(message , null , sstsConfig.messagePauseTimeOnPackingPage);
+					uncheck();
+					return;
     			}
 			}
 			if(isTrue !== undefined){
@@ -4329,6 +4336,18 @@
 	});
 }
 
+//取消勾选
+function uncheck(){
+	var basketTree = Ext4.getCmp('basketTreeGrid');
+	var selNodes = basketTree.getView().getChecked();
+	Ext4.each(selNodes, function(pNode){
+		pNode.set('checked',false);
+		Ext4.each(pNode.childNodes, function(node){
+			node.set('checked',false);
+		})
+	});
+}
+
 //BJ307YY-87：外来器械回收分多篮筐入筐后，装配时允许合并装配成一个包
 /**
  * 
@@ -4359,7 +4378,7 @@
 		var splitCount = params[index].basketBarcode.split(";").length;
 		params[index].splitPackingForeignTousse = '';
 		if(sstsConfig.askWhetherMergeAllPartsOfForeignTousseSplitInRecyclingToOneWhenPacking && params[index].tousseType == '外来器械包' && params[index].basketBarcode.split(';').length > 1){
-			hidePackingTousseBtnClick_mask();
+			onPackingTousseBtnClickComplete();
 			Ext4.MessageBox.confirm("请确认", tousseName+'回收时已经拆分成'+splitCount+'部分，放入了不同的清洗篮筐，是否装配成1个包？',function(btn) {
 				if (btn == 'yes') {
 					params[index].splitPackingForeignTousse = false;
@@ -4455,7 +4474,7 @@
 	if(!packing){
 		return;
 	}
-	hidePackingTousseBtnClick_mask();
+	onPackingTousseBtnClickComplete();
 	var packAmount = packedToussesArray.length;
 //	showResult(packAmount + "个" + showName + "装配完成");
 	var printGroupType = Ext4.getCmp('printGroupType').getValue();