Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/instrumentSetDemandReport.js =================================================================== diff -u -r41523 -r41584 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/instrumentSetDemandReport.js (.../instrumentSetDemandReport.js) (revision 41523) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/instrumentSetDemandReport.js (.../instrumentSetDemandReport.js) (revision 41584) @@ -42,7 +42,11 @@ var myMask; Ext.onReady(function () { Ext.QuickTips.init(); - var operationReservationDeparts = sstsConfig.operationReservationDeparts || []; + var operationReservationDeparts = []; + var operationReservationSettings = sstsConfig.operationReservationSettings || {}; + if(operationReservationSettings && operationReservationSettings['operationReservationDeparts']){ + operationReservationDeparts = operationReservationSettings['operationReservationDeparts']; + } operationReservationDeparts.unshift({ name: '全部', code: '-1' }) var departStore = new Ext.data.Store({ reader: new top.Ext.data.JsonReader({