Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r34875 -r35019 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 34875) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 35019) @@ -402,6 +402,15 @@ }); } +//添加质量监测 +function addQualityMonitoringForUser(){ + var records = []; + if(useItemsStore.getCount() > 0){ + records = top.Ext.getCmp('tousseInstanceGrid').getSelectionModel().getSelections(); + } + addQualityMonitoringByResponPart("其他环节",'',records); +} + //根据三个自身条码查找已扫描的物品 function getScanedGoodsByBodyCode(firstBodyCode, secondBodyCode, thirdBodyCode) { @@ -3303,9 +3312,15 @@ id: 'useAmount', name: 'useAmount', cls: 'fieldReadOnlyNoRemove', - width: 70, + width: 25, value: 0, anchor: '99%' + }, { + xtype: 'button', + text: '质量监测', + handler: function () { + addQualityMonitoringForUser(); + } }] })] }, { Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp =================================================================== diff -u -r34937 -r35019 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 34937) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 35019) @@ -10,6 +10,8 @@ <%@ page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance,com.forgon.disinfectsystem.entity.useRecord.UseRecord" %> <%@page import="com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail" %> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface"%> +<%@page import="com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition"%> +<%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition"%> <% String userName = AcegiHelper.getLoginUser().getUserFullName(); String currentOrgUnitName = AcegiHelper.getLoginUser().getCurrentOrgUnitName(); @@ -104,6 +106,11 @@ } var isEnableTousseOpRecipient = <%=isEnableTousseOpRecipient%>; var isEnableTousseOpDestLocation = <%=isEnableTousseOpDestLocation%>; + //质量监测 + var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>'; + var moduleNameArr = new Array("<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_RECYCLING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_WASH%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_PACKING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_REVIEW%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_STERILIZATION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INVOICE%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_USERECORD%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_ROXYDISINFECTION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INFECTIONPART%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_OTHERPART%>"); + var parm_s_type ="质量监测"; + var userName = '<%=request.getAttribute("userName")%>'; @@ -114,7 +121,11 @@ + + + +