Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js =================================================================== diff -u -r35043 -r35047 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js (.../qualityMonitoringDefinitionView.js) (revision 35043) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js (.../qualityMonitoringDefinitionView.js) (revision 35047) @@ -1269,6 +1269,10 @@ style: 'background: none;border: none;text-align: right;', allowBlank: true }] + },{ + xtype:'hidden', + id:'hiddenWarningFrequency', + name:'hiddenWarningFrequency' }, { columnWidth: .25, layout: 'form', @@ -1748,11 +1752,51 @@ buttons: [{ id: 'saveBtn', text: '保存', - handler: saveFormDefinition + handler: function(){ + var warningFrequency = top.Ext.getCmp('warningFrequency').getValue(); + var hiddenWarningFrequency = top.Ext.getCmp('hiddenWarningFrequency').getValue(); + var endMethod = top.Ext.getCmp('endMethod').getValue(); + if(endMethod == '指定次数提醒'){ + if(warningFrequency !== hiddenWarningFrequency){ + top.Ext.Msg.confirm('请确认', '本次改动是否要重置提醒次数?', function (btn) { + if (btn == 'yes') { + saveFormDefinition() + }else { + top.Ext.getCmp('warningFrequency').setValue(hiddenWarningFrequency); + saveFormDefinition() + } + }) + }else { + saveFormDefinition() + } + }else { + saveFormDefinition() + } + } }, { id: 'deployBtn', text: '部署', - handler: deployFormDefinition + handler: function(){ + var warningFrequency = top.Ext.getCmp('warningFrequency').getValue(); + var hiddenWarningFrequency = top.Ext.getCmp('warningFrequency').getValue(); + var endMethod = top.Ext.getCmp('endMethod').getValue(); + if(endMethod == '指定次数提醒'){ + if(warningFrequency !== hiddenWarningFrequency){ + top.Ext.Msg.confirm('请确认', '本次改动是否要重置提醒次数?', function (btn) { + if (btn == 'yes') { + deployFormDefinition() + }else { + top.Ext.getCmp('warningFrequency').setValue(hiddenWarningFrequency); + deployFormDefinition() + } + }) + }else { + deployFormDefinition() + } + }else { + deployFormDefinition() + } + } }, { text: '取消', id: 'cancelBtn', @@ -1814,6 +1858,7 @@ top.Ext.getCmp('warningForFrequencyBox').hide(); } top.Ext.getCmp('warningFrequency').setValue(formConfig.warningFrequency || 1); + top.Ext.getCmp('hiddenWarningFrequency').setValue(formConfig.warningFrequency || 1); top.Ext.getCmp('warningUserIds').setValue(formConfig.warningUserIds); top.Ext.getCmp('warningUserNames').setValue(formConfig.warningUserIds); top.Ext.getCmp('warningUserNames').setRawValue(formConfig.warningUserNames);