Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r21292 -r23408 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 21292) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 23408) @@ -49,9 +49,17 @@ fields : [ 'value'], data : [[CONSTANT_YES],[CONSTANT_NO]] }); + + var goodsTypeData = []; + goodsTypeData.push(['普通物品']); + //如果启用了一次性物品高值耗材时,才可以选择高值耗材 + if(sstsConfig.enableExpensiveGoods){ + goodsTypeData.push(['高值耗材']); + } var goodsTypeStore = new Ext.data.SimpleStore( { fields : [ 'value'], - data : [['普通物品'],['高值耗材']] + //data : [['普通物品'],['高值耗材']] + data : goodsTypeData }); //能否被科室申请 @@ -611,7 +619,22 @@ editable : false, triggerAction : 'all', anchor : '95%' - }] + }] + },{ + columnWidth : 1, + layout : 'form', + labelWidth : 110, + hidden : !sstsConfig.enableConsumeOneDisposableGoodsNeedTousseAmount, + items : [{ + xtype : 'numberfield', + fieldLabel : '对应的包数量', + maxLength : '16', + id : 'consumeOneNeedTousseAmount', + name : 'consumeOneNeedTousseAmount', + allowDecimals : false, + allowBlank : true, + anchor : '95%' + }] } ] },{ @@ -1228,7 +1251,6 @@ {header : "是否消毒供应中心领用物品",width : 100,dataIndex : 'isSupplyRoomGoods'}, {header : "最小库存",width : 60,dataIndex : 'minStorage'}, {id : 'operationRemark',header : "最大库存",width : 60,dataIndex : 'maxStorage'} - ]; var readerDetail = [ @@ -1253,7 +1275,8 @@ {name : 'isPartOfTousseMaterial'}, {name : 'referencePrice'}, {name : 'isApplicationMaterial'}, - {name : 'isSupplyRoomGoods'} + {name : 'isSupplyRoomGoods'}, + {name : 'consumeOneNeedTousseAmount'} ]; var filters = new Ext.grid.GridFilters({ @@ -1280,7 +1303,7 @@ var tbar = [ { text : '同步物品', - hidden : SSTS_DiposableGoods_Create, + hidden : true, iconCls : 'btn_ext_application_add', handler : function() { syncAllBaseData(); Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r23367 -r23408 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 23367) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 23408) @@ -320,7 +320,7 @@ hidden:SSTS_DisposableGoods_Manager, children:[ {hidden :SSTS_DisposableGoods_Menu,text:"一次性物品管理",href:WWWROOT+'/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_DisposableGoods_Menu,text:"高值耗材使用记录",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsUseRecordView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_DisposableGoods_Menu || !sstsConfig.enableExpensiveGoods,text:"高值耗材使用记录",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsUseRecordView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_DisposableGoodsStock_Manager,text:"一次性物品库存",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_DisposableGoodsStock_Manager || !sstsConfig.enableBatchStockCompare,text:"库存对比",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/batchStockCompare.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_DisposableGoodsOutOfStorage_Manager,text:"一次性物品出入库记录",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/storageRecordView.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js =================================================================== diff -u -r23147 -r23408 --- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js (.../config.js) (revision 23147) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js (.../config.js) (revision 23408) @@ -73,5 +73,7 @@ //采购计划显示入库状态,默认为false showGoodPurchaseStockStatus: true, //一次性物品入库单显示标签合格,验收合格选项,默认为false - godownEntryShowQualified:true + godownEntryShowQualified:true, + // 是否启用一次性物品高值耗材功能,默认为否 + enableExpensiveGoods: true } \ No newline at end of file