Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js =================================================================== diff -u -r38477 -r38510 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js (.../materialDefinitionView.js) (revision 38477) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js (.../materialDefinitionView.js) (revision 38510) @@ -487,17 +487,19 @@ hidden: profile !== 'dgsetyy', handler : function() { Ext.MessageBox.confirm("请确认","是否确定要推送材料定义?",function(button, text){ - Ext.Ajax.request({ - url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!pushMatrialDefinition.do', - success : function(response, options) { - var result = Ext.decode(response.responseText); - showResult(result.message); - }, - failure : function(response, options) { - var result = Ext.decode(response.responseText); - showResult(result.message); - } - }); + if("yes" == button){ + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!pushMatrialDefinition.do', + success : function(response, options) { + var result = Ext.decode(response.responseText); + showResult(result.message); + }, + failure : function(response, options) { + var result = Ext.decode(response.responseText); + showResult(result.message); + } + }); + } }) } }]; Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r38477 -r38510 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 38477) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 38510) @@ -1936,17 +1936,19 @@ iconCls:'btn_ext_refresh', handler : function() { Ext.MessageBox.confirm("请确认","是否确定要推送一次性物品定义?",function(button, text){ - Ext.Ajax.request({ - url : WWWROOT + '/disinfectSystem/diposableGoodsAction!pushDisposableGoods.do', - success : function(response, options) { - var result = Ext.decode(response.responseText); - showResult(result.message); - }, - failure : function(response, options) { - var result = Ext.decode(response.responseText); - showResult(result.message); - } - }); + if("yes" == button){ + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/diposableGoodsAction!pushDisposableGoods.do', + success : function(response, options) { + var result = Ext.decode(response.responseText); + showResult(result.message); + }, + failure : function(response, options) { + var result = Ext.decode(response.responseText); + showResult(result.message); + } + }); + } }) } }/*