Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js
===================================================================
diff -u -r37259 -r37265
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js (.../instrumentRoomGoodsManagement.js) (revision 37259)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js (.../instrumentRoomGoodsManagement.js) (revision 37265)
@@ -370,24 +370,39 @@
}
}
- var sign = true;
+ var signHidden = true;
+ var tousseLocationHidden = true;
+ var returnBackHidden = true;
+ if(!SSTS_InstrumentGoodsManagement && isEnableTousseOpSign == 'true'){
+ signHidden = false;
+ }
+
+ //GDSRMYY-582:手术仪器管理拆分权限
+ if(sstsConfig.splitPermissionsOfSurgicalInstrumentsManagement){
+ tousseLocationHidden = SSTS_InstrumentGoods_TousseLocation_Manager;
+ returnBackHidden = SSTS_InstrumentGoods_ReturnBack;
+ }else {
+ tousseLocationHidden = SSTS_InstrumentGoodsManagement;
+ returnBackHidden = SSTS_InstrumentGoodsManagement;
+ }
+
var tbar = [{
text : tousseLocationManagement,
- hidden : !SSTS_InstrumentGoodsManagement,
+ hidden : tousseLocationHidden,
iconCls : 'btn_ext_application_add',
handler : function() {
returnUrl('发货');
}
},'-', {
text : '器械包签收',
- hidden : !(SSTS_InstrumentGoodsManagement && isEnableTousseOpSign == 'true'),
+ hidden : signHidden,
iconCls : 'btn_ext_application_add',
handler : function() {
returnUrl('签收');
}
},'-', {
text : '器械包回退',
- hidden : !SSTS_InstrumentGoodsManagement,
+ hidden : returnBackHidden,
iconCls : 'btn_ext_application_add',
handler : function() {
returnUrl('回退');
@@ -423,7 +438,7 @@
}]
});
- if(quickJumpOperationTousseOp == '打开位置管理'){
+ if(quickJumpOperationTousseOp == '打开位置管理' && !tousseLocationHidden){
returnUrl('发货');
}
});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r37135 -r37265
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 37135)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 37265)
@@ -3885,7 +3885,7 @@
var instrumentUseRateWorkingDay = '';
- if(sstsConfig.enableInstrumentLifeCycleTraceabilityManagement){
+ if(sstsConfig.enableInstrumentLifeCycleTraceabilityManagement && !SSTS_InstrumentInstanceParamsConfig){
instrumentUseRateWorkingDay = Ext.getCmp("instrumentUseRateWorkingDay").getValue();
if(instrumentUseRateWorkingDay == '' || instrumentUseRateWorkingDay == 0){
showResult('器械使用率工作天数系数不能为空或0!');
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r37232 -r37265
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 37232)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 37265)
@@ -364,6 +364,8 @@
enableUrgentFunction:true,
//发货时针对有植入物的器械包,是否要提示生物监测的情况
biologicalMonitoringEnable:true,
+ //手术仪器管理拆分权限
+ splitPermissionsOfSurgicalInstrumentsManagement:true,
//是否启用生物监测结果的提示
enableBiologicalMonitoringOfAllTousses:true
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r37141 -r37265
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 37141)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 37265)
@@ -423,6 +423,8 @@
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp
===================================================================
diff -u -r37259 -r37265
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp (.../instrumentRoomGoodsManagement.jsp) (revision 37259)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp (.../instrumentRoomGoodsManagement.jsp) (revision 37265)
@@ -59,10 +59,25 @@
SSTS_OR_Delete = false;
-var SSTS_InstrumentGoodsManagement = false;
+
+//手术仪器管理权限
+var SSTS_InstrumentGoodsManagement = true;
-SSTS_InstrumentGoodsManagement = true;
+ SSTS_InstrumentGoodsManagement = false;
+
+//GDSRMYY-582:手术仪器位置管理权限
+var SSTS_InstrumentGoods_TousseLocation_Manager = true;
+
+ SSTS_InstrumentGoods_TousseLocation_Manager = false;
+
+
+//GDSRMYY-582:手术仪器回退权限
+var SSTS_InstrumentGoods_ReturnBack = true;
+
+ SSTS_InstrumentGoods_ReturnBack = false;
+
+
var today = '<%=request.getAttribute("today")%>';
var isEnableTousseOpSign = '<%=request.getAttribute("isEnableTousseOpSign")%>';