Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r19110 -r19117 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 19110) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 19117) @@ -120,7 +120,8 @@ Utils.waitForWindowAmountEquals(1,2000); JSWaiter.waitUntilJQueryReady(); - + wait.until(ExpectedConditions.attributeToBe(Utils.driver.findElement(By + .id("qmSubmitResult")), "value", "1")); // 继续灭菌 // Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), // Utils.ACTION_SWITCH_TO_FRAME); @@ -133,9 +134,11 @@ Utils.driver.switchTo().window(Utils.driver.getWindowHandle()); Utils.retryingFindAndClick( By.xpath("//button[contains(text(), '是')]")); - + // 灭菌失败 Utils.retryingFindAndSwitchToFrame(By.id("iframe_sterilizationRecord")); + wait.until(ExpectedConditions.attributeToBe(Utils.driver.findElement(By + .id("continueSubmitResult")), "value", "1")); Utils.retryingFindAndClick( By.id(sterilizerName + "-" + SterilizationHelper.炉次_1号高温蒸汽灭菌炉)); @@ -156,11 +159,13 @@ Utils.retryingFindAndClick(By.id("repacking")); Utils.retryingFindAndClick( By.xpath("//button[contains(text(), '保存')]")); - + // 重新灭菌 // Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), // Utils.ACTION_SWITCH_TO_FRAME); JSWaiter.waitUntilJQueryReady(); + wait.until(ExpectedConditions.attributeToBe(Utils.driver.findElement(By + .id("qmSubmitResult")), "value", "1")); // TODO:要评估是否能去掉 Utils.doWait(2000); WebElement element=Utils.retryingFind( Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r18800 -r19117 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 18800) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 19117) @@ -401,6 +401,7 @@ var info = barcode + "@" + tousseInstanceId + "@" + tousseName + "@" + amount + "@" + isRecycle+ "@" + isRepacking+ "@" + 1 +";"; tousseInstanceInfo = info + tousseInstanceInfo; } + setQmSubmitResult(0); Ext.getCmp('addQualityMonitoringForm').form.submit( { url : WWWROOT + '/disinfectSystem/qualityMonitoringInstanceAction!saveQualityMonitoringInstance.do', params : { @@ -416,6 +417,7 @@ success : function(form, action) { var result = Ext.decode(action.response.responseText); showResultQM(result.message); + setQmSubmitResult(1); if(saveAndCreate){ tempFormDefintionId = Ext.getCmp("formDefinitionId").getValue(); tempFormDefinitionName = Ext.getCmp("name").getValue(); @@ -448,10 +450,17 @@ }else{ alert('failure = ' + action.failureType); } + setQmSubmitResult(-1); closeQMWindow(); } }); } + +function setQmSubmitResult(value){ + if(!isUndefinedOrNullOrEmpty(Ext.getCmp('qmSubmitResult'))){ + Ext.getCmp('qmSubmitResult').setValue(value); + } +} function showAllTousseOfSterileCheckBox(show){ if(!isUndefinedOrNullOrEmpty(qualityMonitoringSterilizationID) && show){ Ext.getCmp('allTousseOfSterile').setVisible(true); Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r18800 -r19117 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 18800) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 19117) @@ -259,13 +259,15 @@ wait:true, waitConfig: {interval:300} }); + Ext.getCmp('continueSubmitResult').setValue(0); Ext.Ajax.request({ url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!continueSterilization.do', params : {ids : ids }, success : function(response, options) { hideMessageBox(false); var result = Ext.decode(response.responseText); var success = result.success; + Ext.getCmp('continueSubmitResult').setValue(1); if (true != success) { if(result.cause){ showResult(result.cause); @@ -283,6 +285,7 @@ if(result && result.cause){ showResult(result.cause); } + Ext.getCmp('continueSubmitResult').setValue(-1); } }); } @@ -813,7 +816,7 @@ handler : function() { grid.getStore().reload(); } - },{id:'formSubmitResult',xtype:'hidden',value:'0'}]; + },{id:'formSubmitResult',xtype:'hidden',value:'0'},{id:'continueSubmitResult',xtype:'hidden',value:'0'},{id:'qmSubmitResult',xtype:'hidden',value:'0'}]; }else{ tbar = [{ text : '删除',