Index: ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js
===================================================================
diff -u -r12719 -r12724
--- ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js	(.../stockTakeInfoView.js)	(revision 12719)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js	(.../stockTakeInfoView.js)	(revision 12724)
@@ -307,8 +307,8 @@
 	    listeners : {
 			load : function(store,records) {
 				if(records.length > 0 &&　id == "") {
-					if (top.Ext.getCmp('wareHouse')) {
-						top.Ext.getCmp('wareHouse').setValue(records[0].data.id);
+					if (top.Ext.getCmp('wareHouseName')) {
+						top.Ext.getCmp('wareHouseName').setValue(records[0].data.id);
 					}
 				}
 			}
@@ -359,10 +359,6 @@
 				name : 'wareHouseId',
 				id : 'wareHouseId'
 			},{
-				xtype : 'hidden',
-				name : 'wareHouseName',
-				id : 'wareHouseName'
-			},{
 				columnWidth : .3,
 				layout : 'form',
 				labelWidth : 50,
@@ -385,8 +381,8 @@
 				items : [{
 					xtype : 'datefieldWithMin',
 					fieldLabel : '盘点时间',
-					id : 'stockTakeDateStr',
-					name : 'stockTakeDateStr',
+					id : 'stockTakeDate',
+					name : 'stockTakeDate',
 					format : 'Y-m-d H:i',
 					allowBlank : false,
 					value : new Date(),
@@ -399,8 +395,8 @@
 				items : [{
 					xtype : 'combo',
 					fieldLabel : '仓库',
-					id : 'wareHouse',
-					name : 'wareHouse',
+					id : 'wareHouseName',
+					name : 'wareHouseName',
 					editable:false,
 					valueField : 'id',
 					displayField : 'name',
@@ -498,15 +494,12 @@
 					top.Ext.getCmp('updateStockBt').disable();
 					top.Ext.getCmp('saveBt').disable();
 				}
-				top.Ext.getCmp('stockTakeDateStr').setValue(Ext.util.Format.date(new Date(action.result.data.stockTakeDate.time), 'Y-m-d H:i'));
-//				var materialDataArr = eval("("+action.result.materialData+")");
-//				top.Ext.getCmp('stockTakeItemGrid').getStore().loadData(action.result.materialData);
+				top.Ext.getCmp('stockTakeDate').setValue(Ext.util.Format.date(new Date(action.result.data.stockTakeDate.time), 'Y-m-d H:i'));
 				top.Ext.getCmp('stockTakeItemGrid').getStore().loadData(action.result.data.stockTakeItems);
 				
 				// 保存原始数据,只需要保存需要修改的属性
-				setOriginalFormParams(form,['id','remark','type','stockTakeDateStr']);
+				setOriginalFormParams(form,['id','remark','type','stockTakeDate']);
 				var originalItems = buildJSONStringFromStore(top.Ext.getCmp('stockTakeItemGrid').getStore());
-				//alert(originalItems);
 				top.Ext.getCmp("originalItems").setValue(originalItems);
 			},
 			failure : function(form, action) {
@@ -525,26 +518,16 @@
 		btThis.enable();
 		return false;
 	}
-	setFormParams(form,['id','remark','type','stockTakeDateStr']);
+	setFormParams(form,['id','remark','type','stockTakeDate']);
 	var items = buildJSONStringFromStore(top.Ext.getCmp('stockTakeItemGrid').getStore());
 	top.Ext.getCmp("items").setValue(items);
 	
-	top.Ext.getCmp("wareHouseId").setValue(top.Ext.getCmp("wareHouse").getValue());
-	top.Ext.getCmp("wareHouseName").setValue(top.Ext.getCmp("wareHouse").getRawValue());
+	top.Ext.getCmp("wareHouseId").setValue(top.Ext.getCmp("wareHouseName").getValue());
 	
-	// items为json数组字符串，不会为null
 	if(items == '[]'){
 		showResult('盘点明细列表不能为空');
 		return false;
 	}
-//	var items = getMaterialItems();
-////	alert(items);
-//	if(items==''){
-//		showResult('盘点明细列表不能为空');
-//		btThis.enable();
-//		return false;	
-//	}
-//	top.Ext.getCmp("items").setValue(items);
 	
 	var msg = isUpdateStock ? ('是否更新'+type+'库存') : ('是否提交'+type+'盘点信息');
 	top.Ext.MessageBox.confirm("请确认", msg, function(btn){
@@ -827,7 +810,7 @@
 		pageSize : 20,
 		defaultSortField : 'id',
 		title : entityName + '列表',
-		defaultSortDirection : 'ASC',
+		defaultSortDirection : 'DESC',
 		isCheckboxSelectionModel : true,
 		rememberSelected : false,
 		isShowSearchField : true,