Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r14846 -r14863 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 14846) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 14863) @@ -664,27 +664,35 @@ id : 'returnBtn', disabled : disableReturnStatus, handler : function(){ - if(!foreignTousseForm.getForm().isValid()){ - showResult('请正确填写表单各值'); - return false; - } - var success = getForeignTousseInfo(); - if(success){ - submintForeignTousseForm(actionType_confirmReturn); - } + top.Ext4.MessageBox.confirm("请确认","确认归还" + entityName + "信息?",function(btn) { + if(btn=='yes') { + if(!foreignTousseForm.getForm().isValid()){ + showResult('请正确填写表单各值'); + return false; + } + var success = getForeignTousseInfo(); + if(success){ + submintForeignTousseForm(actionType_confirmReturn); + } + } + }); } },{ text : '提前归还', disabled:disableReturnStatus2, handler : function(){ - if(!foreignTousseForm.getForm().isValid()){ - showResult('请正确填写表单各值'); - return false; - } - var success = getForeignTousseInfo(); - if(success){ - submintForeignTousseForm(actionType_confirmReturn); - } + top.Ext4.MessageBox.confirm("请确认","提前归还会终止申请单,并删除装配任务,是否要提交归还?",function(btn) { + if(btn=='yes') { + if(!foreignTousseForm.getForm().isValid()){ + showResult('请正确填写表单各值'); + return false; + } + var success = getForeignTousseInfo(); + if(success){ + submintForeignTousseForm(actionType_confirmReturn); + } + } + }); } },{ text : '取消',