Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js =================================================================== diff -u -r14471 -r14494 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 14471) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 14494) @@ -307,8 +307,9 @@ minWidth : 70, iconCls : 'icon_set', handler : function() { - $Id('startTime').value = ""; - $Id('endTime').value = ""; + Ext.getCmp('startDate').setValue(""); + Ext.getCmp('endDate').setValue(""); + Ext.getCmp('maerialName').setValue(""); } }] }); Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r14273 -r14494 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 14273) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 14494) @@ -1,7 +1,8 @@ var entityName = "灭菌管理"; var sterilizationFailureRcords; var grid; - +var interruptFormObj; +var interruptWin; // 删除 function deleteSterilizationRecord(grid) { @@ -138,6 +139,9 @@ if( typeof(sterilizationRecordWin) != 'undefined' && sterilizationRecordWin != null ){ sterilizationRecordWin.close(); } + if( typeof(interruptWin) != 'undefined' && interruptWin != null ){ + interruptWin.close(); + } } }); } @@ -217,6 +221,9 @@ if( typeof(sterilizationRecordWin) != 'undefined' && sterilizationRecordWin != null ){ sterilizationRecordWin.close(); } + if( typeof(interruptWin) != 'undefined' && interruptWin != null ){ + interruptWin.close(); + } var records = grid.getSelectionModel().getSelections(); var ids = null; for ( var i = 0, len = records.length; i < len; i++) { @@ -309,6 +316,9 @@ if( typeof(sterilizationRecordWin) != 'undefined' && sterilizationRecordWin != null ){ sterilizationRecordWin.close(); } + if( typeof(interruptWin) != 'undefined' && interruptWin != null ){ + interruptWin.close(); + } Ext.MessageBox.show({ msg: '正在提交,请稍候...', width:300, @@ -453,6 +463,64 @@ loadFormData(grid,b); } +function callModifyFunction1(){ + interruptFormObj = new top.Ext.FormPanel( { + id : 'interruptFormObj', + frame : true, + labelAlign:'right', + labelSeparator : ':', + bodyStyle : 'padding:5px 5px 0px 5px', + labelWidth : 80, + autoHeight : true, + autoScroll : true, + items : [ { + xtype : 'hidden', + name : 'id', + id : 'id' + }], + buttons : [ { + id : 'continueBtn', + text : '继续灭菌', + handler : function (){ + sterilizationContinue(); + } + },{ + id : 'finishBtn', + text : '完成灭菌', + handler : function() { + sterilizationComplete(grid,statusEnd); + } + },{ + id : 'failerBtn', + text : '灭菌失败', + handler : function(){ + sterilizationFailure(grid,statusFailure); + sterilizerStatus = statusFailure; + } + }, { + text : '取消', + id : 'cancleBtn', + handler : function(){ + interruptWin.close(); + } + } ] + }); + + interruptWin = new top.Ext.Window( { + id : 'interruptWin', + layout : 'fit', + title : '中断操作', + width : 600, + border : false, + modal : true, + autoHeight : true, + plain : true, + items : [ interruptFormObj ] + }); + interruptWin.show(); + +} + function renderCallModifyFunction(v, p, record){ if(pop){ return v; @@ -470,7 +538,7 @@ } if(v == '灭菌中断' && packageSterilizationCount <=1){ var str = ""; + + " title=\"重新灭菌\" style=\"cursor:pointer;\" onclick=\"callModifyFunction1();return false;\">"; return str; } return;