Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js =================================================================== diff -u -r40581 -r40591 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 40581) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 40591) @@ -117,7 +117,7 @@ }; //NFYY-101:关联设备参数 -function showAssociatedWin(grid){ +function showAssociatedWin(grid, resultData){ var records = grid.getSelectionModel().getSelections(); if (records.length == 0) { showResult("请选择清洗消毒记录!"); @@ -169,7 +169,7 @@ {header : "文件名",width : 80,dataIndex : 'fileName',menuDisabled:true} ]) - if(washDataType == WASHDATATYPE_STERIS_CHANGLONG){ + if(resultData.deviceModel == STERIS_CHANGLONG){ cm = new top.Ext.grid.ColumnModel([ {header : "id",dataIndex : 'id',hidden : true}, {header : "清洗结束时间",width : 80,dataIndex : 'endDate',menuDisabled:true}, @@ -761,7 +761,7 @@ if (success) { var arr = ['Belimed']; if(arr.indexOf(result.data.deviceBrand) == -1){ - showAssociatedWin(grid); + showAssociatedWin(grid, result.data); }else { showResult('未支持的设备型号:' + result.data.deviceBrand); }