Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r40974 -r41031
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40974)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 41031)
@@ -38,7 +38,7 @@
if (top.Ext.getCmp("tousseInfoFieldSet")) {
var getWidth = top.Ext.getCmp("tousseInfoFieldSet").items.items[0].el.dom.clientWidth;
}
-
+
function cancelQualityMonitoring() {
closeQMWindow();
}
@@ -5364,6 +5364,10 @@
} else {
top.Ext.getCmp('isQualified').setValue(isQualified);
}
+ if(sstsConfig.enableCustomEditModeForQualityMonitoring && qualityMonitoringUpdateMode == '仅登记人可以修改' && result.data.createUserName !== userName){
+ top.Ext.getCmp('saveBtn').hide();
+ top.Ext.getCmp('saveAndCreateBtn').hide();
+ }
} else {
showResultQM("找不到该条码所对应的器械包实例");
}
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp
===================================================================
diff -u -r37073 -r41031
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp (.../qualitymonitoringInstanceView.jsp) (revision 37073)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp (.../qualitymonitoringInstanceView.jsp) (revision 41031)
@@ -5,6 +5,7 @@
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %>
<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
<%@page import="com.forgon.disinfectsystem.labeltemplate.service.*"%>
<%@page import="com.forgon.disinfectsystem.entity.labeltemplate.*"%>
<%@ page contentType="text/html; charset=UTF-8"%>
@@ -16,6 +17,8 @@
request.setAttribute("TEMPLATE_NAME_PREFIX",LabelTemplate.TEMPLATE_NAME_PREFIX);
String currentOrgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
request.setAttribute("firstSupplyRoomUser",supplyRoomConfigManager.isFirstSupplyRoomOrgUnit(currentOrgUnitCode));
+ SupplyRoomConfig syscfg = supplyRoomConfigManager.getSystemParamsObj();
+ request.setAttribute("qualityMonitoringUpdateMode", syscfg.getQualityMonitoringUpdateMode());
%>
@@ -123,6 +126,7 @@
var PRINT_TEMPLATE_NAME_PREFIX = '${TEMPLATE_NAME_PREFIX}';
var firstSupplyRoomUser = '${firstSupplyRoomUser}';
var ALL = '全部';
+var qualityMonitoringUpdateMode = '${qualityMonitoringUpdateMode}';
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js
===================================================================
diff -u -r40812 -r41031
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 40812)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 41031)
@@ -1070,6 +1070,9 @@
if (top.Ext.getCmp('itemsFieldSet2')) {
top.Ext.getCmp('itemsFieldSet2').doLayout();
}
+ if(sstsConfig.enableCustomEditModeForQualityMonitoring && qualityMonitoringUpdateMode == '仅登记人可以修改' && result.data.createUserName !== userName){
+ top.Ext.getCmp('saveBtn2').hide();
+ }
}
},
failure: function (response, options) {
@@ -2057,6 +2060,9 @@
top.Ext.getCmp('disabledBarcode').disable();
top.Ext.getCmp('tempBarcode').disable();
top.Ext.getCmp('tousseName').disable();
+ if(sstsConfig.enableCustomEditModeForQualityMonitoring && qualityMonitoringUpdateMode == '仅登记人可以修改' && result.data.createUserName !== userName){
+ top.Ext.getCmp('saveBtn11').hide();
+ }
} else {
showResult("找不到该条码所对应的器械包实例");
}
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp
===================================================================
diff -u -r40302 -r41031
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp (.../routineMonitoringView.jsp) (revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp (.../routineMonitoringView.jsp) (revision 41031)
@@ -1,11 +1,16 @@
<%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance"%>
<%@page import="com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ include file="/common/taglibs.jsp"%>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %>
<%
+ SupplyRoomConfigManager supplyRoomConfigManager =(SupplyRoomConfigManager) SpringBeanManger.getBean("supplyRoomConfigManager");
request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+ SupplyRoomConfig syscfg = supplyRoomConfigManager.getSystemParamsObj();
+ request.setAttribute("qualityMonitoringUpdateMode", syscfg.getQualityMonitoringUpdateMode());
%>
@@ -63,6 +68,8 @@
//定期监测状态:未审核与已审核
var statusUnreview = '<%=QualityMonitoringInstance.STATUS_UNREVIEW %>';
var statusReviewed = '<%=QualityMonitoringInstance.STATUS_REVIEWED %>';
+var qualityMonitoringUpdateMode = '${qualityMonitoringUpdateMode}';
+var userName = '${userName}';