Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r32748 -r32770 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 32748) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 32770) @@ -920,7 +920,7 @@ loadFormData(grid, b); } -function callModifyFunction1() { +function callModifyFunction1(id) { interruptFormObj = new top.Ext.FormPanel({ id: 'interruptFormObj', frame: true, @@ -939,8 +939,24 @@ text: '重新灭菌', hidden:!sstsConfig.enableTheSterilizationResultJudgmentFunction, handler: function () { - interruptWin.close(); - callModifyFunction(true); + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!canReSterilization.do', + params: { sterilizationRecordId: id }, + success: function (response, options) { + var result = Ext.decode(response.responseText); + var success = result.success; + if (success) { + interruptWin.close(); + callModifyFunction(true); + }else { + showResult(result.message, null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); + } + }, + failure: function (response, options) { + var result = Ext.decode(response.responseText); + showResult(result.message, null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); + } + }); } }, { id: 'continueBtn', @@ -1023,6 +1039,7 @@ var sterilizationResult = record.data['sterilizationResult']; var sterilizerName = record.data['sterilizer.name']; var frequency = record.data['frequency']; + var id = record.data['id']; var tempId = sterilizerName + '-' + frequency; //给一个id,方便自动化测试的定位 if ((v == '灭菌失败' && packageSterilizationCount <= 1) || (sterilizationResult == '不合格' && sstsConfig.enableTheSterilizationResultJudgmentFunction)) { tempId += "-failureHandle"; @@ -1031,7 +1048,7 @@ } if (v == '灭菌中断' && packageSterilizationCount <= 1) { tempId += "-interruptionHandle"; - var str = ""; + var str = ""; return str; } return;