Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js =================================================================== diff -u -r32960 -r32971 --- ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js (.../config.js) (revision 32960) +++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/config.js (.../config.js) (revision 32971) @@ -115,8 +115,6 @@ enableAdverseEventManagement:true, //回收超时需排除之外的时间 不支持超过24小时 recyclingTimeoutNeedsToExcludeTheTime:["18:00","08:00"], - //启用器械包状态进度条 - enableTousseStatusProgressBar:true, //在器械包信息模块显示预计灭菌完成时间 displayTheEstimatedSterilizationCompletionTimeInTheTousseInformationModule:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r32954 -r32971 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 32954) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 32971) @@ -808,7 +808,8 @@ } $('.x-toolbar').css('background','url('+WWWROOT+'/ext/fontSize12/resources/images/default/toolbar/bg2.gif) left top repeat-x rgb(208, 222, 240)'); } - if(sstsConfig.displayTheEstimatedSterilizationCompletionTimeInTheTousseInformationModule && isSterile == '是' && (status == '已装配' || status == '已审核' || status == '灭菌中')){ + + if(sstsConfig.displayTheEstimatedSterilizationCompletionTimeInTheTousseInformationModule){ Ext.Ajax.request({ url : WWWROOT + '/disinfectSystem/tousseInstanceAction!displayEstimatedSterilizationCompletionTime.do', params : {tousseInstanceId : tousseInstanceId}, @@ -822,7 +823,6 @@ failure : function(response, options) {} }); } - } //获取进度条 @@ -1977,6 +1977,15 @@ } getprogressStatus(arr,titleArr); + }else if(sstsConfig.displayTheEstimatedSterilizationCompletionTimeInTheTousseInformationModule){ + var html = '
'; + html += ''; + html += '
'; + if(window.screen.width < 1366){ + document.getElementById('progressBars_2').innerHTML = html; + }else { + document.getElementById('progressBars_1').innerHTML = html; + } } } } @@ -2001,6 +2010,24 @@ var items = selectionModel.selections.items; updateprogressStatus(items); }); + }else if(sstsConfig.displayTheEstimatedSterilizationCompletionTimeInTheTousseInformationModule){ + grid.addListener('rowclick', function(grid, rowindex, e){ + var selectionModel = grid.getSelectionModel(); + var items = selectionModel.selections.items; + var tousseInstanceId = items[0].get('id'); + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/tousseInstanceAction!displayEstimatedSterilizationCompletionTime.do', + params : {tousseInstanceId : tousseInstanceId}, + success : function(response, options) { + var result = Ext.decode(response.responseText); + if(result.success){ + document.getElementById('msgLabel').innerHTML = result.message; + document.getElementById('msgLabel').style.display = 'block'; + } + }, + failure : function(response, options) {} + }); + }); } new Ext.Viewport({