Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r28310 -r28311
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 28310)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 28311)
@@ -1424,14 +1424,19 @@
 				/*if(top.Ext.getCmp("washingMode").getValue()!=washMachine){
 					setFieldsHide(true);
 				}*/
-				var endTimeStr = new Date(action.result.data.endDateStr).getTime();
-				var nowTimeStr = new Date().getTime();
-
-				if(endTimeStr < nowTimeStr){
-					top.Ext.getCmp('disinfectIdentification').disable();
-					top.Ext.getCmp('startDateStr').disable();
-					top.Ext.getCmp('disinfectProgram').disable();
-					top.Ext.getCmp('endDateStr').disable();
+				if(action.result.data.endDateStr){
+					var endTimeStr = new Date(action.result.data.endDateStr.replace(/-/g,'/')).getTime();
+					var nowTimeStr = new Date().getTime();
+					if(endTimeStr < nowTimeStr){
+						top.Ext.getCmp('disinfectIdentification').disable();
+						top.Ext.getCmp('startDateStr').disable();
+						top.Ext.getCmp('disinfectProgram').disable();
+						top.Ext.getCmp('endDateStr').disable();
+						top.Ext.getCmp('disinfectIdentification').readOnly = true;
+						top.Ext.getCmp('startDateStr').readOnly = true;
+						top.Ext.getCmp('disinfectProgram').readOnly = true;
+						top.Ext.getCmp('endDateStr').readOnly = true;
+					}
 				}
 
 				//初始化日期大小