Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r29953 -r29958
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29953)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29958)
@@ -3521,6 +3521,9 @@
 					function(btn) {
 						if (btn == 'yes') {
 							packingTousseBtnClick_DeferredExecution('是')
+						}else {
+							Ext4.getCmp('save_print').enable();
+							hidePackingTousseBtnClick_mask();
 						}
 				});
 				return
@@ -3568,6 +3571,7 @@
 			 var parentAmout = 0;
 			 var isChackAll = false;
 			 var taskIdsArray = [];
+			 var noUserFormSterilizationInfo = true;
              //遍历器械包下的每条装配任务数据
 			 Ext4.each(selNodes,function(cNode){
 				if(cNode.childNodes.length > 0){
@@ -3584,6 +3588,7 @@
 					if(dest.length == 1){
 						sterilingType = Ext4.getCmp('sterilingType').getValue();
 						packageType = Ext4.getCmp('packageType').getValue();
+						noUserFormSterilizationInfo = false;
 					}
 					tousseType = cNode.get("tousseType");
 					supplierName = cNode.get("supplierName");
@@ -3663,7 +3668,7 @@
 				lastAmount = parentAmout;
 			}
 			 //请求后台装配方法
-			 packingTousse(false,basketBarcode,scannedBasketBarcodes.join(";"),taskIdArray.join(";"),tousseName,tousseType,lastAmount,packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount'),JSON.stringify(taskIdDest));
+			packingTousse(false,basketBarcode,scannedBasketBarcodes.join(";"),taskIdArray.join(";"),tousseName,tousseType,lastAmount,packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount'),JSON.stringify(taskIdDest),noUserFormSterilizationInfo);
 		}
 		 //格式[{tousseName:"",amount:1,packed:true,taskItems:[{taskId:11,amount:20},{taskId:12,amount:30}]},{tousseName:"",amount:1,packed:true,taskItems:[{taskId:11,amount:20},{taskId:12,amount:30}]}]
 		 // 一次打印
@@ -3802,7 +3807,7 @@
      onPackingTousseBtnClickComplete();
 }
 // 装配器械包
-function packingTousse(printImmediately,basketBarcode,scannedBasketBarcodes,taskIds,tousseName,tousseType,packAmount,packageType,sterilingType,supplierName,department,urgentAmount,taskIdToAmountMapInfo){
+function packingTousse(printImmediately,basketBarcode,scannedBasketBarcodes,taskIds,tousseName,tousseType,packAmount,packageType,sterilingType,supplierName,department,urgentAmount,taskIdToAmountMapInfo,noUserFormSterilizationInfo){
 	if(!validateFormParamsForPack()){
 		return false;
 	}
@@ -3901,6 +3906,7 @@
 			remark: remark,
 			errorDamageRemarkInfo:errorDamageRemarkInfo,
 			taskIdToAmountMapInfo:taskIdToAmountMapInfo,
+			noUserFormSterilizationInfo:noUserFormSterilizationInfo,
 			websocketSessionId : getWebsocketSessionId()
 	}
 	if(errorDamageRemarkId !== '' && errorDamageRemarkId !== 0){
@@ -4583,6 +4589,11 @@
 	   });
 	   if(dest.length == 1){
 			itemClickFunction(dest[0],storeId);
+			Ext4.getCmp('sterilingType').enable();
+			Ext4.getCmp('packageType').enable();
+	   }else {
+			Ext4.getCmp('sterilingType').disable();
+			Ext4.getCmp('packageType').disable();
 	   }
 	}
 }