Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
===================================================================
diff -u -r28511 -r28667
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 28511)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 28667)
@@ -70,6 +70,11 @@
 		fields : [ 'value'],
 		data : [['是'],['否']]
 	});
+
+	var timingCompleteWashStore = new Ext.data.SimpleStore( {
+		fields : [ 'value'],
+		data : [['是'],['否']]
+	});
 	
 	var yesNoStore = new Ext.data.SimpleStore( {
 		fields : [ 'value'],
@@ -397,13 +402,53 @@
 				 	id : 'isWashConfirm',
 				 	valueField : 'value',
 				 	displayField : 'value',
-				 	forceSelection : true,
+					forceSelection : true,
 				 	editable : false,
 				 	store : isWashConfirmStore,
 				 	mode : 'local',
 				 	triggerAction : 'all',
-				 	anchor : '95%'
+					anchor : '95%',
+					listeners:{
+						select:function(combo, record, index){
+							var value = record.data.value;
+							if(value == '是'){
+								top.Ext.getCmp('timingCompleteWashItems').show();
+								top.Ext.getCmp('configGrid').setHeight(440);
+							}else {
+								top.Ext.getCmp('timingCompleteWashItems').hide();
+								top.Ext.getCmp('configGrid').setHeight(415);
+							}
+						}
+					} 
 				 },{
+					columnWidth : 0.5,
+					layout : 'form',
+					labelWidth : 80,
+					hidden:false,
+					id:'timingCompleteWashItems',
+					items:[{
+						xtype : 'combo',
+						fieldLabel : '定时完成清洗',
+						allowBlank : true,
+						name : 'timingCompleteWash',
+						id : 'timingCompleteWash',
+						valueField : 'value',
+						displayField : 'value',
+						forceSelection : true,
+						editable : false,
+						store : timingCompleteWashStore,
+						mode : 'local',
+						triggerAction : 'all',
+						anchor : '95%',
+						listeners:{
+							render:function(){
+								setTimeout(function() {
+									top.Ext.getCmp('timingCompleteWashItems').hide();
+								}, 100);
+							}
+						}
+					}]
+				},{
 				 	xtype : 'combo',
 				 	fieldLabel : '默认清洗程序',
 				 	allowBlank : true,
@@ -587,6 +632,13 @@
 					configStore.loadData(Ext.util.JSON.decode(action.result.cleanMethodArrJsonData));
 					consumableStore.loadData(Ext.util.JSON.decode(action.result.consumptiveJsonData));
 					testItemStore.loadData(Ext.util.JSON.decode(action.result.detectionJsonData));
+					if(action.result.data.isWashConfirm == '是'){
+						top.Ext.getCmp('timingCompleteWashItems').show();
+						top.Ext.getCmp('configGrid').setHeight(440);
+					}else {
+						top.Ext.getCmp('timingCompleteWashItems').hide();
+						top.Ext.getCmp('configGrid').setHeight(415);
+					}
 				}else{
 					foldersCompanyJsonStore.load();
 					departmentJsonStore.load();