Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r18320 -r18417
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 18320)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 18417)
@@ -1347,6 +1347,7 @@
 			text:'<span style="font-weight: bold;">' +  packingBtnText + '</span>',
 			handler : function() {
 				packing = true;
+				this.disable();
 				packingTousseBtnClick();
 				Ext4.getCmp('basketBarcodeInput').focus('', 10);
 			}
@@ -1359,6 +1360,7 @@
 			text:'<span style="font-weight: bold;">' +  '装配物品' + '</span>',
 			handler : function() {
 				packing = false;
+				this.disable();
 				packingTousseBtnClick();
 				Ext4.getCmp('basketBarcodeInput').focus('', 10);
 			}
@@ -2030,15 +2032,26 @@
 function printIDCardTousse(){
 	if(idCardInstanceID == ''){
 		showResult('请扫描标识牌条码!');
+		onPackingTousseBtnClickComplete();
 		return;
 	}
 	if(!validateFormParamsForPack()){
+		onPackingTousseBtnClickComplete();
 		return;
 	}
 	if(!(validateSupplement(idCardTaskNode))){
+		onPackingTousseBtnClickComplete();
 		return;
 	}
+	showPackingTousseBtnClick_mask();
 	// 标识牌的打印
+	// 延迟100ms执行
+	setTimeout(printIDCardTousse_DeferredExecution,100);
+}
+//打印标识牌的包,延迟执行
+function printIDCardTousse_DeferredExecution(){
+	
+	// 标识牌的打印
 	var packed = printTousseByIDcardTaskNode(idCardTaskNode);
 	if(packed){
 		// 清除标识牌信息
@@ -2052,6 +2065,7 @@
        	 Ext4.getCmp('reviewer').setValue('');
         }
 	}
+	onPackingTousseBtnClickComplete();
 }
 var lastSelectedTousseName = null;
 // 选中的和勾选的是否一致
@@ -2314,6 +2328,23 @@
 	 return true;
 }
 var packing = false;
+function onPackingTousseBtnClickComplete(){
+	Ext4.getCmp('save_print').enable();
+	Ext4.getCmp('packingLableBtn').enable();
+	
+	hidePackingTousseBtnClick_mask();
+}
+function showPackingTousseBtnClick_mask(){
+	packingTousseBtnClick_mask = new Ext4.LoadMask({msg:"正在装配，请稍候...",target:Ext4.getCmp('packingViewTab0')});
+	packingTousseBtnClick_mask.show();
+}
+function hidePackingTousseBtnClick_mask(){
+	if(packingTousseBtnClick_mask != null){
+		packingTousseBtnClick_mask.destroy();
+		packingTousseBtnClick_mask = null;
+	}
+}
+var packingTousseBtnClick_mask = null;
 // 装配按钮调用
 function packingTousseBtnClick(){
 
@@ -2327,6 +2358,7 @@
 //	}
 	// 备注不为空时只能装配一个包实例
 	if(!validateRemark()){
+		onPackingTousseBtnClickComplete();
 		return;
 	}
 	// 首先处理标识牌的打印
@@ -2337,9 +2369,15 @@
 	}
 	
 	if(!validateFormParamsForPack()){
+		onPackingTousseBtnClickComplete();
 		return;
 	}
-	
+	showPackingTousseBtnClick_mask();
+	// 延迟100ms执行
+	setTimeout(packingTousseBtnClick_DeferredExecution,100);
+}
+// 装配按钮调用,延迟执行 
+function packingTousseBtnClick_DeferredExecution(){
 	 var basketTree = Ext4.getCmp('basketTreeGrid');
 	 var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
 	 var selNodes = basketTree.getView().getChecked();
@@ -2544,7 +2582,8 @@
      if(packingPageReviewerDefaultLastReviewer == false){
     	 Ext4.getCmp('reviewer').setValue('');
      }
-
+     
+     onPackingTousseBtnClickComplete();
 }
 // 装配器械包
 function packingTousse(printImmediately,basketBarcode,taskIds,tousseName,tousseType,packAmount,packageType,sterilingType,supplierName,department,urgentAmount){
@@ -3193,6 +3232,7 @@
         }
     },
     items: [{
+    			id: 'packingViewTab0',
             	title: ' 待装配任务  ',
             	layout: 'border',
             	height : document.body.clientHeight,