Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.js =================================================================== diff -u -r34071 -r34079 --- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.js (.../view.js) (revision 34071) +++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.js (.../view.js) (revision 34079) @@ -101,7 +101,7 @@ allowBlank: false, editable: false, anchor: '95%', - value: isIE()?startDate:new Date(startDate) + value: isIE() ? startDate : new Date(startDate) }] }, { layout: 'form', @@ -117,7 +117,7 @@ allowBlank: false, editable: false, anchor: '95%', - value: isIE()?startDate:new Date(startDate) + value: isIE() ? startDate : new Date(startDate) }] }, { layout: 'form', @@ -338,6 +338,7 @@ id: 'useRecordGrid', flex: 1, border: false, + title: SSTS_ConsumptiveMaterialAddRecord ? '清洗耗材消耗记录' : '', viewConfig: { loadMask: { msg: '正在加载,请稍候...' } }, store: treeStore, bbar: [{ @@ -438,14 +439,26 @@ }] }); - new Ext4.container.Viewport({ - layout: 'border', - items: [form, { + var items = []; + if (SSTS_ConsumptiveMaterialUseRecord) { + items = [{ region: 'center', margins: '0 0 0 0', layout: 'fit', items: [useRecordGrid] }] + } else { + items = [form, { + region: 'center', + margins: '0 0 0 0', + layout: 'fit', + items: [useRecordGrid] + }] + } + + new Ext4.container.Viewport({ + layout: 'border', + items: items }); }); \ No newline at end of file Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r33961 -r34079 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 33961) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 34079) @@ -454,6 +454,17 @@ + + + + + + + + + + + Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r34078 -r34079 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 34078) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 34079) @@ -630,12 +630,12 @@ },{ text:"设备耗材消耗管理", singleClickExpand:singleClickExpandTree, - hidden:!sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction, + hidden:SSTS_ConsumptiveMaterial, children:[ - {hidden : false,text:"清洗耗材种类管理",href:WWWROOT+'/disinfectsystem/consumptiveMaterial/consumptiveMaterialType/view.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden : false,text:"清洗耗材容器管理",href:WWWROOT+'/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/view.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden : false,text:"清洗耗材消耗记录",href:WWWROOT+'/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden : false,text:"清洗耗材补充记录",href:WWWROOT+'/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.jsp',hrefTarget:linkTarget,leaf:true} + {hidden : SSTS_ConsumptiveMaterialType,text:"清洗耗材种类管理",href:WWWROOT+'/disinfectsystem/consumptiveMaterial/consumptiveMaterialType/view.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden : SSTS_ConsumptiveMaterialContainer,text:"清洗耗材容器管理",href:WWWROOT+'/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/view.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden : SSTS_ConsumptiveMaterialUseRecord,text:"清洗耗材消耗记录",href:WWWROOT+'/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden : SSTS_ConsumptiveMaterialAddRecord,text:"清洗耗材补充记录",href:WWWROOT+'/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.jsp',hrefTarget:linkTarget,leaf:true} ] },{ text:"不良事件管理", Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/view.jsp =================================================================== diff -u -r34062 -r34079 --- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/view.jsp (.../view.jsp) (revision 34062) +++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/view.jsp (.../view.jsp) (revision 34079) @@ -23,5 +23,14 @@ background: none !important; } + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.jsp =================================================================== diff -u -r34038 -r34079 --- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.jsp (.../view.jsp) (revision 34038) +++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.jsp (.../view.jsp) (revision 34079) @@ -25,5 +25,14 @@ background: none !important; } + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/view.js =================================================================== diff -u -r34071 -r34079 --- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/view.js (.../view.js) (revision 34071) +++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/view.js (.../view.js) (revision 34079) @@ -40,12 +40,14 @@ var tbar = [{ text: '添加', iconCls: 'btn_ext_application_add', + hidden:SSTS_ConsumptiveMaterialContainer, handler: function () { showAddOrEditWindow(); } }, '-', { text: '修改', iconCls: 'btn_ext_application_edit', + hidden:SSTS_ConsumptiveMaterialContainer, handler: function () { var selectedRecords = listGrid.getSelectionModel().getSelection(); var selectedCount = listGrid.getSelectionModel().getCount(); @@ -60,6 +62,7 @@ }, '-', { text: '删除', iconCls: 'btn_ext_application_del', + hidden:SSTS_ConsumptiveMaterialContainer, handler: function () { deleteConfig(listGrid); } Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r33961 -r34079 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 33961) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 34079) @@ -1290,6 +1290,47 @@ /** + * 《设备耗材消耗管理》菜单 + */ + var SSTS_ConsumptiveMaterial = true; + + if (!notInWhiteList(sstsConfig, 'enableRinserConsumptiveMaterialConsumptionFunction')) { + SSTS_ConsumptiveMaterial = false; + } + + +/** + * 《管理清洗耗材种类》菜单 + */ + var SSTS_ConsumptiveMaterialType = true; + + SSTS_ConsumptiveMaterialType = false; + + +/** + * 《管理清洗耗材容器》菜单 + */ + var SSTS_ConsumptiveMaterialContainer = true; + + SSTS_ConsumptiveMaterialContainer = false; + + +/** + * 《管理清洗耗材消耗记录》菜单 + */ + var SSTS_ConsumptiveMaterialUseRecord = true; + + SSTS_ConsumptiveMaterialUseRecord = false; + +/** + * 《管理清洗耗材补充记录》菜单 + */ + var SSTS_ConsumptiveMaterialAddRecord = true; + + SSTS_ConsumptiveMaterialAddRecord = false; + + +/** * 《科室运作监控》菜单 */ var SSTS_TousseOperateCountReport = true; Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.jsp =================================================================== diff -u -r34048 -r34079 --- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.jsp (.../view.jsp) (revision 34048) +++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.jsp (.../view.jsp) (revision 34079) @@ -48,5 +48,14 @@ width: 20px; } + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialType/view.jsp =================================================================== diff -u -r34037 -r34079 --- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialType/view.jsp (.../view.jsp) (revision 34037) +++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialType/view.jsp (.../view.jsp) (revision 34079) @@ -18,5 +18,14 @@ background: none !important; } + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.js =================================================================== diff -u -r34064 -r34079 --- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.js (.../view.js) (revision 34064) +++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.js (.../view.js) (revision 34079) @@ -97,7 +97,7 @@ allowBlank: false, editable: false, anchor: '95%', - value: isIE()?startDate:new Date(startDate) + value: isIE() ? startDate : new Date(startDate) }] }, { layout: 'form', @@ -113,7 +113,7 @@ allowBlank: false, editable: false, anchor: '95%', - value: isIE()?startDate:new Date(startDate) + value: isIE() ? startDate : new Date(startDate) }] }, { layout: 'form', @@ -271,6 +271,7 @@ frame: false, autoScroll: false, store: listStore, + title: SSTS_ConsumptiveMaterialAddRecord ? '清洗耗材补充记录' : '', dockedItems: [{ xtype: 'pagingtoolbar', store: listStore, // same store GridPanel is using @@ -282,14 +283,26 @@ } }); - new Ext4.container.Viewport({ - layout: 'border', - items: [form, { + var items = []; + if (SSTS_ConsumptiveMaterialAddRecord) { + items = [{ region: 'center', margins: '0 0 0 0', layout: 'fit', items: [listGrid] }] + } else { + items = [form, { + region: 'center', + margins: '0 0 0 0', + layout: 'fit', + items: [listGrid] + }] + } + + new Ext4.container.Viewport({ + layout: 'border', + items: items }); }); \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialType/view.js =================================================================== diff -u -r34048 -r34079 --- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialType/view.js (.../view.js) (revision 34048) +++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialType/view.js (.../view.js) (revision 34079) @@ -17,12 +17,14 @@ var tbar = [{ text: '添加', iconCls: 'btn_ext_application_add', + hidden:SSTS_ConsumptiveMaterialType, handler: function () { showAddOrEditWindow(); } }, '-', { text: '修改', iconCls: 'btn_ext_application_edit', + hidden:SSTS_ConsumptiveMaterialType, handler: function () { var selectedRecords = listGrid.getSelectionModel().getSelection(); var selectedCount = listGrid.getSelectionModel().getCount(); @@ -41,6 +43,7 @@ }, '-', { text: '删除', iconCls: 'btn_ext_application_del', + hidden:SSTS_ConsumptiveMaterialType, handler: function () { deleteConfig(listGrid); }