Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r30840 -r30842 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30840) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30842) @@ -8,9 +8,9 @@ var preciseQuery = '精确查询'; var fuzzyQuery = '模糊查询'; var inspectorName = "检查人"; +var progressLength = 0; var progressStatus = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','已签收','已使用']; var fixedProgressStatus = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','已签收','已使用']; -var progressLength = 0; if(sstsConfig.aliasNameOfInspectorField){ inspectorName = sstsConfig.aliasNameOfInspectorField; } @@ -503,24 +503,23 @@ recyclingTime = items[i].get('recyclingTime'); } var arr = ['科室申领','已回收','清洗消毒','已装配/已消毒','已审核','灭菌中/灭菌待确认','已灭菌','已发货','已签收','已使用']; + if(sstsConfig.tousseStatusProgressBarConfig){ + var hidingNodes = sstsConfig.tousseStatusProgressBarConfig.hidingNodes; + for(var i=0;i= 0){ + var index = fixedProgressStatus.indexOf(hidingNodes[i]); + arr.splice(index,1); + } + } + } var index = -1; for(var i=0;i= 0){ index = i; } } - + if(index > 0){ - if(window.screen.width < 1440){ - document.getElementById('progressBars_2').innerHTML = ''; - }else { - document.getElementById('progressBars_1').innerHTML = ''; - } - if(progressStatus.indexOf(fixedProgressStatus[index]) == -1){ - getprogressStatus(fixedProgressStatus); - }else { - getprogressStatus(progressStatus); - } for(var i=0;i<=index;i++){ documentGetElementsByClassName('s-step'+i)[0].className = 's-step s-step'+i+' active'; documentGetElementsByClassName('green'+i)[0].style.display = 'none'; @@ -1634,12 +1633,12 @@ grid.store.on('load',function (store){ totalDataCount = store.totalLength; var items = store.data.items; - if(items.length == 1 && sstsConfig.enableTousseStatusProgressBar){ + if(items.length == 1 && sstsConfig.enableTousseStatusProgressBar && !isIE(8)){ updateprogressStatus(items); } }); - if(sstsConfig.enableTousseStatusProgressBar){ + if(sstsConfig.enableTousseStatusProgressBar && !isIE(8)){ grid.addListener('rowclick', function(grid, rowindex, e){ var selectionModel = grid.getSelectionModel(); var items = selectionModel.selections.items;