Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js =================================================================== diff -u -r40394 -r40579 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js (.../deviceInterfaceForm.js) (revision 40394) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js (.../deviceInterfaceForm.js) (revision 40579) @@ -140,7 +140,7 @@ displayField : 'value', store : new Ext.data.SimpleStore({ fields : [ 'value' ], - data : [[BELIMED],[STERIS],[GETINGE],[JIANGHAN],[CHANGLONG],[XINHUA],[MARGE],[JOHNSON],[YOUYUAN],[KPS_CASP],[SENOH],[MATACHANA],[STERIVAC3M],[MELAG],[JNK]] + data : [[BELIMED],[STERIS],[GETINGE],[JIANGHAN],[XINHUA],[MARGE],[JOHNSON],[YOUYUAN],[KPS_CASP],[SENOH],[MATACHANA],[STERIVAC3M],[MELAG],[JNK]] } ), forceSelection : true, @@ -385,6 +385,7 @@ function showCmt(wrapId,id,allowBlank,comboStore){ top.Ext.getCmp(wrapId).show(); + top.Ext.getCmp(id).setValue(''); if(comboStore){ top.Ext.getCmp(id).bindStore(comboStore); } @@ -397,6 +398,7 @@ } function hideCmt(wrapId,id,allowBlank){ top.Ext.getCmp(wrapId).hide(); + top.Ext.getCmp(id).setValue(''); if(allowBlank){ top.Ext.getCmp(id).allowBlank = true; top.Ext.getCmp(id).clearInvalid(); @@ -445,6 +447,22 @@ hideCmt('passwordWrap','password',true); hideCmt('paraMatchingMethodWrap','paraMatchingMethod',true); } + }else if(deviceBrand == STERIS){ + if(deviceModel == CHANGLONG){ + var paraMatchingMethodComboStore = new Ext.data.SimpleStore({ + fields : [ 'value' ], + data : [['清洗结束时间'],['循环次数']] + }) + var deviceTypeComboStore = new Ext.data.SimpleStore({ + fields : [ 'value' ], + data : [[' '],[DEVICETYPE_LOW],[DEVICETYPE_HIGH]] + }) + showCmt('paraMatchingMethodWrap','paraMatchingMethod',true,paraMatchingMethodComboStore); + showCmt('deviceTypeWrap','deviceType',true,deviceTypeComboStore); + }else { + hideCmt('paraMatchingMethodWrap','paraMatchingMethod',true); + hideCmt('deviceTypeWrap','deviceType',true); + } } } function onDeviceBrandChange(){ @@ -527,7 +545,7 @@ }else if(deviceBrand == STERIS){ sterisModelComboStore = new Ext.data.SimpleStore({ fields : [ 'value' ], - data : [[' '],[STERIS_AMSCO_3052],[STERIS_AMSCO_V_PRO_MAX]] + data : [[' '],[STERIS_AMSCO_3052],[STERIS_AMSCO_V_PRO_MAX],[CHANGLONG]] }) showCmt('deviceModelWrap','deviceModel',true,sterisModelComboStore); }else if(deviceBrand == BELIMED ){