Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
===================================================================
diff -u -r33449 -r33539
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js	(.../config.js)	(revision 33449)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js	(.../config.js)	(revision 33539)
@@ -246,7 +246,9 @@
      //打印标识牌时，是否把标识牌编号跟在名字后面打印出来
   printIdCardNameWithIdNumber:true,
 	  //外来器械拆分价格计算方式
-  foreignTousseSplitPriceType:0
+  foreignTousseSplitPriceType:0,
+  //启用外来器械包是否临购字段
+  enableForeignTousseIsTemporaryPurchaseField:true
 
 
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
===================================================================
diff -u -r31869 -r33539
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 31869)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 33539)
@@ -690,6 +690,30 @@
 						columnWidth : .33,
 						layout : 'form',
 						labelWidth : 90,
+						hidden:!sstsConfig.enableForeignTousseIsTemporaryPurchaseField,
+						items:[{
+							xtype : 'combo',
+							fieldLabel : '是否临购',
+							id : 'temporaryPurchase',
+							name : 'temporaryPurchase',
+							valueField : 'value',
+							displayField : 'value',
+							store : new Ext.data.SimpleStore( {
+								  fields : [ 'value'],
+								  data : [['是'],['否']]
+							  }),
+							editable : false,
+							forceSelection : true,
+							mode : 'local',
+							allowBlank : false,
+							triggerAction : 'all',
+							value : '否',
+							anchor : '95%'
+						}]
+					},{
+						columnWidth : .33,
+						layout : 'form',
+						labelWidth : 90,
 						hidden:!sstsConfig.enableRiskLevelOfTousseDefinition,
 						items:[{
 							xtype : 'combo',
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r33448 -r33539
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 33448)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 33539)
@@ -82,24 +82,33 @@
                 	var record = context.record;
 					currentRecord = record;
                 	var isLeaf = record.get('leaf');
-                	var colIdx = context.colIdx;					
+                	var colIdx = context.colIdx;
+					var field = context.field; 	
+					if(!isLeaf && (field == 'includeImplant' || field == 'amount' || field == 'usedAmountOfIncludeImplant' || field == 'minDismantleAmount')){//父节点不能编辑
+						return false;
+					}else if(isLeaf && (field == 'supplierName' || field == 'foreignToussePrintAmount' || field == 'splitNumber' || field == 'packageSize')){//子节点不能编辑
+						return false;
+					}
+
+					if(sstsConfig.enableForeignTousseIsTemporaryPurchaseField){
+						if(isLeaf && (field == 'temporaryPurchase')){
+							return false;
+						}
+					}
+
 					if(sstsConfig.foreignTousseAddWeight){
-						if(!isLeaf && (colIdx == 4 || colIdx == 5 || colIdx == 8 || colIdx == 9)){//根节点不能编辑
+						if(isLeaf && (field == 'weight' || field == 'urgentLevel')){
 							return false;
-						}else if(isLeaf && (colIdx == 1 ||　colIdx == 7  || colIdx == 10|| colIdx == 11 || colIdx == 12 || colIdx == 3)){
-							return false;
 						}
-					}else if(sstsConfig.onlySelectExistedForeignTousse && !sstsConfig.allowEditForeignTousseTousseName){//外来器械申请单器械包材料名称父节点不允许编辑
-						if(!isLeaf && (colIdx == 2 || colIdx == 3 || colIdx == 4 || colIdx == 7 || colIdx == 8)){
+					}else if(sstsConfig.onlySelectExistedForeignTousse && !sstsConfig.allowEditForeignTousseTousseName){
+						if(!isLeaf && (field == 'tousseName')){
 							return false;
-						}else if(isLeaf && (colIdx == 1 ||　colIdx == 5  || colIdx == 9 || colIdx == 10 || colIdx == 11)){
+						}else if(isLeaf && (field == 'price')){
 							return false;
 						}
-					}else{
-						if(!isLeaf && (colIdx == 3 || colIdx == 4 || colIdx == 7 || colIdx == 8)){//父节点不能编辑
+					}else {
+						if(isLeaf && (field == 'price' || field == 'urgentLevel')){
 							return false;
-						}else if(isLeaf && (colIdx == 1 ||　colIdx == 5  || colIdx == 6 || colIdx == 9|| colIdx == 10 || colIdx == 11)){//子节点不能编辑
-							return false;
 						}
 					}
                 },
@@ -146,6 +155,7 @@
 	{name : 'usedAmountOfIncludeImplant'},
 	{name : 'implantAmountOfUseRecord'},
 	{name : 'packageSize'},
+	{name : 'temporaryPurchase'},
 	{name : 'foreignToussePrintAmount'},
 	{name : 'splitNumber'},
 	{name : 'minDismantleAmount'},
@@ -767,6 +777,7 @@
 			urgentLevel:n.get("urgentLevel"),
 			urgentLevelId:n.get("urgentLevelId"),
 			packageSize : n.get("packageSize"),
+			temporaryPurchase : n.get("temporaryPurchase"),
 			foreignToussePrintAmount : n.get("foreignToussePrintAmount"),
 			splitNumber : n.get("splitNumber"),
 			materials : materials
@@ -1255,6 +1266,7 @@
 			    {name : 'suppler',mapping : 'suppler'},
 			    {name : 'includeImplant',mapping : 'includeImplant'},
 			    {name : 'packageSize',mapping : 'packageSize'},
+				{name : 'temporaryPurchase',mapping : 'temporaryPurchase'},
 			    {name : 'foreignToussePrintAmount',mapping : 'foreignToussePrintAmount'},
 			    {name : 'splitNumber',mapping : 'splitNumber'},
 			    {name : 'materials',mapping : 'materials'},
@@ -1582,10 +1594,12 @@
 				var record = foreignTousseJsonStore.findRecord("id", tousseDefinitionId);
 				var materials = [];
 				var packageSize = '';
+				var temporaryPurchase = '';
 				var foreignToussePrintAmount = 0;
 				var splitNumber = 0;
 				if(record){
 					packageSize = record.get('packageSize');
+					temporaryPurchase = record.get('temporaryPurchase');
 					foreignToussePrintAmount = record.get('foreignToussePrintAmount');
 					splitNumber = record.get('splitNumber');
 				}
@@ -1635,6 +1649,7 @@
 						oldSupplierName : suppler,
 						supplierName : suppler,
 						packageSize : (packageSize ? packageSize : defaultPackageSize),
+						temporaryPurchase: (temporaryPurchase ? temporaryPurchase : '否'),
 						foreignToussePrintAmount : (foreignToussePrintAmount ? foreignToussePrintAmount : defaultforeignToussePrintAmount),
 						splitNumber : (splitNumber ? splitNumber : defaultSplitNumber),
 						amount : 1,
@@ -1686,6 +1701,7 @@
 											oldSupplierName : result.data[i].supplierName,
 											supplierName : result.data[i].supplierName,
 											packageSize : (result.data[i].packageSize ? result.data[i].packageSize : defaultPackageSize),
+											temporaryPurchase : (result.data[i].temporaryPurchase ? result.data[i].temporaryPurchase : '否'),
 											foreignToussePrintAmount : (result.data[i].foreignToussePrintAmount ? result.data[i].foreignToussePrintAmount : defaultforeignToussePrintAmount),
 											splitNumber : (result.data[i].splitNumber ? result.data[i].splitNumber : defaultSplitNumber),
 											amount : 1,
@@ -1988,6 +2004,28 @@
             }  
         }
     },{
+    	header: '是否临购',
+    	width : 75,
+    	align:'center',
+        sortable: true,
+		hidden:!sstsConfig.enableForeignTousseIsTemporaryPurchaseField,
+        dataIndex: 'temporaryPurchase',
+        editor: {
+			xtype : 'combo',
+			id : 'temporaryPurchase',
+			name : 'temporaryPurchase',
+			width : 130,
+			valueField : 'value',
+			displayField : 'value',
+			editable:false,
+			store : new top.Ext4.data.SimpleStore({
+				fields : [ 'value' ],
+				data : [['是'],['否']]
+			}),
+			allowBlank: true,
+			forceSelection : true
+        }
+    },{
     	header: '是否植入物',
     	width : 75,
     	align:'center',
@@ -3291,7 +3329,6 @@
 						        'itemcontextmenu' : function(menutree, record, items, index, e) {  
 						            e.preventDefault();  
 						            e.stopEvent();
-
 									var isRecycled = false;
 									if(record.childNodes.length > 0){
 										isRecycled = record.get("isRecycled");