Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
===================================================================
diff -u -r33259 -r33397
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 33259)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 33397)
@@ -10,14 +10,14 @@
  * 
  */
 var myMask;
-function reloadReport(){
-	
+function reloadReport() {
+
 	if (!form.getForm().isValid()) {
 		showResult('请正确填写表单各值');
 		return false;
 	}
-	
-	var startTime= $Id('startTime').value;  //开始时间
+
+	var startTime = $Id('startTime').value;  //开始时间
 	var endTime = $Id('endTime').value;  //结束时间
 	var operatorSearch = $Id('operatorSearch').value;  //录入人名字
 	var hospitalNum = $Id('hospitalNumSearch').value;  //住院号/诊疗号
@@ -28,7 +28,7 @@
 	if (!$Id('goodsSearch').value) {  //用户删除了选择的物品，但是ext并不会实际的值清空，这里手工清空一下
 		goodsId = '';
 	}
-	
+
 	myMask = new Ext.LoadMask(Ext.getBody(), {
 		msg: '正在加载，请稍候！',
 		removeMask: true
@@ -37,139 +37,139 @@
 
 	var url = WWWROOT + '/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do';
 	var params = {
-		jasperreportName : 'useRecordItemView.jasper',
-		startDay : startTime,
-		endDay : endTime,
-		depart : departSearch,
-		operatorSearch : operatorSearch,
-		hospitalNum : hospitalNum,
-		goodsId : goodsId,
-		goodsType : Ext.getCmp('goodsType').getValue(),
-		showOther : showOther,
-		barcode : barcode,
-		reportName:'useRecordItemView'
+		jasperreportName: 'useRecordItemView.jasper',
+		startDay: startTime,
+		endDay: endTime,
+		depart: departSearch,
+		operatorSearch: operatorSearch,
+		hospitalNum: hospitalNum,
+		goodsId: goodsId,
+		goodsType: Ext.getCmp('goodsType').getValue(),
+		showOther: showOther,
+		barcode: barcode,
+		reportName: 'useRecordItemView'
 	}
 
-	searchReport(url,params);
+	searchReport(url, params);
 }
 
-Ext.onReady(function(){
+Ext.onReady(function () {
 	Ext.QuickTips.init();
-	
+
 	var dt = new Date();
 	var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
-	
-	var departRecord = Ext.data.Record.create([ {
-		name : 'id'
+
+	var departRecord = Ext.data.Record.create([{
+		name: 'id'
 	}, {
-		name : 'name'
-	} ]);
+		name: 'name'
+	}]);
 	//科室选择下拉框Store
 	var departJsonStore = new Ext.data.Store({
-		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do',
-			method : 'POST'
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do',
+			method: 'POST'
 		}),
-		reader : new Ext.data.JsonReader({root : 'data'}, departRecord),
-		listeners:{
-			load : function(thiz,records,options){
-				thiz.insert(0, new departRecord({id:"-1",name:"全部"}));
+		reader: new Ext.data.JsonReader({ root: 'data' }, departRecord),
+		listeners: {
+			load: function (thiz, records, options) {
+				thiz.insert(0, new departRecord({ id: "-1", name: "全部" }));
 			}
 		}
 	});
-	
+
 	var comboGoodsRecord = Ext.data.Record.create([
-   		    {name : 'id',mapping : 'id'},
-		    {name : 'type',mapping : 'type'}, 
-		    {name : 'showName',mapping : 'showName'}, 
-		    {name : 'name',mapping : 'name'}
+		{ name: 'id', mapping: 'id' },
+		{ name: 'type', mapping: 'type' },
+		{ name: 'showName', mapping: 'showName' },
+		{ name: 'name', mapping: 'name' }
 	]);
 	//物品选择下拉框Store
 	var comboGoodsStore = new Ext.data.Store({
-		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchTousseAndDisposableGoodsAndExpensiveGoods.do'
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchTousseAndDisposableGoodsAndExpensiveGoods.do'
 		}),
-		reader : new Ext.data.JsonReader({
-			root : 'data'
-		},comboGoodsRecord)
+		reader: new Ext.data.JsonReader({
+			root: 'data'
+		}, comboGoodsRecord)
 	});
-	
-	var readerDetail = Ext.data.Record.create([{name : 'id'},{name : 'name'}]);
+
+	var readerDetail = Ext.data.Record.create([{ name: 'id' }, { name: 'name' }]);
 	//用户选择下拉框Store
 	var userJsonStore = new Ext.data.Store({
-		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/systemmanage/user/loadUserByOrgId!loadUserByOrgId.do',
-			method : 'POST'
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/systemmanage/user/loadUserByOrgId!loadUserByOrgId.do',
+			method: 'POST'
 		}),
-		reader : new Ext.data.JsonReader({
-			root : 'data'
-		},readerDetail),
-		baseParams : {
-			departId : (!isFirstRoomPeople ? currentOrgUnitCode : '')  //当前科室编码如果不是第一供应室用户，只加载本科室的所有用户
+		reader: new Ext.data.JsonReader({
+			root: 'data'
+		}, readerDetail),
+		baseParams: {
+			departId: (!isFirstRoomPeople ? currentOrgUnitCode : '')  //当前科室编码如果不是第一供应室用户，只加载本科室的所有用户
 		}
 	});
 
 	var configureObj = replaceName('aliasNameOfUseRecordFields');
-	var hospitalNumName = (configureObj.hospitalNumber == '住院号')?'住院号/诊疗号':configureObj.hospitalNumber;
-		
+	var hospitalNumName = (configureObj.hospitalNumber == '住院号') ? '住院号/诊疗号' : configureObj.hospitalNumber;
+
 	form = new Ext.form.FormPanel({
-		title : entityName,
-		region : 'north',
-		labelAlign : 'right',
-		buttonAlign : 'center',
-		collapsible : true,
-		collapseMode : 'mini',
-		split : true,
-		border : 0,
-		frame : true,
-		bodyStyle : 'padding:0px auto;margin:0px',
-		height : 140,
-		labelWidth : 80,
-		buttons:[{
-		    xtype : 'button',
-			text : '查询',
-			minWidth : 70,
-			iconCls : 'icon_search',
-			handler : function() {
+		title: entityName,
+		region: 'north',
+		labelAlign: 'right',
+		buttonAlign: 'center',
+		collapsible: true,
+		collapseMode: 'mini',
+		split: true,
+		border: 0,
+		frame: true,
+		bodyStyle: 'padding:0px auto;margin:0px',
+		height: 140,
+		labelWidth: 80,
+		buttons: [{
+			xtype: 'button',
+			text: '查询',
+			minWidth: 70,
+			iconCls: 'icon_search',
+			handler: function () {
 				reloadReport();
 			}
-		},{
-			xtype : 'button',
-			text : '重置',
-			minWidth : 70,
-			iconCls : 'icon_set',
-			handler : function() {
+		}, {
+			xtype: 'button',
+			text: '重置',
+			minWidth: 70,
+			iconCls: 'icon_set',
+			handler: function () {
 				form.getForm().reset();
 				$Id('startTime').value = "";
 				$Id('endTime').value = "";
 			}
 		}],
-		items : [{
-			layout : 'column',
-			items : [{
-				xtype : 'hidden',
-				name : 'goodsType',
-				id : 'goodsType'
-			},{
-				layout:'form',
-				columnWidth:.2,
-				items:[{
-					xtype : 'datefieldWithMin',
-					fieldLabel : '开始日期',
-					id : 'startTime',
-					name : 'startTime',
-					editable : false,
-					format : 'Y-m-d H:i:s',
-					allowBlank : false,
-					anchor : '95%',
+		items: [{
+			layout: 'column',
+			items: [{
+				xtype: 'hidden',
+				name: 'goodsType',
+				id: 'goodsType'
+			}, {
+				layout: 'form',
+				columnWidth: .2,
+				items: [{
+					xtype: 'datefieldWithMin',
+					fieldLabel: '开始日期',
+					id: 'startTime',
+					name: 'startTime',
+					editable: false,
+					format: 'Y-m-d H:i:s',
+					allowBlank: false,
+					anchor: '95%',
 					value: new Date(startDayofMonth),
-					theHours : 0,
-					theMinutes : 0,
-					listeners : {
-						specialkey : function(field, e) {
+					theHours: 0,
+					theMinutes: 0,
+					listeners: {
+						specialkey: function (field, e) {
 							if (e.getKey() == Ext.EventObject.ENTER) {
 								var isOK = field.validate();
-								if(isOK){
+								if (isOK) {
 									var value = field.getValue();
 									field.setValue(value);
 									var endTime = Ext.getCmp('endTime');
@@ -180,196 +180,196 @@
 						}
 					}
 				}]
-			},{
-				layout:'form',
-				columnWidth:.2,
-				items:[{
-					xtype : 'datefieldWithMin',
-					fieldLabel : '结束日期',
-					id : 'endTime',
-					name : 'endTime',
-					editable : false,
-					format : 'Y-m-d H:i:s',
-					allowBlank : false,
-					anchor : '95%',
+			}, {
+				layout: 'form',
+				columnWidth: .2,
+				items: [{
+					xtype: 'datefieldWithMin',
+					fieldLabel: '结束日期',
+					id: 'endTime',
+					name: 'endTime',
+					editable: false,
+					format: 'Y-m-d H:i:s',
+					allowBlank: false,
+					anchor: '95%',
 					value: new Date(),
-					theHours : 23,
-					theMinutes : 59,
-					listeners : {
-						specialkey : function(field, e) {
+					theHours: 23,
+					theMinutes: 59,
+					listeners: {
+						specialkey: function (field, e) {
 							if (e.getKey() == Ext.EventObject.ENTER) {
 								var isOK = field.validate();
-								if(isOK){
+								if (isOK) {
 									var value = field.getValue();
 									field.setValue(value);
 								}
 							}
 						}
 					}
 				}]
-			},{
-				columnWidth : .2,
-				layout : 'form',
-				items : [{
-					xtype : 'textfield',
-					fieldLabel : '条码',
-					name : 'barcodeSearch',
-					id : 'barcodeSearch',
-					anchor : '95%',
-					listeners : {
-						specialkey : function(field, ee) {
+			}, {
+				columnWidth: .2,
+				layout: 'form',
+				items: [{
+					xtype: 'textfield',
+					fieldLabel: '条码',
+					name: 'barcodeSearch',
+					id: 'barcodeSearch',
+					anchor: '95%',
+					listeners: {
+						specialkey: function (field, ee) {
 							if (ee.getKey() == Ext.EventObject.ENTER) {
 								reloadReport();
 							}
 						}
 					}
 				}]
-			},{
-				layout:'form',
-				columnWidth:.2,
-				items:[{
-					xtype : 'combo',
-					id : 'departSearch',
-					name : 'departSearch',
-					queryParam : 'spell',
-					fieldLabel : '科室',
-					minChars : 0,
-					valueField : 'id',
-					displayField : 'name',
-					store : departJsonStore,
-					forceSelection : false,
-					lazyInit : true,
-					anchor : '95%',
-					listWidth : 200,
-					disabled :!isFirstRoomPeople,
-					triggerAction : 'all',
-					hideTrigger : true,
-					typeAhead : false,
-					allowBlank : true,
-					listeners:{
-						select : function(thisCombo, record, index) {
+			}, {
+				layout: 'form',
+				columnWidth: .2,
+				items: [{
+					xtype: 'combo',
+					id: 'departSearch',
+					name: 'departSearch',
+					queryParam: 'spell',
+					fieldLabel: '科室',
+					minChars: 0,
+					valueField: 'id',
+					displayField: 'name',
+					store: departJsonStore,
+					forceSelection: false,
+					lazyInit: true,
+					anchor: '95%',
+					listWidth: 200,
+					disabled: !isFirstRoomPeople,
+					triggerAction: 'all',
+					hideTrigger: true,
+					typeAhead: false,
+					allowBlank: true,
+					listeners: {
+						select: function (thisCombo, record, index) {
 							userJsonStore.removeAll();
 							userJsonStore.baseParams.departId = thisCombo.getValue();
 							userJsonStore.reload();
 							Ext.getCmp('operatorSearch').setValue('');
 							Ext.getCmp('operatorSearch').focus();
 						}
-						
+
 					}
 				}]
-			},{
-				layout:'form',
-				columnWidth:.2,
-				labelWidth:120,
-				items:[{
-					xtype : 'textfield',
-					id : 'hospitalNumSearch',
-					name : 'hospitalNumSearch',
-					fieldLabel : hospitalNumName,
-					minChars : 0
+			}, {
+				layout: 'form',
+				columnWidth: .2,
+				labelWidth: 120,
+				items: [{
+					xtype: 'textfield',
+					id: 'hospitalNumSearch',
+					name: 'hospitalNumSearch',
+					fieldLabel: hospitalNumName,
+					minChars: 0
 				}]
-			},{
-				layout:'form',
-				columnWidth:.2,
-				items:[{
-					xtype : 'combo',
-					id : 'goodsSearch',
-					name : 'goodsSearch',
-					queryParam : 'spell',
-					fieldLabel : '物品',
-					listWidth : 200,
-					minChars : 0,
-					valueField : 'id',
-					displayField : 'name',
-					store : comboGoodsStore,
-					forceSelection : true,
-					lazyInit : true,
-					anchor : '95%',
-					triggerAction : 'all',
-					hideTrigger : true,
-					typeAhead : false,
-					allowBlank : true,
-					listeners:{
-						select : function(combo, record, index) {
+			}, {
+				layout: 'form',
+				columnWidth: .2,
+				items: [{
+					xtype: 'combo',
+					id: 'goodsSearch',
+					name: 'goodsSearch',
+					queryParam: 'spell',
+					fieldLabel: '物品',
+					listWidth: 200,
+					minChars: 0,
+					valueField: 'id',
+					displayField: 'name',
+					store: comboGoodsStore,
+					forceSelection: true,
+					lazyInit: true,
+					anchor: '95%',
+					triggerAction: 'all',
+					hideTrigger: true,
+					typeAhead: false,
+					allowBlank: true,
+					listeners: {
+						select: function (combo, record, index) {
 							Ext.getCmp('goodsType').setValue(record.data.type);
 						}
 					}
 				}]
-			},{
-				layout:'form',
-				columnWidth:.2,
-				items:[{
-					xtype : 'combo',
-					id : 'operatorSearch',
-					name : 'operatorSearch',
-					queryParam : 'spell',
-					fieldLabel : '录入人',
-					minChars : 0,
-					valueField : 'id',
-					displayField : 'name',
-					store : userJsonStore,
-					forceSelection : true,
-					lazyInit : true,
-					anchor : '95%',
-					listWidth:150,
-					triggerAction : 'all',
-					hideTrigger : true,
-					typeAhead : false,
-					allowBlank : true
+			}, {
+				layout: 'form',
+				columnWidth: .2,
+				items: [{
+					xtype: 'combo',
+					id: 'operatorSearch',
+					name: 'operatorSearch',
+					queryParam: 'spell',
+					fieldLabel: '录入人',
+					minChars: 0,
+					valueField: 'id',
+					displayField: 'name',
+					store: userJsonStore,
+					forceSelection: true,
+					lazyInit: true,
+					anchor: '95%',
+					listWidth: 150,
+					triggerAction: 'all',
+					hideTrigger: true,
+					typeAhead: false,
+					allowBlank: true
 				}]
-			},{
-				layout:'form',
-				columnWidth:.2,
-				labelWidth:120,
-				items:[{
-					xtype : 'combo',
-					id : 'othersGoods',
-					name : 'othersGoods',
-					fieldLabel : '显示同单明细',
-					minChars : 0,
-					valueField : 'value',
-					displayField : 'value',
-					value : STR_YES,
-					store : new Ext.data.SimpleStore({
-						fields : [ 'value'],
-						data : [[STR_YES],[STR_NO]]
+			}, {
+				layout: 'form',
+				columnWidth: .2,
+				labelWidth: 120,
+				items: [{
+					xtype: 'combo',
+					id: 'othersGoods',
+					name: 'othersGoods',
+					fieldLabel: '显示同单明细',
+					minChars: 0,
+					valueField: 'value',
+					displayField: 'value',
+					value: STR_YES,
+					store: new Ext.data.SimpleStore({
+						fields: ['value'],
+						data: [[STR_YES], [STR_NO]]
 					}),
-					mode : 'local',
-					forceSelection : true,
-					lazyInit : true,
-					anchor : '95%',
-					listWidth:100,
-					triggerAction : 'all',
-					typeAhead : false,
-					listWidth : 130,
-					allowBlank : true,
-					listeners : {
-						select : function(combo, record, index) {
+					mode: 'local',
+					forceSelection: true,
+					lazyInit: true,
+					anchor: '95%',
+					listWidth: 100,
+					triggerAction: 'all',
+					typeAhead: false,
+					listWidth: 130,
+					allowBlank: true,
+					listeners: {
+						select: function (combo, record, index) {
 							reloadReport();
 						}
 					}
 				}]
 			}]
 		}]
 	});
-	
-	
+
+
 	var reportForm = new Ext.Panel({
-         frame:false,//渲染面板
-         autoScroll:true,//自动显示滚动条   
-         collapsible:true,//允许展开和收缩   
-         bodyPadding:5,
-         html:'<iframe id="thisIframe" name="thisIframe" width="100%" height="100%" frameborder=0 src=""></iframe>'
+		frame: false,//渲染面板
+		autoScroll: true,//自动显示滚动条   
+		collapsible: true,//允许展开和收缩   
+		bodyPadding: 5,
+		html: '<iframe id="thisIframe" name="thisIframe" width="100%" height="100%" frameborder=0 src=""></iframe>'
 
 	});
-	
+
 	var viewport = new Ext.Viewport({
-		layout : 'border',
-		items : [form, {
-			region : 'center',
-			margins : '0 0 0 0',
-			layout : 'fit',
-			items : reportForm
+		layout: 'border',
+		items: [form, {
+			region: 'center',
+			margins: '0 0 0 0',
+			layout: 'fit',
+			items: reportForm
 		}]
 	});
 	reloadReport();