Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r18491 -r18800 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 18491) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 18800) @@ -1534,6 +1534,7 @@ id:"addMaterialQualityMonitoring", handler: function(){ materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection(); + otherPartAddQM = true; addQualityMonitoringByResponPart("清洗消毒"); } }], @@ -1620,6 +1621,7 @@ iconCls : 'btn_ext_application_add', handler : function() { materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection(); + otherPartAddQM = true; addQualityMonitoringByResponPart("清洗消毒"); } },"-",{ Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r18725 -r18800 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 18725) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 18800) @@ -220,6 +220,7 @@ function(button, text) { if ("yes" == button){ // addQualityMonitoring(""); + otherPartAddQM = true; addQualityMonitoringByResponPart("灭菌管理"); } }); @@ -310,6 +311,7 @@ function(button, text) { if ("yes" == button){ // addQualityMonitoring(""); + otherPartAddQM = true; addQualityMonitoringByResponPart("灭菌管理"); } }); @@ -364,6 +366,7 @@ return false; } // addQualityMonitoring(); + otherPartAddQM = true; addQualityMonitoringByResponPart("灭菌管理"); } Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r18493 -r18800 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 18493) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 18800) @@ -128,6 +128,7 @@ Ext.getCmp('washSaveConfirm').setValue("1"); grid.dwrReload(); if(status == washfaild){ + otherPartAddQM = true; addQualityMonitoringByResponPart("清洗消毒"); } } @@ -156,6 +157,7 @@ showResult("一次只能选中一条清洗记录!"); return false; } + otherPartAddQM = true; addQualityMonitoringByResponPart("清洗消毒"); } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordCompleteForm.js =================================================================== diff -u -r18725 -r18800 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordCompleteForm.js (.../sterilizationRecordCompleteForm.js) (revision 18725) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordCompleteForm.js (.../sterilizationRecordCompleteForm.js) (revision 18800) @@ -311,6 +311,7 @@ if(bcs != null && bcs != ''){ // 如果有扫描器械包,添加质量监测记录 qualityMonitoringSterilizationID = id; + otherPartAddQM = true; addQualityMonitoringByResponPart("灭菌管理"); } } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp =================================================================== diff -u -r18776 -r18800 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp (.../addQualityMonitoring.jsp) (revision 18776) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp (.../addQualityMonitoring.jsp) (revision 18800) @@ -64,6 +64,7 @@ disableShowImageButton = false; recycleQM = true; var panel = getFormPanelContent(""); + otherPartAddQM = true; recycleAddQualityMonitoringDo(errorDamageQmKey); var viewport = new Ext.Viewport( { layout : 'border', Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r18756 -r18800 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 18756) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 18800) @@ -16,6 +16,7 @@ var materialMsg = null; var tousseInstanceInfo = ""; var recycleQM = false; +var otherPartAddQM = false; function cancelQualityMonitoring() { closeQMWindow(); @@ -1297,8 +1298,9 @@ // formDefinitionStore.baseParams.isNotLimitInspect = "是"; // formDefinitionStore.load(); // }else{ - formDefinitionStore.baseParams.responsiblePerson = responPartName; - formDefinitionStore.load(); + otherPartAddQM = true; + formDefinitionStore.baseParams.responsiblePerson = responPartName; + formDefinitionStore.load(); // } } // 责任环节带出监测项的配置 @@ -2057,15 +2059,19 @@ ), listeners:{ load:function(store,records) { -// if(records.length>0) { -// Ext.getCmp('formName').setValue(records[0].data.name); -// addQualityMonitoringItem(records[0].data.id,records[0].data.name); -// Ext.getCmp("formDefinitionId").setValue(records[0].data.id); -// Ext.getCmp("name").setValue(records[0].data.name); -// }else{ -// // 没有找到监测项 -// Ext.getCmp('formName').setValue(''); -// } + if( otherPartAddQM == true ){ + if(records.length>0) { + Ext.getCmp('formName').setValue(records[0].data.name); + addQualityMonitoringItem(records[0].data.id,records[0].data.name); + Ext.getCmp("formDefinitionId").setValue(records[0].data.id); + Ext.getCmp("name").setValue(records[0].data.name); + }else{ + // 没有找到监测项 + Ext.getCmp('formName').setValue(''); + } + } + // 加载监测项对所选的项赋初值,只是从其他环节进来执行一次. + otherPartAddQM = false; } } }); @@ -2743,7 +2749,7 @@ Ext.getCmp('responsibilityPart').setValue(responPartName); if(sstsConfig.hasOwnProperty('responsibilityPartNotLimitInspect') && sstsConfig.responsibilityPartNotLimitInspect){ formDefinitionStore.baseParams.responsiblePerson = responPartName; - formDefinitionStore.baseParams.isNotLimitInspect = "是"; + //formDefinitionStore.baseParams.isNotLimitInspect = "是"; formDefinitionStore.load(); }else{ formDefinitionStore.baseParams.responsiblePerson = responPartName;