Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js =================================================================== diff -u -r35047 -r35048 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js (.../qualityMonitoringDefinitionView.js) (revision 35047) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js (.../qualityMonitoringDefinitionView.js) (revision 35048) @@ -1284,7 +1284,6 @@ allowNegative: false, allowDecimals: false, anchor: '98%', - minValue:1, allowBlank: true }] }, { @@ -1949,47 +1948,52 @@ var warningUserNames = top.Ext.getCmp('warningUserNames').getValue(); var separateWrite = top.Ext.getCmp('separateWrite').getValue(); var remindAllUsers = ''; - if (cycleName == '按周') { - if (warningWeekDays == '') { - showResult('请选择提醒日期!'); - return; + if (sstsConfig.enableThePeriodicMonitoringRemindersFunction && entityName == '定期监测') { + if (cycleName == '按周') { + if (warningWeekDays == '') { + showResult('请选择提醒日期!'); + return; + } + } else if (cycleName == '按月') { + if (warningMonthDays == '') { + showResult('请填写提醒日期!'); + return; + } } - } else if (cycleName == '按月') { - if (warningMonthDays == '') { - showResult('请填写提醒日期!'); - return; + + if (endMethod == '指定日期范围提醒') { + if (warningStartDateTime == '' || warningEndDateTime == '') { + showResult('请选择日期范围!'); + return; + } + } else if (cycleName == '指定次数提醒') { + if (warningFrequency == '') { + showResult('请填写提醒次数!'); + return; + }else if(warningFrequency == 0){ + showResult('提醒次数要大于0!'); + return; + } } - } - - if (endMethod == '指定日期范围提醒') { - if (warningStartDateTime == '' || warningEndDateTime == '') { - showResult('请选择日期范围!'); + + if(warningUserNames == '' && warningUserIds == ''){ + showResult('请填写提醒人员!'); return; } - } else if (cycleName == '指定次数提醒') { - if (warningFrequency == '') { - showResult('请填写提醒次数!'); - return; + + if (warningUserNames.indexOf('all') >= 0) { + warningUserIds = '' + remindAllUsers = '是'; + } else { + if(warningUserNames !== ''){ + warningUserIds = warningUserNames + } } + + top.Ext.getCmp('warningUserIds').setValue(warningUserIds); + top.Ext.getCmp('remindAllUsers').setValue(remindAllUsers); } - if(warningUserNames == '' && warningUserIds == ''){ - showResult('请填写提醒人员!'); - return; - } - - if (warningUserNames.indexOf('all') >= 0) { - warningUserIds = '' - remindAllUsers = '是'; - } else { - if(warningUserNames !== ''){ - warningUserIds = warningUserNames - } - } - - top.Ext.getCmp('warningUserIds').setValue(warningUserIds); - top.Ext.getCmp('remindAllUsers').setValue(remindAllUsers); - for (var i = 0; i < store.getCount(); i++) { var record = store.getAt(i); var name = record.get('name');