Index: ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js =================================================================== diff -u -r29929 -r30219 --- ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js (.../config.js) (revision 29929) +++ ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js (.../config.js) (revision 30219) @@ -215,5 +215,7 @@ //发货界面,是否启用保存并打印按钮 enableSaveAndPrintWhenInvoice : true, //禁用基数限制 - disableCardinalNumLimit:true + disableCardinalNumLimit:true, + //启用器械包状态进度条 + enableTousseStatusProgressBar:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp =================================================================== diff -u -r29977 -r30219 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 29977) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 30219) @@ -115,11 +115,187 @@ 器械包实体信息 + + cellpadding="0" cellspacing="0"> + + +
+ +
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r29977 -r30219 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 29977) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30219) @@ -451,6 +451,46 @@ }); }); +//更新进度条的状态 +function updateprogressStatus(items){ + var status = ''; + var tousseType = ''; + var isSterile = ''; + for(var i=0;i<10;i++){ + documentGetElementsByClassName('s-step')[i].classList.remove("active"); + } + document.getElementById('step3-line').classList.remove('border'); + document.getElementById('step7-line').classList.remove('border'); + for(var i=0;i 0){ + for(var i=0;i<=index;i++){ + documentGetElementsByClassName('s-step'+i)[0].className = 's-step s-step'+i+' active'; + } + } + + if(tousseType == '消毒物品' && isSterile == '否'){ + documentGetElementsByClassName('s-step5')[0].className = 's-step s-step5 none'; + documentGetElementsByClassName('s-step6')[0].className = 's-step s-step6 none'; + document.getElementById('step7-line').className = 'border'; + }else if(tousseType == '敷料包'){ + documentGetElementsByClassName('s-step1')[0].className = 's-step s-step1 none'; + documentGetElementsByClassName('s-step2')[0].className = 's-step s-step2 none'; + document.getElementById('step3-line').className = 'border'; + }else if(tousseType == '自定义器械包'){ + documentGetElementsByClassName('s-step0')[0].className = 's-step s-step0 none'; + documentGetElementsByClassName('s-step1')[0].className = 's-step s-step1 none'; + documentGetElementsByClassName('s-step2')[0].className = 's-step s-step2 none'; + document.getElementById('step3-line').className = 'border'; + } +} + //初始函数 var readyFunction = function(serverTime) { var columns = new Array(); @@ -1181,7 +1221,8 @@ // paddings:'50 20 20 20', // autoHeight : true, // autoScroll : true, - height : fontSize == 12 ? 210 : 245, + height : (fontSize == 12 ? 210 : 245), + margins:sstsConfig.enableTousseStatusProgressBar?'50 0 0 0':'0', items : { layout : 'column', width: fontSize == 12 ? 1100 : 1300, @@ -1441,8 +1482,20 @@ //数据加载时,将数量统计赋值给全局变量 grid.store.on('load',function (store){ totalDataCount = store.totalLength; + var items = store.data.items; + if(items.length == 1 && sstsConfig.enableTousseStatusProgressBar){ + updateprogressStatus(items); + } }); + if(sstsConfig.enableTousseStatusProgressBar){ + grid.addListener('rowclick', function(grid, rowindex, e){ + var selectionModel = grid.getSelectionModel(); + var items = selectionModel.selections.items; + updateprogressStatus(items); + }); + } + new Ext.Viewport({ layout : 'border', items : [form, { @@ -1452,6 +1505,12 @@ items : grid }] }); + + Ext.onReady(function(){ + if(sstsConfig.enableTousseStatusProgressBar){ + document.getElementById('progressBars').style.display = 'block'; + } + }) } //回收记录,装配记录视频