Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r17727 -r17737
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 17727)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 17737)
@@ -3843,6 +3843,7 @@
var returnButton = "";
var returnGoodsButton = "";
var viewReturnGoodsButton = "";
+ var invoicePlanType = record.data.type;
// 未提交或者待发货的单,不显示签收以及查看发货单按钮
if (record.data.committedStatus == '' || deliverStatus == '待发货'){
return "";
@@ -3861,7 +3862,7 @@
inoviceButton = "";
}
}
- if(sstsConfig.enableReturnGoodsByInvoicePlan){
+ if(sstsConfig.enableReturnGoodsByInvoicePlan && (invoicePlanType != customTousseApplicationForm) && invoicePlanType != foreignTousseApplicationForm && invoicePlanType != foreignPorxyApplicationForm){
if(deliverStatus == '已发货' || deliverStatus == '部分发货' || invoiceStatus == '部分签收' || invoiceStatus == '已签收'){
returnGoodsButton += "";
returnGoodsButton += "";