Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r22216 -r22220 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 22216) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 22220) @@ -1367,7 +1367,12 @@ modal : true, border : false, plain : true, - items : [ form ] + items : [ form ], + listeners: { + close: function(thiz, eOpts) { + isInterveneAmount = false; //window关闭之后记得把“干预申请数量操作”的标记重置 + } + } }); applicationWindow.show(); @@ -1476,7 +1481,6 @@ top.Ext4.getCmp('urgentAmount').disable(); top.Ext4.getCmp('addTousseBt').disable(); top.Ext4.getCmp('departmentTemplate').disable(); - isInterveneAmount = false; } loadProduction({}, false); } Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r22180 -r22220 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 22180) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 22220) @@ -2593,7 +2593,7 @@ || type == diposableGoodsApplicationForm || type == disinfectGoodsApplicationForm) && deliverStatus != statusArr[2] - && (recyclingStatus == recycled || (!recyclingStatus && deliverStatus == statusArr[1]))){ //发货状态!=已发货 &&(回收状态=已回收 || 发货状态=部分发货) + && (recyclingStatus == recycled || (!recyclingStatus && deliverStatus == statusArr[1]))){ //发货状态!=已发货 &&(回收状态=已回收 || 发货状态=部分发货)--注意一次性物品的回收状态为空 return ""; } }},