Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/storageRecord.js
===================================================================
diff -u -r20772 -r34512
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/storageRecord.js	(.../storageRecord.js)	(revision 20772)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/storageRecord.js	(.../storageRecord.js)	(revision 34512)
@@ -2,175 +2,175 @@
 出入库记录
 依赖于 js/common.js、extjs2
 */
-function StorageRecord(){
+function StorageRecord() {
 	var Record = Ext.data.Record.create([
-                 	{name : 'operator'}, 
-                 	{name : 'batchNumber'},
-                 	{name : 'serialNumber'}, 
-                 	{name : 'time'},
-                 	{name : 'type'},
-                 	{name : 'subType'},
-                 	{name : 'warehouseName'},
-                 	{name : 'amount'},
-                 	{name : 'price'},
-                 	{name : 'totalPrice'},
-                 	{name : 'name'},
-                 	{name : 'specification'},
-                 	{name : 'displayName'},
-                 	{name : 'outTotalPrice'},
-    			    {name : 'outAmout'}
-	                                     ]);
+		{ name: 'operator' },
+		{ name: 'batchNumber' },
+		{ name: 'serialNumber' },
+		{ name: 'time' },
+		{ name: 'type' },
+		{ name: 'subType' },
+		{ name: 'warehouseName' },
+		{ name: 'amount' },
+		{ name: 'price' },
+		{ name: 'totalPrice' },
+		{ name: 'name' },
+		{ name: 'specification' },
+		{ name: 'displayName' },
+		{ name: 'outTotalPrice' },
+		{ name: 'outAmout' }
+	]);
 	var store = new Ext.data.Store({
-		reader : new Ext.data.JsonReader({
-			fields : [
-			    {name : 'operator'},
-			    {name : 'batchNumber'},
-			    {name : 'serialNumber'},
-			    {name : 'time'},
-			    {name : 'type'},
-			    {name : 'subType'},
-			    {name : 'warehouseName'},
-			    {name : 'amount'},
-			    {name : 'price'},
-			    {name : 'totalPrice'},
-			    {name : 'name'},
-			    {name : 'specification'},
-			    {name : 'displayName'},
-			    {name : 'outTotalPrice'},
-			    {name : 'outAmout'}
-			   
+		reader: new Ext.data.JsonReader({
+			fields: [
+				{ name: 'operator' },
+				{ name: 'batchNumber' },
+				{ name: 'serialNumber' },
+				{ name: 'time' },
+				{ name: 'type' },
+				{ name: 'subType' },
+				{ name: 'warehouseName' },
+				{ name: 'amount' },
+				{ name: 'price' },
+				{ name: 'totalPrice' },
+				{ name: 'name' },
+				{ name: 'specification' },
+				{ name: 'displayName' },
+				{ name: 'outTotalPrice' },
+				{ name: 'outAmout' }
+
 			]
 		})
 	});
 	var cm = new Ext.grid.ColumnModel([
-       		    {id : 'displayName',header : "物品名称",dataIndex : 'displayName',width : 160, menuDisabled: true},
-       		    {header : "批次",dataIndex : 'batchNumber',width : 80, menuDisabled: true},
-       		    {header : "单号",dataIndex : 'serialNumber',width : 80, menuDisabled: true},
-       		    {header : "单类型",dataIndex : 'type',width : 60, menuDisabled: true},
-    		    {header : "操作员",dataIndex : 'operator',width : 60, menuDisabled: true},
-    		    {header : "操作内容",dataIndex : 'subType',width : 60, menuDisabled: true},
-    		    {header : "操作时间",dataIndex : 'time',width : 120, menuDisabled: true},
-    		    {header : "仓库",dataIndex : 'warehouseName',width : 120, menuDisabled: true},
-    		    {header : "入库金额",dataIndex : 'totalPrice',width : 60, menuDisabled: true},
-    		    {header : "入库单价",dataIndex : 'price',width : 60, menuDisabled: true},
-    		    {header : "入库数量",dataIndex : 'amount',width : 60, menuDisabled: true},
-    		    {header : "出库金额",dataIndex : 'outTotalPrice',width:60,menuDisabled:true},
-    		    {header : "出库数量",dataIndex : 'outAmout',width : 60, menuDisabled:true}
-    		    ]);
+		{ id: 'displayName', header: "物品名称", dataIndex: 'displayName', width: 160, menuDisabled: true },
+		{ header: "批次", dataIndex: 'batchNumber', width: 80, menuDisabled: true },
+		{ header: "单号", dataIndex: 'serialNumber', width: 80, menuDisabled: true },
+		{ header: "单类型", dataIndex: 'type', width: 60, menuDisabled: true },
+		{ header: "操作员", dataIndex: 'operator', width: 60, menuDisabled: true },
+		{ header: "操作内容", dataIndex: 'subType', width: 60, menuDisabled: true },
+		{ header: "操作时间", dataIndex: 'time', width: 120, menuDisabled: true },
+		{ header: "仓库", dataIndex: 'warehouseName', width: 120, menuDisabled: true },
+		{ header: "入库金额", dataIndex: 'totalPrice', width: 60, menuDisabled: true },
+		{ header: "入库单价", dataIndex: 'price', width: 60, menuDisabled: true },
+		{ header: "入库数量", dataIndex: 'amount', width: 60, menuDisabled: true },
+		{ header: "出库金额", dataIndex: 'outTotalPrice', width: 60, menuDisabled: true },
+		{ header: "出库数量", dataIndex: 'outAmout', width: 60, menuDisabled: true }
+	]);
 	var gridPanelConfig = {
-			id : 'storageRecordGridPanel',
-			store : store,
-			cm : cm,
-			enableHdMenu : false,
-			width : 900,
-			height :600,
-			autoExpandColumn : 'displayName',
-			frame : false,
-			bodyStyle : 'border:1px solid #afd7af',
-			viewConfig: {
-		        forceFit:true
-			}
-		};
-	
+		id: 'storageRecordGridPanel',
+		store: store,
+		cm: cm,
+		enableHdMenu: false,
+		width: 900,
+		height: 600,
+		autoExpandColumn: 'displayName',
+		frame: false,
+		bodyStyle: 'border:1px solid #afd7af',
+		viewConfig: {
+			forceFit: true
+		}
+	};
+
 	//一次性物品
 	var disposableGoodsId;
 	//设置要查看的一次性物品的id
