Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r21326 -r21343 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 21326) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 21343) @@ -2582,45 +2582,51 @@ top.Ext.getCmp('cycleCounter').setValue(0); } } + + var nexFn = function(){ + var result = getItemTreeData(); + top.Ext.getCmp("sterilizationGoods").setValue(result); + var barcodePostionInfo = getBarcodePositionData(); + top.Ext.getCmp("barcodePositionInfo").setValue(barcodePostionInfo); + Ext.getCmp("formSubmitResult").setValue(0); + formObj.form + .submit( { + url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!savesterilizationRecord.do', + method : 'POST', + waitMsg : '正在保存数据,请稍候', + waitTitle : '提交表单', + success : function(form, action) { + var result = Ext.decode(action.response.responseText); + if(result && result.message){ + showResult(result.message); + }else{ + showResult('保存成功'); + } + grid.dwrReload(); + sterilizationRecordWin.close(); + //表单提交完给隐藏域formSubmitResult设置为1,自动化测试会用到 + Ext.getCmp("formSubmitResult").setValue(1); + }, + failure : function(form, action) { + var result = Ext.decode(action.response.responseText); + if(result && result.message){ + showResult(result.message); + } + } + }); + } + if (!hasGoods){ top.Ext.MessageBox.confirm("请确认","没有添加灭菌的物品,继续灭菌吗?", function(button, text) { if ("yes" == button){ - var result = getItemTreeData(); - top.Ext.getCmp("sterilizationGoods").setValue(result); - var barcodePostionInfo = getBarcodePositionData(); - top.Ext.getCmp("barcodePositionInfo").setValue(barcodePostionInfo); - Ext.getCmp("formSubmitResult").setValue(0); - formObj.form - .submit( { - url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!savesterilizationRecord.do', - method : 'POST', - waitMsg : '正在保存数据,请稍候', - waitTitle : '提交表单', - success : function(form, action) { - var result = Ext.decode(action.response.responseText); - if(result && result.message){ - showResult(result.message); - }else{ - showResult('保存成功'); - } - grid.dwrReload(); - sterilizationRecordWin.close(); - //表单提交完给隐藏域formSubmitResult设置为1,自动化测试会用到 - Ext.getCmp("formSubmitResult").setValue(1); - }, - failure : function(form, action) { - var result = Ext.decode(action.response.responseText); - if(result && result.message){ - showResult(result.message); - } - } - }); - }else{ + nexFn(); + }else{ return false; } - }); - + }); + }else{ + nexFn(); } }