Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r33703 -r34097
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 33703)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 34097)
@@ -1421,7 +1421,7 @@
 					title: '外来器械参数设置',
 					layout: 'column',
 					width: itemWidth,
-					height: sstsConfig.enableForeignTousseApplyDepartment?160:130,
+					height: 160,
 					// columnWidth : 1,
 					labelWidth: 95,
 					items: [
@@ -1480,6 +1480,28 @@
 							columnWidth: .25,
 							items: [{
 								xtype: 'combo',
+								fieldLabel: '归还后释放清洗篮筐',
+								id: 'ftReleaseBasketAfterReturn',
+								name: 'ftReleaseBasketAfterReturn',
+								valueField: 'value',
+								displayField: 'value',
+								store: new Ext.data.SimpleStore({
+									fields: ['value'],
+									data: [['是'], ['否']]
+								}),
+								mode: 'local',
+								editable: false,
+								forceSelection: true,
+								allowBlank: false,
+								triggerAction: 'all',
+								anchor: '100%'
+							}]
+						}, {
+							layout: 'form',
+							labelWidth: 180,
+							columnWidth: .25,
+							items: [{
+								xtype: 'combo',
 								fieldLabel: '外来器械包是否审核',
 								id: 'foreignTousseNeedReview',
 								name: 'foreignTousseNeedReview',
@@ -3184,7 +3206,7 @@
 
 					var packingReviewTime = Ext.getCmp("packingReviewTime").getValue();
 					var reviewSterilizationTime = Ext.getCmp("reviewSterilizationTime").getValue();
-
+					var ftReleaseBasketAfterReturn = Ext.getCmp("ftReleaseBasketAfterReturn").getValue();
 					var ftDefaultPackageType = Ext.getCmp("ftDefaultPackageType").getValue();
 					var isORAppFormMerge = Ext.getCmp("isORAppFormMerge").getValue();
 					var isDgConvertApplication = Ext.getCmp("isDgConvertApplication").getValue();
@@ -3246,6 +3268,7 @@
 							dailyMonitoringMinute: dailyMonitoringMinute,//
 							foreignToussePrice: foreignToussePrice,//
 							foreignTousseCleanedEntirely: foreignTousseCleanedEntirely,//
+							ftReleaseBasketAfterReturn:ftReleaseBasketAfterReturn,
 							foreignTousseNeedReview: foreignTousseNeedReview,//
 							foreignTousseIsSecondRecycle: foreignTousseIsSecondRecycle,
 							foreignTousseAppEndTime: foreignTousseAppEndTime,
@@ -3550,6 +3573,7 @@
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrintStr').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
 			Ext.getCmp('isCustomTousseCleanEntirely').setValue(supplyRoomConfig.isCustomTousseCleanEntirely);
 			Ext.getCmp('foreignTousseCleanedEntirely').setValue(supplyRoomConfig.foreignTousseCleanedEntirely);
+			Ext.getCmp('ftReleaseBasketAfterReturn').setValue(supplyRoomConfig.ftReleaseBasketAfterReturn || '否');
 			Ext.getCmp('foreignTousseNeedReview').setValue(supplyRoomConfig.foreignTousseNeedReview);
 			Ext.getCmp('foreignTousseIsSecondRecycle').setValue(supplyRoomConfig.foreignTousseIsSecondRecycle);
 			Ext.getCmp('foreignTousseAppEndTime').setValue(supplyRoomConfig.foreignTousseAppEndTime);