-	this.setDisposableGoodsId = function(id){
+	this.setDisposableGoodsId = function (id) {
 		disposableGoodsId = id;
 	}
 	//显示数据的gridPanel
 	var gridPanel = null;
 	//使用窗口显示记录信息
-	this.showDetail = function(){
+	this.showDetail = function () {
 		//grid表格对象,显示出入库的具体信息
 		gridPanel = new top.Ext.grid.GridPanel(gridPanelConfig);
 		//窗口对象
-		var storageRecordWindow = new top.Ext.Window( {
-			id : 'storageRecordWin',
-			layout : 'fit',
-			title : '',
-			header : true,
-			width : 1080,
-			border : false,
-			modal : true,
-			autoHeight : true,
-			plain : true,
-			items : [ gridPanel ]
+		var storageRecordWindow = new top.Ext.Window({
+			id: 'storageRecordWin',
+			layout: 'fit',
+			title: '',
+			header: true,
+			width: 1080,
+			border: false,
+			modal: true,
+			autoHeight: true,
+			plain: true,
+			items: [gridPanel]
 		});
 		//var store = top.Ext.getCmp('storageRecordGridPanel').getStore();
 		this.loadData(storageRecordWindow);
 		storageRecordWindow.show();
 	}
 	//获取在页面中使用的gridPanel
-	this.getShowGrid = function(){
+	this.getShowGrid = function () {
 		gridPanel = new Ext.grid.GridPanel(gridPanelConfig);
 		return gridPanel;
 	}
-	function setWindowTitle(window,json){
-		if(isUndefinedOrNull(window) || isUndefinedOrNull(json)){
+	function setWindowTitle(window, json) {
+		if (isUndefinedOrNull(window) || isUndefinedOrNull(json)) {
 			return;
 		}
 		var title = '出入库记录';
-		if(json && json.name){
+		if (json && json.name) {
 			title = json.name + ' 出入库记录'
 		}
 		window.setTitle(title);
 	}
-	function updateGridStore(store,jsonDataArray){
-		if(isUndefinedOrNull(store) || isUndefinedOrNull(jsonDataArray)){
+	function updateGridStore(store, jsonDataArray) {
+		if (isUndefinedOrNull(store) || isUndefinedOrNull(jsonDataArray)) {
 			return;
 		}
-		for(var i = 0; i < jsonDataArray.length;++i){
-	    	var storageRecordData = new Record({
-	    		operator : jsonDataArray[i].operator,
-	    		batchNumber : jsonDataArray[i].batchNumber,
-	    		serialNumber : jsonDataArray[i].serialNumber,
-	    		time : jsonDataArray[i].time,
-	    		type : jsonDataArray[i].type,
-	    		subType : jsonDataArray[i].subType,
-	    		warehouseName : jsonDataArray[i].warehouseName,
-	    		amount : jsonDataArray[i].amount,
-	    		price : jsonDataArray[i].price,
-	    		totalPrice : jsonDataArray[i].totalPrice,
-	    		name : jsonDataArray[i].name,
-	    		specification : jsonDataArray[i].specification,
-	    		displayName : jsonDataArray[i].displayName,
-	    		outTotalPrice : jsonDataArray[i].outTotalPrice,
-	    		outAmout : jsonDataArray[i].outAmout
+		for (var i = 0; i < jsonDataArray.length; ++i) {
+			var storageRecordData = new Record({
+				operator: jsonDataArray[i].operator,
+				batchNumber: jsonDataArray[i].batchNumber,
+				serialNumber: jsonDataArray[i].serialNumber,
+				time: jsonDataArray[i].time,
+				type: jsonDataArray[i].type,
+				subType: jsonDataArray[i].subType,
+				warehouseName: jsonDataArray[i].warehouseName,
+				amount: jsonDataArray[i].amount,
+				price: jsonDataArray[i].price,
+				totalPrice: jsonDataArray[i].totalPrice,
+				name: jsonDataArray[i].name,
+				specification: jsonDataArray[i].specification,
+				displayName: jsonDataArray[i].displayName,
+				outTotalPrice: jsonDataArray[i].outTotalPrice,
+				outAmout: jsonDataArray[i].outAmout
 			});
-	    	store.add(storageRecordData);
-	    }
+			store.add(storageRecordData);
+		}
 	}
-	this.loadData = function(window,startDate,endData){
-		var url = WWWROOT + '/disinfectSystem/diposableGoodsAction!loadDisposableGoodsStorageRecord.do?disposableGoodsId='+disposableGoodsId;
-		if(!isUndefinedOrNullOrEmpty(startDate)){
+	this.loadData = function (window, startDate, endData) {
+		var url = WWWROOT + '/disinfectSystem/diposableGoodsAction!loadDisposableGoodsStorageRecord.do?disposableGoodsId=' + disposableGoodsId;
+		if (!isUndefinedOrNullOrEmpty(startDate)) {
 			url += "&startDate=" + startDate;
 		}
-		if(!isUndefinedOrNullOrEmpty(endData)){
+		if (!isUndefinedOrNullOrEmpty(endData)) {
 			url += "&endData=" + endData;
 		}
 		/*var myMask = new Ext.LoadMask({
-		    msg    : '正在加载数据,请稍候...',
-		    target : Ext.getBody()
+			msg    : '正在加载数据,请稍候...',
+			target : Ext.getBody()
 		});
 		myMask.show();*/
 
 		Ext.Ajax.request({
-			url : url,
-			success : function(response, options) {
+			url: url,
+			success: function (response, options) {
 				var result = Ext.decode(response.responseText);
 				if (!isUndefinedOrNullOrEmpty(result) && result.success) {
 					store.removeAll();
-					setWindowTitle(window,result);
+					setWindowTitle(window, result);
 					var data = result.data;
-					updateGridStore(store,data);
-				    
-				}else{
+					updateGridStore(store, data);
+
+				} else {
 					showResult('加载失败，请联系系统管理员。');
 				}
 				//myMask.hide();
 			},
-			failure : function(response, options) {
+			failure: function (response, options) {
 				showResult('加载失败，请联系系统管理员。');
 				//myMask.hide();
 			}