Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js =================================================================== diff -u -r18166 -r18176 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js (.../qualitymonitoringInstanceView.js) (revision 18166) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js (.../qualitymonitoringInstanceView.js) (revision 18176) @@ -1,5 +1,7 @@ var entityName = "质量监测"; var grid; +var tempFormDefintionId = null; +var tempFormDefinitionName = null; /** * 修改记录 * modifyRecord函数 触发modify函数调用,并传入当前列的值以及record.data对象 Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r18166 -r18176 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 18166) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 18176) @@ -379,8 +379,12 @@ showResult(result.message); if(saveAndCreate){ //showResult('保存成功'); + tempFormDefintionId = top.Ext.getCmp("formDefinitionId").getValue(); + tempFormDefinitionName = top.Ext.getCmp("name").getValue(); qualityMonitoringWin.close(); - addQualityMonitoring(""); + qualityMonitoringSterilizationID = 0; + qualityMonitoringWRRecordID = 0; + addQualityMonitoring("",tempFormDefintionId,tempFormDefinitionName); if(typeof(grid) != 'undefined' && grid != null){ grid.getStore().reload(); } @@ -1285,7 +1289,7 @@ }; } -function addQualityMonitoring(id) { +function addQualityMonitoring(id,formDefinitionId,formDefinitionName) { if(id==null||id=='undentified'){ id=""; } @@ -2112,7 +2116,6 @@ top.Ext.getCmp('createUserName').setValue(result.data.createUserName); top.Ext.getCmp('tousseDefinitionId').setValue(result.data.tousseDefinitionId); // if(result.data.positionMsg != null && result.data.positionMsg != ''){ -// alert('22244') // top.Ext.getCmp('positionC').show(); // top.Ext.getCmp('basketBarcodeC').show(); // top.Ext.getCmp('position').setValue(result.data.positionMsg); @@ -2242,7 +2245,14 @@ if(resonPart != null && resonPart != '') { formDefinitionStore.baseParams.responsiblePerson = resonPart; } - formDefinitionStore.load(); + if( !isUndefinedOrNullOrEmpty(formDefinitionId) && !isUndefinedOrNullOrEmpty(formDefinitionName) ){ + top.Ext.getCmp('formName').setValue(formDefinitionName); + addQualityMonitoringItem(formDefinitionId,formDefinitionName); + top.Ext.getCmp("formDefinitionId").setValue(formDefinitionId); + top.Ext.getCmp("name").setValue(formDefinitionName); + }else{ + formDefinitionStore.load(); + } } function saveQualityMonitoring(thiz,materialDefinitionStore,saveAndCreate) {