Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp =================================================================== diff -u -r41353 -r41455 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 41353) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 41455) @@ -143,7 +143,59 @@ var formType_routineMonitoring = '<%=FormDefinition.FOMRTYPE_PERIODICMONITORING%>'; var formType_qualityMonitoring = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>'; - //FSEYEQ-26:Clean H101513(灭菌器型号) sterilizationParaType=18 + //FJSSSYY-1:灭菌器型号(新华低温) + // sterilizationParaType = 1 + var STERILIZATIONPARATYPE_LOW = '<%=SterilizationRecord.STERILIZATIONPARATYPE_LOW%>'; + //FJSSSYY-8:灭菌器型号(新华高温) + // sterilizationParaType = 2 + var STERILIZATIONPARATYPE_HIGH = '<%=SterilizationRecord.STERILIZATIONPARATYPE_HIGH%>'; + //SZSSKRMYY-48:灭菌器型号(强生 STERRAD 100S) + // sterilizationParaType = 3 + var STERILIZATIONPARATYPE_LOWOFJOHNSON = '<%=SterilizationRecord.STERILIZATIONPARATYPE_LOWOFJOHNSON%>'; + //KLMYSRMYY-8:灭菌器型号(洁定 HS6620) + // sterilizationParaType = 4 + var STERILIZATIONPARATYPE_HSONE = '<%=SterilizationRecord.STERILIZATIONPARATYPE_HSONE%>'; + //KPSZXYY-51:灭菌器型号(凯斯普CASP120灭菌器) + // sterilizationParaType = 5 + var STERILIZATIONPARATYPE_CASP120 = '<%=SterilizationRecord.STERILIZATIONPARATYPE_CASP120%>'; + //XJJQZYY-113:灭菌器型号(千樱脉动真空灭菌器 PLC型号S7-1200) + // sterilizationParaType = 6 + var STERILIZATIONPARATYPE_SENOH = '<%=SterilizationRecord.STERILIZATIONPARATYPE_SENOH%>'; + //SZSSKRMYY-54:灭菌器型号(低温灭菌器 PS-100GXP) + // sterilizationParaType = 7 + var STERILIZATIONPARATYPE_XINHUATYPE_PS100GXP = '<%=SterilizationRecord.STERILIZATIONPARATYPE_XINHUATYPE_PS100GXP%>'; + //SSTS-583:新华通用型 + // sterilizationParaType = 8 + var STERILIZATIONPARATYPE_TYPE_COMMON = '<%=SterilizationRecord.STERILIZATIONPARATYPE_TYPE_COMMON%>'; + //SSTS-590:洁定通用型 + // sterilizationParaType = 9 + var STERILIZATIONPARATYPE_TYPE_GETINGE_COMMON = '<%=SterilizationRecord.STERILIZATIONPARATYPE_TYPE_GETINGE_COMMON%>'; + //SSTS-590:倍力曼 + // sterilizationParaType = 10 + var STERILIZATIONPARATYPE_BELIMED = '<%=SterilizationRecord.STERILIZATIONPARATYPE_BELIMED%>'; + //ZSWY-156:灭菌器型号(西班牙美达 130LF) + // sterilizationParaType = 11 + var STERILIZATIONPARATYPE_MATACHANA_130LF = '<%=SterilizationRecord.STERILIZATIONPARATYPE_MATACHANA_130LF%>'; + //ZJYY-133:灭菌器型号(3M GS8 灭菌器) + // sterilizationParaType = 12 + var STERILIZATIONPARATYPE_STERIVAC3M_GS8_1D = '<%=SterilizationRecord.STERILIZATIONPARATYPE_STERIVAC3M_GS8_1D%>'; + //BJ309YY-8:灭菌器型号(新华环氧乙烷(XG2.C)灭菌器) + // sterilizationParaType = 13 + var STERILIZATIONPARATYPE_XINHUA_XG2_C = '<%=SterilizationRecord.STERILIZATIONPARATYPE_XINHUA_XG2_C%>'; + //BJ309YY-7:灭菌器型号(强生100NX过氧化氢灭菌器) + // sterilizationParaType = 14 + var STERILIZATIONPARATYPE_JOHNSON_100NX = '<%=SterilizationRecord.STERILIZATIONPARATYPE_JOHNSON_100NX%>'; + //NFYY-98:灭菌器型号(倍力曼V2.0) + // sterilizationParaType = 15 + var STERILIZATIONPARATYPE_BELIMED_V2_0 = '<%=SterilizationRecord.STERILIZATIONPARATYPE_BELIMED_V2_0%>'; + //GDSRMYY-596:灭菌器型号(美莱格 快速灭菌炉 43B+) + // sterilizationParaType = 16 + var STERILIZATIONPARATYPE_MELAG_43B_PLUS = '<%=SterilizationRecord.STERILIZATIONPARATYPE_MELAG_43B_PLUS%>'; + //SZSLHQZXYY-25:灭菌器型号(史帝瑞过氧化氢灭菌器) + // sterilizationParaType = 17 + var STERILIZATIONPARATYPE_AMSCO_V_PRO_MAX = '<%=SterilizationRecord.STERILIZATIONPARATYPE_AMSCO_V_PRO_MAX%>'; + //FSEYEQ-26:灭菌器型号(Clean H101513) + // sterilizationParaType = 18 var STERILIZATIONPARATYPE_XINHUA_PDF = '<%=SterilizationRecord.STERILIZATIONPARATYPE_XINHUA_PDF%>'; Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r41358 -r41455 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 41358) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 41455) @@ -1347,35 +1347,36 @@ //BJDXZLYY-74:通用弹窗 function openSterilizerRecordLineChartByParaType(sterilizationParaType, id, sterilizerName) { //显示pdf文件的type - var showPdfForType = [15]; - var commonPage = [8, 9, 10, 11, parseInt(STERILIZATIONPARATYPE_XINHUA_PDF)]; - if (sterilizationParaType == 1) { + var showPdfForType = [STERILIZATIONPARATYPE_BELIMED_V2_0]; + var commonPage = [STERILIZATIONPARATYPE_TYPE_COMMON, + STERILIZATIONPARATYPE_TYPE_GETINGE_COMMON, + STERILIZATIONPARATYPE_BELIMED, + STERILIZATIONPARATYPE_MATACHANA_130LF, + parseInt(STERILIZATIONPARATYPE_XINHUA_PDF) + ]; + if (sterilizationParaType == STERILIZATIONPARATYPE_LOW) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChart.jsp?sterilizationRecordId=' + id, '', '灭菌器参数', '1050', '700'); - } else if (sterilizationParaType == 2) { + } else if (sterilizationParaType == STERILIZATIONPARATYPE_HIGH) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/highSterilizerLineChart.jsp?sterilizationRecordId=' + id, '', '灭菌器参数', '1050', '700'); - } else if (sterilizationParaType == 3) { + } else if (sterilizationParaType == STERILIZATIONPARATYPE_LOWOFJOHNSON) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowTempForJohnsonSterilizerLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); - } else if (sterilizationParaType == 4) { + } else if (sterilizationParaType == STERILIZATIONPARATYPE_HSONE) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType4.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); - } else if (sterilizationParaType == 5) { + } else if (sterilizationParaType == STERILIZATIONPARATYPE_CASP120) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/caspSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); - } else if (sterilizationParaType == 6) { + } else if (sterilizationParaType == STERILIZATIONPARATYPE_SENOH) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/senohSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); - } else if (sterilizationParaType == 7) { + } else if (sterilizationParaType == STERILIZATIONPARATYPE_XINHUATYPE_PS100GXP) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/ps100GXPSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '700'); - } else if (sterilizationParaType == 12) { + } else if (sterilizationParaType == STERILIZATIONPARATYPE_STERIVAC3M_GS8_1D) { openSterilizerPhoto(id, '灭菌器参数'); - } else if (sterilizationParaType == 13) { - ////BJ309YY-8:灭菌炉运行参数(XG2.C) + } else if (sterilizationParaType == STERILIZATIONPARATYPE_XINHUA_XG2_C) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType13.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); - } else if (sterilizationParaType == 14) { - //BJ309YY-7:灭菌炉运行参数(强生100NX) + } else if (sterilizationParaType == STERILIZATIONPARATYPE_JOHNSON_100NX) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType14.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); - } else if (sterilizationParaType == 16) { - //GDSRMYY-596:灭菌炉运行参数(美莱格 快速灭菌炉 43B+) + } else if (sterilizationParaType == STERILIZATIONPARATYPE_MELAG_43B_PLUS) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType16.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); - } else if (sterilizationParaType == 17) { - //SZSLHQZXYY-25:灭菌炉运行参数(史帝瑞过氧化氢灭菌器) + } else if (sterilizationParaType == STERILIZATIONPARATYPE_AMSCO_V_PRO_MAX) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType17.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); } else if (commonPage.indexOf(sterilizationParaType) >= 0) { getSterilizerDataLineCharByIframeUtil(id, sterilizationParaType); @@ -1844,11 +1845,11 @@ editable: false, mode: 'local', store: new Ext.data.SimpleStore({ - data: [['灭菌日期'],['生物监测日期']], + data: [['灭菌日期'], ['生物监测日期']], fields: ['value'] }), width: 120, - value:'灭菌日期', + value: '灭菌日期', forceSelection: true, triggerAction: 'all', anchor: '95%'