Index: ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js
===================================================================
diff -u -r14600 -r15609
--- ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js	(.../returnMaterialRecordForm.js)	(revision 14600)
+++ ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js	(.../returnMaterialRecordForm.js)	(revision 15609)
@@ -430,8 +430,13 @@
 						disabled:!editableConfig.editable,
 						allowBlank: false,
 						format:'Y-m-d H:i',
-						value: new Date(),
-						anchor : '80%'
+//						value: new Date(),
+						anchor : '80%',
+						listeners : {
+							render : function() {//器械包的退货时间，取服务器时间 （cjr）
+								(!id) ? setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'returnTime') : (function(){})();
+							}
+						}
 					}]
 				}, {
 					columnWidth : .5,
Index: ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceView.js
===================================================================
diff -u -r13080 -r15609
--- ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceView.js	(.../deviceMaintenanceView.js)	(revision 13080)
+++ ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceView.js	(.../deviceMaintenanceView.js)	(revision 15609)
@@ -18,7 +18,7 @@
 
 var consumptiveConfigStore;
 var selectModel;
-function addDeviceMaintenance() {
+function addDeviceMaintenance(deviceMaintenanceId) {
 	
 	consumptiveConfigStore = new top.Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
@@ -170,8 +170,13 @@
 					allowBlank: false,
 					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',
 					format:'Y-m-d H:i',
-					value: new Date(),
-					anchor : '95%'
+//					value: new Date(),
+					anchor : '95%',
+					listeners : {
+						render : function() {//故障时间，取服务器时间 （cjr）
+							(!deviceMaintenanceId) ? setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'breakdownTime') : (function(){})();
+						}
+					}
 				}]
 			},{
 				columnWidth : .5,
@@ -186,8 +191,13 @@
 					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: false,
 					format:'Y-m-d H:i',
-					value: new Date(),
-					anchor : '100%'
+//					value: new Date(),
+					anchor : '100%',
+					listeners : {
+						render : function() {//维修时间，取服务器时间 （cjr）
+							(!deviceMaintenanceId) ? setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'maintenanceTime') : (function(){})();
+						}
+					}
 				}]
 			},{
 				columnWidth : 1,
@@ -349,7 +359,7 @@
 		return false;
 	}
 	id = records[0].data['id'];
-	addDeviceMaintenance();
+	addDeviceMaintenance(id);
 	top.Ext.getCmp('deviceMaintenanceForm').form.load({
 		url : WWWROOT + '/disinfectSystem/deviceMaintenanceAction!loadDeviceMaintenance.do',
 		method : 'GET',
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r15581 -r15609
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 15581)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 15609)
@@ -778,21 +778,21 @@
 					labelWidth : 70,
 					items : [{
 						xtype : 'datefieldWithMin',
-						fieldLabel : '时间',
+						fieldLabel : '1时间',
 						id : 'returnTime',
 						name : 'returnTime',
 						editable:false,
 						disabled:!editableConfig.editable,
 						allowBlank: false,
 						format:'Y-m-d H:i',
-						value: new Date(),
-						anchor : '80%'
-//							,
-//						listeners : {
-//							render : function() {
-//								setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'returnTime');  //（一次性物品的的退货时间，取服务器时间 cjr）
-//							}
-//						}
+//						value: new Date(),
+						anchor : '80%',
+						listeners : {
+							render : function() {  //一次性物品的的退货时间，取服务器时间 cjr）
+								(!id) ? setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'returnTime') : (function(){})();
+							}
+						}
+						
 					}]
 				}, {
 					columnWidth : .5,
@@ -1784,14 +1784,14 @@
 						disabled:!editableConfig.editable,
 						allowBlank: false,
 						format:'Y-m-d H:i',
-						value: new Date(),
-						anchor : '80%'
-//							,
-//						listeners : {
-//							render : function() {
-//								setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'returnTime');  //（器械包的退货时间，取服务器时间 cjr）
-//							}
-//						}
+//						value: new Date(),
+						anchor : '80%',
+						listeners : {
+							render : function() {//器械包的退货时间，取服务器时间 （cjr）
+								(!id) ? setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'returnTime') : (function(){})();
+							}
+						}
+							
 					}]
 				}, {
 					columnWidth : .5,