Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js =================================================================== diff -u -r30818 -r30840 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 30818) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 30840) @@ -308,6 +308,10 @@ washAndDisinfectRecordPersonInChargeAllowBlank:false, //桌面快捷图标配置 desktopShortcutIconsConfig:["外来器械申请"], + //器械包状态进度条配置 + tousseStatusProgressBarConfig:{ "hidingNodes" :[ "已签收" ]}, + //启用器械包状态进度条 + enableTousseStatusProgressBar:true, //发货计划背景颜色设定 backgroudColorConfigOfInvoiceGoodsList : { unsterilizedColor : { "className" : "my_row_white" , "color" : "#ffffff"},//未灭菌的颜色 Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r30728 -r30840 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30728) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30840) @@ -8,6 +8,9 @@ var preciseQuery = '精确查询'; var fuzzyQuery = '模糊查询'; var inspectorName = "检查人"; +var progressStatus = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','已签收','已使用']; +var fixedProgressStatus = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','已签收','已使用']; +var progressLength = 0; if(sstsConfig.aliasNameOfInspectorField){ inspectorName = sstsConfig.aliasNameOfInspectorField; } @@ -486,7 +489,7 @@ var isSterile = ''; var applicationTime = ''; var recyclingTime = ''; - for(var i=0;i<10;i++){ + for(var i=0;i 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'; @@ -554,6 +568,35 @@ } } +//获取进度条 +function getprogressStatus(arr){ + var html = '
'; + progressLength = arr.length; + for(var i=0;i'; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + if(i == 0){ + html += '

'; + }else if(i == 3 || i == 7){ + html += '

'; + }else { + html += '

'; + } + html += '
'+arr[i]+'
'; + html += ''; + } + html += '
'; + if(window.screen.width < 1440){ + document.getElementById('progressBars_2').innerHTML = html; + }else { + document.getElementById('progressBars_1').innerHTML = html; + } +} + //初始函数 var readyFunction = function(serverTime) { var columns = new Array(); @@ -1567,31 +1610,17 @@ progressBarTbar.render(this.tbar); } if(sstsConfig.enableTousseStatusProgressBar && !isIE(8)){ - var html = '
'; - var arr = ['科室申领','回收清点','清洗消毒','已装配','已审核','灭菌中','已灭菌','已发货','已签收','已使用']; - for(var i=0;i'; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - if(i == 0){ - html += '

'; - }else if(i == 3 || i == 7){ - html += '

'; - }else { - html += '

'; + var arr = progressStatus; + if(sstsConfig.tousseStatusProgressBarConfig){ + var hidingNodes = sstsConfig.tousseStatusProgressBarConfig.hidingNodes; + for(var i=0;i= 0){ + var index = arr.indexOf(hidingNodes[i]); + arr.splice(index,1); + } } - html += '
'+arr[i]+'
'; - html += ''; } - html += '
'; - if(window.screen.width < 1440){ - document.getElementById('progressBars_2').innerHTML = html; - }else { - document.getElementById('progressBars_1').innerHTML = html; - } + getprogressStatus(arr); } } }