Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r17724 -r17727
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 17724)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 17727)
@@ -3861,14 +3861,17 @@
inoviceButton = "";
}
}
- if(deliverStatus == '已发货' || deliverStatus == '部分发货' || invoiceStatus == '部分签收' || invoiceStatus == '已签收'){
- returnGoodsButton += "";
- returnGoodsButton += "";
+ if(sstsConfig.enableReturnGoodsByInvoicePlan){
+ if(deliverStatus == '已发货' || deliverStatus == '部分发货' || invoiceStatus == '部分签收' || invoiceStatus == '已签收'){
+ returnGoodsButton += "";
+ returnGoodsButton += "";
+ }
+ if(record.data.returnedGoods == '是'){
+ viewReturnGoodsButton = "";
+ }
}
- if(record.data.returnedGoods == '是'){
- viewReturnGoodsButton = "";
- }
+
var departCoding = $Id('departCoding').value; //用户的当前科室科室编码
var handleDepartCoding = record.data.handleDepartCoding; //处理科室的科室编码
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r17502 -r17727
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 17502)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 17727)
@@ -168,6 +168,7 @@
hideSterileDate: true,
//是否隐藏灭菌管理-外部代理灭菌里的制作人(只有为true时才隐藏,false或不配置都显示)
hideCssdForeignProxyDisinfectionMaker : true,
+ enableReturnGoodsByInvoicePlan:true,
//灭菌管理-外部代理灭菌里的applicant字段的显示名字(默认为申请人,省医改为接收人)
foreignProxyDisinfectionApplicantLabelName : "接收人"
}
\ No newline at end of file