Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js =================================================================== diff -u -r35144 -r39425 --- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 35144) +++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 39425) @@ -1827,7 +1827,7 @@ editable : false, format : 'Y-m-d', altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', - allowBlank : true, + allowBlank : false, anchor : '95%', listeners : { select : function() { @@ -2061,6 +2061,9 @@ }); }else{ setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'dateTime'); //(设置监测时间,取服务器时间 cjr) + if(top.Ext.getCmp('srDateTime')){ + setStartDate(top.Ext, 'yyyy/MM/dd', 'srDateTime'); + } top.Ext.getCmp('amount').setValue(1); disableRecycleAndRepacking(); formDefinitionStore.load(); @@ -2495,7 +2498,7 @@ } } } - + submitForm(thiz); } @@ -2531,6 +2534,13 @@ tousseInstanceInfo = tousseBarcode + "@" + tousseInstanceId + "@" + tousseName + "@" + tousseAmount + "@" + isRecycle+ "@" + isRepacking + "@" + isDiscard+ "@" + 1 + "@" + " " + "@" + "是" +";"; } + + if (!top.Ext.getCmp('addRoutineMonitoringForm').form.isValid()) { + showResult('请正确填写表单各值。'); + thiz.enable(); + return false; + } + top.Ext.getCmp('addRoutineMonitoringForm').form.submit( { url : WWWROOT + '/disinfectSystem/qualityMonitoringInstanceAction!saveQualityMonitoringInstance.do', params : {