Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r20393 -r20421
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 20393)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 20421)
@@ -19,6 +19,7 @@
 	packingBtnText = "装配无菌物品";
 }
 var packingPageAutoSetSterilizationProgramAfterSelectTousse = true;
+var allowForeignToussePartiallyPacking = false;
 var taskGroupObj = null;
 //丢失报损按钮响应函数
 var onErrorDamageBtnClick = null;
@@ -165,6 +166,7 @@
 Ext4.onReady(function() {
 	taskGroupObj = getTaskGroupObjByName(taskGroup);
 	packingPageAutoSetSterilizationProgramAfterSelectTousse = getBoolValueFromJs('sstsConfig.packingPageAutoSetSterilizationProgramAfterSelectTousse',true);
+	allowForeignToussePartiallyPacking = getBoolValueFromJs('sstsConfig.allowForeignToussePartiallyPacking',false);
 	Ext4.QuickTips.init();
 	Ext4.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
 	
@@ -534,7 +536,9 @@
 			            var invoicePlanId = record.get('invoicePlanId');
 			            var packageType = record.get('packageType');
 			            var sterilingMethod = record.get('sterilingMethod');
-			            str += "<input type='button' style='height:20px; width:40px;' value='拆包' onclick=\"splitForeignTousse(" + taskid + ",'" + tousseName+ "','"+showName+ "','"+invoicePlanId + "','"+amount+"','"+supplierName+"','"+basketBarcode+"','"+packageType+"','"+sterilingMethod+"') \">";
+			            if(!allowForeignToussePartiallyPacking){
+			            	str += "<input type='button' style='height:20px; width:40px;' value='拆包' onclick=\"splitForeignTousse(" + taskid + ",'" + tousseName+ "','"+showName+ "','"+invoicePlanId + "','"+amount+"','"+supplierName+"','"+basketBarcode+"','"+packageType+"','"+sterilingMethod+"') \">";
+			            }
 			        }
 				}
 		        return str;
@@ -3238,6 +3242,15 @@
 			            					var cNode = childNodes[m];
 			            					if(cNode.get('taskId') == taskId){
 												sigle = false;
+												if(haveForeignTousseNode && allowForeignToussePartiallyPacking){
+													var cNodeBasketName = cNode.get('basketName');
+													var cNodeBasketBarcode = cNode.get('basketBarcode');
+													var basketBarcodeArr = cNodeBasketBarcode.split(';');
+													if(!Ext4.Array.contains(basketBarcodeArr,basketBarcode)){
+														cNode.set('basketName',cNodeBasketName+';'+basketName);
+														cNode.set('basketBarcode',cNodeBasketBarcode+';'+basketBarcode);
+													}
+												}
 												break;
 											}
 			            				}