Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r40362 -r40364 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40362) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40364) @@ -4879,22 +4879,11 @@ if (!SSTS_ForeignTousseApplication_Update && sstsConfig.enableForeignTousseUsedAgainFunction) { var endStatus = action.result.data.endStatus; - var deliverStatus = action.result.data.deliverStatus; var recyclingStatus = action.result.data.recyclingStatus; if(endStatus == '已终止'){ return } - if(deliverStatus == '已发货'){ - if(sstsConfig.enableSecondRecyclingAfterInvoiceFunction){ - if((packageStatus.indexOf('已签收') >= 0 && recyclingStatus == '已接收') || (packageStatus.indexOf('已发货') >= 0 && recyclingStatus == '已接收') || (packageStatus.indexOf('待二次回收') >= 0 && recyclingStatus == '待回收')){ - top.Ext4.getCmp('foreignTousseUsedAgainBtn').show(); - } - }else { - if((packageStatus.indexOf('待二次回收') >= 0 && recyclingStatus == '待回收')){ - top.Ext4.getCmp('foreignTousseUsedAgainBtn').show(); - } - } - } + top.Ext4.getCmp('foreignTousseUsedAgainBtn').show(); } }, failure : function(form, action) {