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;
}
+