Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js =================================================================== diff -u -r25835 -r26739 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 25835) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 26739) @@ -710,6 +710,7 @@ layout:'form', labelWidth : 100, columnWidth: 0.5, + height:38, items:[{ xtype : 'numberfield', allowNegative : false, //不允许负数 @@ -723,6 +724,7 @@ layout:'form', labelWidth : 100, columnWidth: 0.5, + height:38, items:[{ xtype : 'numberfield', allowNegative : false, //不允许负数 @@ -736,6 +738,7 @@ layout:'form', labelWidth : 100, columnWidth: 0.5, + height:38, items:[{ xtype : 'numberfield', allowNegative : false, //不允许负数 @@ -749,7 +752,27 @@ layout:'form', labelWidth : 100, columnWidth: 0.5, + height:38, items:[{ + xtype : 'combo', + fieldLabel : '是否允许手动选择生物监测结果', + allowBlank : true, + name : 'isAllowHandMovementSelectBiologicalResult', + id : 'isAllowHandMovementSelectBiologicalResult', + valueField : 'value', + displayField : 'value', + forceSelection : true, + store : isResetStore, + mode : 'local', + triggerAction : 'all', + anchor : '95%' + }] + },{ + layout:'form', + labelWidth : 100, + columnWidth: 0.5, + height:38, + items:[{ columnWidth : 0.5, xtype : 'combo', fieldLabel : '每天提醒的灭菌程序', @@ -770,6 +793,7 @@ layout : 'column', xtype:'fieldset', title:'生物监测的结果默认值', + height:38, autoHeight:true, items:[{ layout : 'form', @@ -1056,6 +1080,7 @@ top.Ext.getCmp('isEveryDayReset').setValue('是'); top.Ext.getCmp('isCheckSterilizationTime').setValue('否'); top.Ext.getCmp('isAutoCompleteSterilization').setValue('是'); + top.Ext.getCmp('isAllowHandMovementSelectBiologicalResult').setValue('是'); } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r26658 -r26739 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 26658) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 26739) @@ -3987,6 +3987,10 @@ disableItems(); } }else{ //灭菌完成 + //是否允许手动选择生物监测结果”选择为选否时,生物监测结果不允许手动选择,只能从生物阅读器接口获取结果写入。 + if(sr.sterilizer.isAllowHandMovementSelectBiologicalResult !="是"){ + top.Ext.getCmp('biologyResult').disable(); + } _biologicalMonitoringTime = sr.sterilizer.biologicalMonitoringTime*60*1000; //此灭菌炉的生物监测持续时间 top.Ext.getCmp('biologicalObserveDate').setValue(formatDateYear(sr.biologicalObserveDate)); //生物监测的观察时间 top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(sr.biologicalMonitoringStartDate)); //生物监测的开始时间