Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r26547 -r26806
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 26547)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 26806)
@@ -287,5 +287,7 @@
   //禁止删除外来器械包的已有材料
   disableModifyExistMaterilaOfForeignTousse:true,
   //按包统计并显示消毒物品
-  showDisinfectionByPackage:true
+  showDisinfectionByPackage:true,
+  //外来器械申请单只允许选择已有的外来器械包定义，true只能选择，false或者不配置可输入
+  onlySelectExistedForeignTousse:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r26438 -r26806
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 26438)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 26806)
@@ -75,12 +75,18 @@
                 	var record = context.record;
                 	var isLeaf = record.get('leaf');
                 	var colIdx = context.colIdx;					
-					if(sstsConfig.foreignTousseAddWeight){
+					if(sstsConfig.foreignTousseAddWeight){						
 						if(!isLeaf && (colIdx == 4 || colIdx == 5 || colIdx == 7 || colIdx == 8)){//根节点不能编辑
 							return false;
 						}else if(isLeaf && (colIdx == 1 ||　colIdx == 6  || colIdx == 9|| colIdx == 10 || colIdx == 11 || colIdx == 3)){
 							return false;
 						}
+					}else if(sstsConfig.onlySelectExistedForeignTousse){//外来器械申请单器械包材料名称父节点不允许编辑
+						if(!isLeaf && (colIdx == 2 || colIdx == 3 || colIdx == 4 || colIdx == 6 || colIdx == 7)){
+							return false;
+						}else if(isLeaf && (colIdx == 1 ||　colIdx == 5  || colIdx == 8|| colIdx == 9 || colIdx == 10)){
+							return false;
+						}
 					}else{
 						if(!isLeaf && (colIdx == 3 || colIdx == 4 || colIdx == 6 || colIdx == 7)){
 							return false;
@@ -1087,8 +1093,9 @@
 			triggerAction : 'all',
 			hideTrigger : false,
 			typeAhead : false,
-			forceSelection:false,
-			allowBlank : true,
+			allowBlank : true,	
+			queryDelay: sstsConfig.onlySelectExistedForeignTousse ? 1300: 0,				
+			forceSelection: sstsConfig.onlySelectExistedForeignTousse ? true: false,
 			listeners : {
 				select:function(combo, records, index){
 					var suppler1Comp = top.Ext4.getCmp("suppler1");