Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r28447 -r28455
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 28447)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 28455)
@@ -1315,9 +1315,9 @@
 			allowBlank : true,
 			listeners : {
 				select: function(combo, records, eOpts){
-					var foreignTousseName1Comp = top.Ext4.getCmp("foreignTousseName1");
+					var foreignTousseName1Comp = top.Ext4.getCmp("foreignTousseName1");
 					
-					foreignTousseName1Comp.setValue('');
+					foreignTousseName1Comp.setValue('');
 					foreignTousseJsonStore.currentPage = 1;
 					foreignTousseJsonStore.reload();
 					supplierContacJsonStore.load();
@@ -1389,134 +1389,134 @@
 					packageSize = record.get('packageSize');
 					foreignToussePrintAmount = record.get('foreignToussePrintAmount');
 					splitNumber = record.get('splitNumber');
-				}
-				
-				if(record == null){
-					tousseDefinitionId = "";
-				}
+				}
 				
-				if(tousseDefinitionId == ""){//这种情况是在添加外来器械的时候，随意更改包名的，再点添加按钮的情况
-					//获取外来器械包的材料信息
-					Ext4.Ajax.request({
-						url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadForeignTousseIncludeMaterials.do',
-						params : {id : tousseDefinitionId},
-						async : false,
-						success : function(response, options) {
-							var result = Ext4.JSON.decode(response.responseText);
-							if(result.success){
-								var materialsJson = result.data;
-								for(var i = 0;i < materialsJson.length;i++){
-									materials.push({
-										id : materialsJson[i].id,  //材料实例的id
-										tousseName : materialsJson[i].materialName,
-										includeImplant : materialsJson[i].includeImplant,
-										amount : materialsJson[i].amount,
-										usedAmountOfIncludeImplant : 0,
-										implantAmountOfUseRecord  : 0,
-										minDismantleAmount : materialsJson[i].minDismantleAmount,
-										washClassifyType:materialsJson[i].washClassifyType,
-										type : 'material',
-										leaf : true
-									});
-								}
-								
-							}
-						},
-						failure : function(response, opts) {
-							showResult(response.responseText);
-						}
-					});
-					
-					var tousseItem = Ext4.create('foreignTousseItemModel',{
-						id : 0,
-						tousseDefinitionId : tousseDefinitionId,
-						oldTousseName: foreignTousseName,
-						tousseName: foreignTousseName,
-						weight:"",
-						oldSupplierName : suppler,
-						supplierName : suppler,
-						packageSize : (packageSize ? packageSize : defaultPackageSize),
-						foreignToussePrintAmount : (foreignToussePrintAmount ? foreignToussePrintAmount : defaultforeignToussePrintAmount),
-						splitNumber : (splitNumber ? splitNumber : defaultSplitNumber),
-						amount : 1,
-						includeImplant : '',
-						price : foreignToussePriceOfSysParams,
-						urgentLevel:urgentLevel,
-						urgentLevelId:urgentLevelId,
-						type : 'tousse',
-						usedAmountOfIncludeImplant : 0,
-						implantAmountOfUseRecord : 0,
-						minDismantleAmount : 0,
-						leaf : false,
-						expanded : true,
-						children : materials 
-					});
-					var rootNode = foreignTousseStore.getRootNode();
-					rootNode.appendChild(tousseItem);
-					top.Ext4.getCmp('foreignTousseName1').setValue('');
-				}else{//这种是选择已有的包
-					Ext4.Ajax.request({
-						url : WWWROOT+'/disinfectSystem/baseData/tousseDefinitionAction!loadComboTousseByForeignTousseId.do?foreignTousseId='+tousseDefinitionId+'&isShowForeignTousseAncestorDefinitionForApply='+isShowForeignTousseAncestorDefinitionForApply,
-						success : function(response, options) {
-							var result = top.Ext4.decode(response.responseText);
-							if(result.success){
-								if(result.data.length > 0){
-									for(var i=0;i<result.data.length;i++){
-										var materials = []
-										for(var j=0;j<result.data[i].materials.length;j++){
-											var materialsJson = result.data[i].materials;
-											materials.push({
-												id : materialsJson[j].id,  //材料实例的id
-												tousseName : materialsJson[j].materialName,
-												includeImplant : materialsJson[j].includeImplant,
-												amount : materialsJson[j].amount,
-												usedAmountOfIncludeImplant : 0,
-												implantAmountOfUseRecord  : 0,
-												minDismantleAmount : materialsJson[j].minDismantleAmount,
-												washClassifyType:materialsJson[j].washClassifyType,
-												type : 'material',
-												leaf : true
-											});
-										}
-										var tousseItem = Ext4.create('foreignTousseItemModel',{
-											//id : result.data[i].id,
-											tousseDefinitionId : result.data[i].tousseDefinitionId,
-											oldTousseName: result.data[i].name,
-											tousseName: result.data[i].name,
-											weight:"",
-											oldSupplierName : result.data[i].supplierName,
-											supplierName : result.data[i].supplierName,
-											packageSize : (result.data[i].packageSize ? result.data[i].packageSize : defaultPackageSize),
-											foreignToussePrintAmount : (result.data[i].foreignToussePrintAmount ? result.data[i].foreignToussePrintAmount : defaultforeignToussePrintAmount),
-											splitNumber : (result.data[i].splitNumber ? result.data[i].splitNumber : defaultSplitNumber),
-											amount : 1,
-											includeImplant : '',
-											price : result.data[i].price,
-											urgentLevel:result.data[i].urgentLevel,
-											urgentLevelId:result.data[i].urgentLevelId,
-											type : 'tousse',
-											usedAmountOfIncludeImplant : 0,
-											implantAmountOfUseRecord : 0,
-											minDismantleAmount : 0,
-											leaf : false,
-											expanded : true,
-											children : materials
-										});
-										var rootNode = foreignTousseStore.getRootNode();
-										rootNode.appendChild(tousseItem);
-									}
-									top.Ext4.getCmp('foreignTousseName1').setValue('');
-									return;
-								}
-							}
-						},
-						failure : function(response, options) {
-							showResult('对不起！服务器正忙，加载失败');
-						}
-					});
-				}
-				
-			foreignTousseJsonStore.currentPage = 1;
+				if(record == null){
+					tousseDefinitionId = "";
+				}
+				
+				if(tousseDefinitionId == ""){//这种情况是在添加外来器械的时候，随意更改包名的，再点添加按钮的情况
+					//获取外来器械包的材料信息
+					Ext4.Ajax.request({
+						url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadForeignTousseIncludeMaterials.do',
+						params : {id : tousseDefinitionId},
+						async : false,
+						success : function(response, options) {
+							var result = Ext4.JSON.decode(response.responseText);
+							if(result.success){
+								var materialsJson = result.data;
+								for(var i = 0;i < materialsJson.length;i++){
+									materials.push({
+										id : materialsJson[i].id,  //材料实例的id
+										tousseName : materialsJson[i].materialName,
+										includeImplant : materialsJson[i].includeImplant,
+										amount : materialsJson[i].amount,
+										usedAmountOfIncludeImplant : 0,
+										implantAmountOfUseRecord  : 0,
+										minDismantleAmount : materialsJson[i].minDismantleAmount,
+										washClassifyType:materialsJson[i].washClassifyType,
+										type : 'material',
+										leaf : true
+									});
+								}
+								
+							}
+						},
+						failure : function(response, opts) {
+							showResult(response.responseText);
+						}
+					});
+					
+					var tousseItem = Ext4.create('foreignTousseItemModel',{
+						id : 0,
+						tousseDefinitionId : tousseDefinitionId,
+						oldTousseName: foreignTousseName,
+						tousseName: foreignTousseName,
+						weight:"",
+						oldSupplierName : suppler,
+						supplierName : suppler,
+						packageSize : (packageSize ? packageSize : defaultPackageSize),
+						foreignToussePrintAmount : (foreignToussePrintAmount ? foreignToussePrintAmount : defaultforeignToussePrintAmount),
+						splitNumber : (splitNumber ? splitNumber : defaultSplitNumber),
+						amount : 1,
+						includeImplant : '',
+						price : foreignToussePriceOfSysParams,
+						urgentLevel:urgentLevel,
+						urgentLevelId:urgentLevelId,
+						type : 'tousse',
+						usedAmountOfIncludeImplant : 0,
+						implantAmountOfUseRecord : 0,
+						minDismantleAmount : 0,
+						leaf : false,
+						expanded : true,
+						children : materials 
+					});
+					var rootNode = foreignTousseStore.getRootNode();
+					rootNode.appendChild(tousseItem);
+					top.Ext4.getCmp('foreignTousseName1').setValue('');
+				}else{//这种是选择已有的包
+					Ext4.Ajax.request({
+						url : WWWROOT+'/disinfectSystem/baseData/tousseDefinitionAction!loadComboTousseByForeignTousseId.do?foreignTousseId='+tousseDefinitionId+'&isShowForeignTousseAncestorDefinitionForApply='+isShowForeignTousseAncestorDefinitionForApply,
+						success : function(response, options) {
+							var result = top.Ext4.decode(response.responseText);
+							if(result.success){
+								if(result.data.length > 0){
+									for(var i=0;i<result.data.length;i++){
+										var materials = []
+										for(var j=0;j<result.data[i].materials.length;j++){
+											var materialsJson = result.data[i].materials;
+											materials.push({
+												id : materialsJson[j].id,  //材料实例的id
+												tousseName : materialsJson[j].materialName,
+												includeImplant : materialsJson[j].includeImplant,
+												amount : materialsJson[j].amount,
+												usedAmountOfIncludeImplant : 0,
+												implantAmountOfUseRecord  : 0,
+												minDismantleAmount : materialsJson[j].minDismantleAmount,
+												washClassifyType:materialsJson[j].washClassifyType,
+												type : 'material',
+												leaf : true
+											});
+										}
+										var tousseItem = Ext4.create('foreignTousseItemModel',{
+											//id : result.data[i].id,
+											tousseDefinitionId : result.data[i].tousseDefinitionId,
+											oldTousseName: result.data[i].name,
+											tousseName: result.data[i].name,
+											weight:"",
+											oldSupplierName : result.data[i].supplierName,
+											supplierName : result.data[i].supplierName,
+											packageSize : (result.data[i].packageSize ? result.data[i].packageSize : defaultPackageSize),
+											foreignToussePrintAmount : (result.data[i].foreignToussePrintAmount ? result.data[i].foreignToussePrintAmount : defaultforeignToussePrintAmount),
+											splitNumber : (result.data[i].splitNumber ? result.data[i].splitNumber : defaultSplitNumber),
+											amount : 1,
+											includeImplant : '',
+											price : result.data[i].price,
+											urgentLevel:urgentLevel,
+											urgentLevelId:urgentLevelId,
+											type : 'tousse',
+											usedAmountOfIncludeImplant : 0,
+											implantAmountOfUseRecord : 0,
+											minDismantleAmount : 0,
+											leaf : false,
+											expanded : true,
+											children : materials
+										});
+										var rootNode = foreignTousseStore.getRootNode();
+										rootNode.appendChild(tousseItem);
+									}
+									top.Ext4.getCmp('foreignTousseName1').setValue('');
+									return;
+								}
+							}
+						},
+						failure : function(response, options) {
+							showResult('对不起！服务器正忙，加载失败');
+						}
+					});
+				}
+				
+			foreignTousseJsonStore.currentPage = 1;
 			foreignTousseJsonStore.load();
 			}
 		},{