Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp =================================================================== diff -u -r17399 -r19495 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp (.../supplyRoomTypeView.jsp) (revision 17399) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp (.../supplyRoomTypeView.jsp) (revision 19495) @@ -11,6 +11,7 @@ + Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js =================================================================== diff -u -r19361 -r19495 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 19361) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 19495) @@ -163,5 +163,7 @@ //待回收列表,扫描没有待回收申请单的科室,是否新建回收申请单 newRecyclingApplicationWhenScanNoApplicationDepart:true, //中大附一工作质量评价指标报表 - isZSYYWorkQualityCollection : true + isZSYYWorkQualityCollection : true, + //是否启用回收申请单不发货科室配置 + enableRecyclingApplicationNotInvoice:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js =================================================================== diff -u -r19488 -r19495 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 19488) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 19495) @@ -2004,7 +2004,7 @@ ] }); - tabsItemArr.push({ + var recyclingApplicationNotInvoiceConfigTab = { title: '回收申请单不发货科室配置', layout:'fit', items:[ @@ -2123,8 +2123,10 @@ }] }) ] - }); - + }; + if(sstsConfig.enableRecyclingApplicationNotInvoice){ + tabsItemArr.push(recyclingApplicationNotInvoiceConfigTab); + } var tabs = new Ext.TabPanel({ activeTab: 0, width:document.body.offsetWidth-10,