Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r30261 -r30262 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30261) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30262) @@ -456,6 +456,8 @@ var status = ''; var tousseType = ''; var isSterile = ''; + var applicationTime = ''; + var recyclingTime = ''; for(var i=0;i<10;i++){ documentGetElementsByClassName('s-step')[i].className = 's-step s-step'+i; documentGetElementsByClassName('green'+i)[0].style.display = 'block'; @@ -466,6 +468,8 @@ status = items[i].get('status'); tousseType = items[i].get('tousseDefinition.tousseType'); isSterile = items[i].get('tousseDefinition.isSterile'); + applicationTime = items[i].get('applicationTime'); + recyclingTime = items[i].get('recyclingTime'); } var arr = ['科室申领','已回收','清洗消毒','已装配/已消毒','已审核','灭菌中/灭菌待确认','已灭菌','已发货','已签收','已使用']; var index = -1; @@ -503,7 +507,7 @@ documentGetElementsByClassName('green2')[0].style.display = 'none'; documentGetElementsByClassName('grey2')[0].style.display = 'block'; documentGetElementsByClassName('red2')[0].style.display = 'none'; - }else if(tousseType == '自定义器械包'){ + }else if((tousseType == '消毒物品' || tousseType == '器械包') && applicationTime == '' && applicationTime == ''){//自定义装配 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';