Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r26752 -r26753
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 26752)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 26753)
@@ -1248,6 +1248,28 @@
 										allowBlank : false,
 										triggerAction : 'all'
 							       }]
+			             	  },{
+			             		  layout:'form',
+			             		  labelWidth : 180,
+			         		  	  columnWidth: .25,
+			          		      items:[{
+										xtype : 'combo',
+										fieldLabel : '包内材料扣减科室成本',
+										id : 'insideTousseMaterialOutCost',
+										name : 'insideTousseMaterialOutCost',
+										valueField : 'name',
+										displayField : 'name',
+										mode : 'local',
+										anchor : '100%',
+										editable : false,
+										store : new Ext.data.SimpleStore( {
+											fields : [ 'name'],
+											data : [['是'],['否']]
+										}),
+										forceSelection : true,
+										allowBlank : false,
+										triggerAction : 'all'
+							       }]
 			             	  }
 					]
                 },{
@@ -2797,6 +2819,11 @@
         				showResult('报损器械计算科室成本不能为空！');
         				return false;
         			}
+            		var insideTousseMaterialOutCost = Ext.getCmp("insideTousseMaterialOutCost").getValue();
+            		if(insideTousseMaterialOutCost == ""){
+        				showResult('包内材料扣减科室成本不能为空！');
+        				return false;
+        			}
             		var foreignToussePrice = Ext.getCmp("foreignToussePrice").getValue();
             		if(typeof(foreignToussePrice) != "number"){
         				showResult('外来器械包价格不能为空！');
@@ -2991,6 +3018,7 @@
 	                    	isDgConvertApplication:isDgConvertApplication,//
 	                    	isTousseDgMergeConvert:isTousseDgMergeConvert,//
 	                    	damagedTousseAtCost : damagedTousseAtCost,
+	                    	insideTousseMaterialOutCost : insideTousseMaterialOutCost,
 	                    	isCustomTousseCleanEntirely:isCustomTousseCleanEntirely,//
 	                    	isSecondSupplyRoomNeedRecycle : isSecondSupplyRoomNeedRecycle,//
 	                    	isSecondSupplyRoomAutoInvoice:isSecondSupplyRoomAutoInvoice,//
@@ -3219,6 +3247,11 @@
 			}else{
 				Ext.getCmp('damagedTousseAtCost').setValue('否');
 			}
+			if(supplyRoomConfig.insideTousseMaterialOutCost == '否'){
+				 Ext.getCmp('insideTousseMaterialOutCost').setValue('否');
+			}else{
+				Ext.getCmp('insideTousseMaterialOutCost').setValue('是');
+			}
 			if(supplyRoomConfig.ftDefaultSterilingMethod!=null){
 				  Ext.getCmp('ftDefaultSterilingMethod').setValue(supplyRoomConfig.ftDefaultSterilingMethod);
 			}