Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r16567 -r16633
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 16567)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 16633)
@@ -206,7 +206,7 @@
         	}
 		}
 	}
-	var text = '工具：'+toolsAmount+'件     植入物: '+includeImplantAmount+'件';
+	var text = '工具:'+toolsAmount+'件,植入物:'+includeImplantAmount+'件,共' + (toolsAmount+includeImplantAmount) + '件';
 	var amountElement = top.Ext4.getCmp('materialAmountInfo');
 	if(amountElement != null){
 		amountElement.setText(text);
@@ -559,10 +559,8 @@
 	     ]
 	});
 	
-	var forigntousseTbar = [];
-	
-	if(formType == 'apply'){
-		forigntousseTbar = [{
+	var forigntousseTbar = [
+	    {
 			text: "器械包名称:"
 		},{
 			xtype : 'combo',
@@ -709,50 +707,8 @@
 		},{
 			text: "",
 			id : 'materialAmountInfo'
-		}];
-	}else if(formType == 'recycle'){
-		forigntousseTbar = [{
-			text: "篮筐条码:"
-		},{
-			xtype : 'textfield',
-			maxLength : '50',
-			id : 'basketBarcode',
-			name : 'basketBarcode',
-			allowBlank : true,
-			width : 200,
-			listeners : {
-				render : function(c) {
-	                c.getEl().on('keypress',function(e) {
-	                    if (e.getKey() == 13) {
-	                      var thisBarcode = top.Ext4.getCmp('basketBarcode').getValue();
-	                      ContainerTableManager.getBasketByBarcodeAndProcedures(thisBarcode,basketAllowProcedure,function(jsonStr){
-				                var obj = Ext4.JSON.decode(jsonStr);
-				                if(!obj.success){
-				                  showResult(obj.message);
-				                }else{
-				                  var basketBarcodeField = top.Ext4.getCmp('barcodeStr');
-				                  var basketNameField = top.Ext4.getCmp('basketName');
-				                  basketBarcodeField.setValue(thisBarcode);
-				                  basketNameField.setValue(obj.containerName);
-				                }
-				                top.Ext4.getCmp('basketBarcode').setValue('');
-			              });
-	                    }
-	                })
-	           }
-		    }
-		},{
-			text: "篮筐名称:"
-		},{
-			xtype : 'textfield',
-			maxLength : '50',
-			id : 'basketName',
-			width : 200,
-			readOnly:true,
-			name : 'basketName',
-			allowBlank : true
-		}];
-	}
+		}
+	];
 	
 	var bbars = [];
 	var includeImplantUsedAmountHidden = false;
@@ -1546,6 +1502,12 @@
 		items : [ foreignTousseForm ]
 	});
 	
+	if(formType == 'interfere'){
+		top.Ext4.getCmp('foreignTousseName1').disable();
+		top.Ext4.getCmp('suppler1').disable();
+		top.Ext4.getCmp('addTousseBt').hide();
+	}
+	
 	foreignTousseApplyWindow.show();
 	
 	if (id != '') {// 编辑