Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js =================================================================== diff -u -r30408 -r30409 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 30408) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 30409) @@ -124,10 +124,25 @@ * @param id 灭菌记录的id */ this.openSterilizerRecordLineChart = function(id){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp?sterilizationRecordId='+id,'', '灭菌器参数', '1050', '550'); + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp?sterilizationRecordId=' + id, '', '灭菌器参数', '1050', '550'); } + + this.openLowSterilizerRecordLineChart = function(id){ + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChart.jsp?sterilizationRecordId=' + id, '', '灭菌器参数', '1050', '550'); + } + + this.openHighSterilizerRecordLineChart = function(id){ + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/highSterilizerLineChart.jsp?sterilizationRecordId=' + id, '', '灭菌器参数', '1050', '600'); + } + + this.openLowTempForJohnsonSterilizerRecordLineChart = function(id,sterilizerName){ + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowTempForJohnsonSterilizerLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '550'); + } + + this.openLowSterilizerLineChartSterilizationParaType4 = function(id,sterilizerName){ + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType4.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '550'); + } - /** * 取消器械包实例追溯信息窗口的按钮 * @@ -1110,6 +1125,10 @@ name : 'sterilizerRecordAmounts', id : 'sterilizerRecordAmounts' },{ + xtype : 'hidden', + name : 'sterilizationParaType', + id : 'sterilizationParaType' + },{ layout : 'column', autoHeight : true, items : [{ @@ -1270,10 +1289,22 @@ readOnly : true, cls : 'fieldReadOnlyNoRemove', handler : function() { - var amounts = top.Ext.getCmp('sterilizerRecordAmounts').getValue(); var srID = top.Ext.getCmp('sterilizationRecordID').getValue(); - if(srID !== '' && srID !== null){ + var sterilizerRecordAmounts = top.Ext.getCmp('sterilizerRecordAmounts').getValue(); + var sterilizationParaType = top.Ext.getCmp('sterilizationParaType').getValue(); + var sterilizerName = top.Ext.getCmp('sterilizerName').getValue(); + if (sterilizerRecordAmounts > 0) { openSterilizerRecordLineChart(srID); + } else if (sterilizationParaType == 1) { + openLowSterilizerRecordLineChart(srID) + } else if (sterilizationParaType == 2) { + openHighSterilizerRecordLineChart(srID) + } else if (sterilizationParaType == 3) { + openLowTempForJohnsonSterilizerRecordLineChart(srID,sterilizerName) + }else if (sterilizationParaType == 4) { + openLowSterilizerLineChartSterilizationParaType4(srID,sterilizerName) + } else { + return null; } } }] @@ -2425,6 +2456,7 @@ top.Ext.getCmp('sterilizationRecordID').setValue(result.sterilizationRecordID); //灭菌记录_灭菌记录id(隐藏域) if(result.sterilizationRecordID != 0){ top.Ext.getCmp('sterilizerRecordAmounts').setValue(result.sterilizerRecordAmounts); //灭菌记录_灭菌记录数量(隐藏域) + top.Ext.getCmp('sterilizationParaType').setValue(result.sterilizationParaType); top.Ext.getCmp('sterilizerName').setValue(instance.sterilizerName); //灭菌记录_灭菌炉 top.Ext.getCmp('sterilizationType').setValue(instance.sterilingType); //灭菌记录_灭菌程序 top.Ext.getCmp('frequency').setValue(instance.sterileFrequency); //灭菌记录_炉次