Index: ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js
===================================================================
diff -u -r30764 -r33469
--- ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js	(.../recallRecordView.js)	(revision 30764)
+++ ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js	(.../recallRecordView.js)	(revision 33469)
@@ -6,80 +6,80 @@
 //是否需要再次点击搜索器械包
 var isNeedClickSearch = false;
 var RecallRecordItemRecord = Ext.data.Record.create([
-	{name: 'departName', type: 'string'},
-	{name: 'amount', type: 'long'},
-	{name: 'instances', type: 'string'}
+	{ name: 'departName', type: 'string' },
+	{ name: 'amount', type: 'long' },
+	{ name: 'instances', type: 'string' }
 ]);
 var sterilizerJsonStore = new Ext.data.SimpleStore({
-	fields : [ 'sterilizerName' ],
-	url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do'
+	fields: ['sterilizerName'],
+	url: WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do'
 });
 
 function formatDate(v, p, record) {
 	try {
 		return Ext.util.Format.date(new Date(v.time), 'Y-m-d H:i');
 	} catch (e) {
-		
+
 	}
 }
 
-function loadDataForTree(){
+function loadDataForTree() {
 	top.Ext.getCmp("recallRecordForm").getEl().mask("数据加载中，请稍等!");//只在指定的dom元素节点中显示加载信息
 	var sterilizerName = top.Ext.getCmp('sterilizerName').getValue();
 	var startDate = top.Ext.getCmp('startDate').getRawValue();
 	var endDate = top.Ext.getCmp('endDate').getRawValue();
 	var sterilizingFrequency_start = top.Ext.getCmp('sterilizingFrequency_start').getValue();
 	var sterilizingFrequency_end = top.Ext.getCmp('sterilizingFrequency_end').getValue();
-	recallTousseColumnTree.loader.on('beforeload',function(){
+	recallTousseColumnTree.loader.on('beforeload', function () {
 		recallTousseColumnTree.loader.baseParams.sterilizerName = sterilizerName;
-		recallTousseColumnTree.loader.baseParams.startDate = startDate  + " 00:00:00";
+		recallTousseColumnTree.loader.baseParams.startDate = startDate + " 00:00:00";
 		recallTousseColumnTree.loader.baseParams.endDate = endDate;
 		recallTousseColumnTree.loader.baseParams.sterilizingFrequency_start = sterilizingFrequency_start;
 		recallTousseColumnTree.loader.baseParams.sterilizingFrequency_end = sterilizingFrequency_end;
 	});
-	
+
 	//为确保数据同步,必须在回调函数中处理
-	recallTousseColumnTree.loader.load(recallTousseColumnTree.root , function(){
+	recallTousseColumnTree.loader.load(recallTousseColumnTree.root, function () {
 		top.Ext.getCmp("recallRecordForm").getEl().unmask();//只在指定的dom元素节点中显示加载信息
 		//如果搜索结果数据不为空,则将保存按钮启用,否则禁用
-		if(recallTousseColumnTree && recallTousseColumnTree.root && recallTousseColumnTree.root.childNodes.length > 0){
+		if (recallTousseColumnTree && recallTousseColumnTree.root && recallTousseColumnTree.root.childNodes.length > 0) {
 			top.Ext.getCmp('saveBtn').enable();
 			top.Ext.getCmp('btnExport').enable();
-		}else{
+		} else {
 			top.Ext.getCmp('saveBtn').disable();
 			top.Ext.getCmp('btnExport').disable();
 		}
 	});
-	
+
 }
 
-function getTreeData(){
+function getTreeData() {
 	var temp = [];
 	var treeRoot = recallTousseColumnTree.root;
-	if(treeRoot.childNodes.length!=0){
-		treeRoot.eachChild(function(pNode){
-		var result = {};
-		var attr = pNode.attributes;
-		//代码优化,对于科室为空的包实例(即已灭菌未发货的包),不设置其科室相关的属性
-		if(attr.departCode){
-			result.departCode = attr.departCode;
-			result.departName = attr.departName;
-		}
-		result.objAmount = attr.objAmount;
-		result.children = [];
-			if(attr.children.length!=0){
-				for(var i=0;i<attr.children.length;i++){
+	if (treeRoot.childNodes.length != 0) {
+		treeRoot.eachChild(function (pNode) {
+			var result = {};
+			var attr = pNode.attributes;
+			//代码优化,对于科室为空的包实例(即已灭菌未发货的包),不设置其科室相关的属性
+			if (attr.departCode) {
+				result.departCode = attr.departCode;
+				result.departName = attr.departName;
+			}
+			result.objAmount = attr.objAmount;
+			result.children = [];
+			if (attr.children.length != 0) {
+				for (var i = 0; i < attr.children.length; i++) {
 					var cNode = attr.children[i];
 					result.children.push({
-						tousseName :cNode.departName,
-						tousseAmount : cNode.objAmount,
-						tousseIds : cNode.tousseIds
+						tousseName: cNode.departName,
+						tousseAmount: cNode.objAmount,
+						tousseIds: cNode.tousseIds
 					});
 				}
 				temp.push(result);
 			}
 		});
-	}else{
+	} else {
 		showResult("请选择要召回的器械包");
 		return;
 	}
@@ -90,17 +90,17 @@
  * 获取待召回的器械包条码
  * @returns
  */
-function getWaitRecallBarcodes(){
+function getWaitRecallBarcodes() {
 	var barcodeArray = [];
 	var treeRoot = recallTousseColumnTree.root;
-	if(treeRoot.childNodes.length!=0){
-		treeRoot.eachChild(function(pNode){
+	if (treeRoot.childNodes.length != 0) {
+		treeRoot.eachChild(function (pNode) {
 			//pNode对象还是科室这一层
-			if(pNode.attributes.children.length!=0){
-				for(var i = 0;i < pNode.attributes.children.length;i++){
+			if (pNode.attributes.children.length != 0) {
+				for (var i = 0; i < pNode.attributes.children.length; i++) {
 					//tousseNode是器械包名称这一层
 					var tousseNode = pNode.attributes.children[i];
-					for(var j = 0;j < tousseNode.children.length;j++){
+					for (var j = 0; j < tousseNode.children.length; j++) {
 						//barcodeNode是器械包条码这一层
 						var barcodeNode = tousseNode.children[j];
 						var barcode = barcodeNode.departName;
@@ -109,7 +109,7 @@
 				}
 			}
 		});
-	}else{
+	} else {
 		showResult("请选择要召回的器械包");
 		return;
 	}
@@ -123,96 +123,96 @@
  * @param oldValue
  */
 function dateChange(field, newValue, oldValue) {
-		// top.Ext.getCmp("endDate").getValue(),
+	// top.Ext.getCmp("endDate").getValue(),
 	// 开始时间或者截止时间改变则需要重新点击搜索器械包
 	isNeedClickSearch = true;
 }
 
 function addAndEditRecallRecord(id) {
 	var recallTypeStore = new Ext.data.SimpleStore({
-		fields : [ 'value' ],
-		data : [['同一炉次']]
+		fields: ['value'],
+		data: [['同一炉次']]
 	});
-	
+
 	var typeStore = new Ext.data.SimpleStore({
-		fields : [ 'value' ],
-		data : [['器械包']]
+		fields: ['value'],
+		data: [['器械包']]
 	});
 	recallTousseColumnTree = new top.Ext.tree.ColumnTree({
-		rootVisible : false,
-	    autoScroll : true,
-	    containerScroll : false,
-	    height : 300 ,
-	    frame : false,
-	    bodyStyle : 'border:1px solid #afd7af',
-	    columns : [{
-	        header : '科室名称',
-	        width : 300,
-	        dataIndex : 'departName'
-	    },{
-	        header : '状态',
-	        width : 100,
-	        dataIndex : 'status'
-	    },{
-	    	header : '数量',
-	    	width : 50,
-	    	dataIndex : 'objAmount'
-	    },{
-	    	header : '流转位置',
-	    	width : 90,
-	    	dataIndex : 'location2',
-	    	//GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示
-	    	hidden : !sstsConfig.enableSurgicalInstrumentsManagement
-	    },{
-	    	header : '病人名称',
-	    	width : 110,
-	    	dataIndex : 'patientName'
-	    },{
-	    	header : '住院号/诊疗号',
-	    	width : 110,
-	    	dataIndex : 'patientNumber'
-	    },{
-	    	header : '手术时间',
-	    	width : 110,
-	    	dataIndex : 'operationTime'
-	    }],
-	    loader : new top.Ext.tree.TreeLoader({
-	    	url : WWWROOT + '/disinfectSystem/recallRecordAction!searchRecalledTousses.do',
-	    	uiProviders:{
-	            'col': top.Ext.tree.ColumnNodeUI
-	        }
-	    }),
-	    root: new top.Ext.tree.AsyncTreeNode({
-	        text:'待灭菌物品列表'
-	    }),
-	    tbar:[{
-	    	id : 'btnRecall',
-	    	text:'器械包召回',
-			iconCls :'Arrowrotateclockwise',
-			hidden : !id,//新增召回信息时器械包召回按钮隐藏,打开已存在的数据时放开
-			handler: function(){
-				top.addTab('recallTousses','召回器械包',WWWROOT + '/disinfectsystem/recallRecord/recallRecordViewForDepart.jsp');
+		rootVisible: false,
+		autoScroll: true,
+		containerScroll: false,
+		height: 300,
+		frame: false,
+		bodyStyle: 'border:1px solid #afd7af',
+		columns: [{
+			header: '科室名称',
+			width: 300,
+			dataIndex: 'departName'
+		}, {
+			header: '状态',
+			width: 100,
+			dataIndex: 'status'
+		}, {
+			header: '数量',
+			width: 50,
+			dataIndex: 'objAmount'
+		}, {
+			header: '流转位置',
+			width: 90,
+			dataIndex: 'location2',
+			//GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示
+			hidden: !sstsConfig.enableSurgicalInstrumentsManagement
+		}, {
+			header: '病人名称',
+			width: 110,
+			dataIndex: 'patientName'
+		}, {
+			header: '住院号/诊疗号',
+			width: 110,
+			dataIndex: 'patientNumber'
+		}, {
+			header: '手术时间',
+			width: 110,
+			dataIndex: 'operationTime'
+		}],
+		loader: new top.Ext.tree.TreeLoader({
+			url: WWWROOT + '/disinfectSystem/recallRecordAction!searchRecalledTousses.do',
+			uiProviders: {
+				'col': top.Ext.tree.ColumnNodeUI
+			}
+		}),
+		root: new top.Ext.tree.AsyncTreeNode({
+			text: '待灭菌物品列表'
+		}),
+		tbar: [{
+			id: 'btnRecall',
+			text: '器械包召回',
+			iconCls: 'Arrowrotateclockwise',
+			hidden: !id,//新增召回信息时器械包召回按钮隐藏,打开已存在的数据时放开
+			handler: function () {
+				top.addTab('recallTousses', '召回器械包', WWWROOT + '/disinfectsystem/recallRecord/recallRecordViewForDepart.jsp');
 				recallRecordWin.close();
 			}
-	    },{
-	    	id : 'btnExport',
-	    	text:'导出',
-			iconCls :'btn_ext_download',
-			disabled : !id,
-			handler: function(){
+		}, {
+			id: 'btnExport',
+			text: '导出',
+			iconCls: 'btn_ext_download',
+			disabled: !id,
+			handler: function () {
 				var sterilizerName = top.Ext.getCmp('sterilizerName').getValue();
-				sterilizerName = (sterilizerName == "")?sterilizerName:encodeURI(sterilizerName);
-				sterilizerName = sterilizerName.replace(/#/g,"%23");
+				sterilizerName = (sterilizerName == "") ? sterilizerName : encodeURI(sterilizerName);
+				sterilizerName = sterilizerName.replace(/#/g, "%23");
 				var startDate = top.Ext.getCmp('startDate').getRawValue();
 				var endDate = top.Ext.getCmp('endDate').getRawValue();
 				var sterilizingFrequency_start = top.Ext.getCmp('sterilizingFrequency_start').getValue();
 				var sterilizingFrequency_end = top.Ext.getCmp('sterilizingFrequency_end').getValue();
 				//var waitRecallBarcodes = getWaitRecallBarcodes();//由于get请求的内容长度有限,所以不通过url传输
-				
+
 				var exportUrl = WWWROOT + "/disinfectSystem/recallRecordAction!exportWaitRecallTousseInstanceInfo.do";
-				if(id){
+				if (id) {
 					exportUrl += "?recallRecordId=" + id;
-				}else{
+				} else {
 					exportUrl += "?sterilizerName=" + sterilizerName
 						+ "&startDate=" + startDate
 						+ "&endDate=" + endDate
@@ -221,226 +221,226 @@
 				}
 				location.href = exportUrl;
 			}
-	    }]
+		}]
 	});
 	formObj = new top.Ext.FormPanel({
-		id : 'recallRecordForm',
-		frame : true,
-		labelSeparator : '：',
-		labelAlign:'right',
-		bodyStyle : 'padding:5px 5px 0px 5px',
-		autoScroll : true,
-		height:550,
-		items : [{
-        	xtype:"fieldset", 
-            layout:'column',
-            title :'基础信息',
-            autoHeight:true,
-			layout : 'column',
-			items : [{
-				xtype : 'hidden',
-				name : 'id',
-				id : 'id'
-			},{
-				xtype : 'hidden',
-				name : 'treeInfo',
-				id : 'treeInfo'
+		id: 'recallRecordForm',
+		frame: true,
+		labelSeparator: '：',
+		labelAlign: 'right',
+		bodyStyle: 'padding:5px 5px 0px 5px',
+		autoScroll: true,
+		height: 550,
+		items: [{
+			xtype: "fieldset",
+			layout: 'column',
+			title: '基础信息',
+			autoHeight: true,
+			layout: 'column',
+			items: [{
+				xtype: 'hidden',
+				name: 'id',
+				id: 'id'
 			}, {
-				columnWidth : 1,
-				layout : 'form',
+				xtype: 'hidden',
+				name: 'treeInfo',
+				id: 'treeInfo'
+			}, {
+				columnWidth: 1,
+				layout: 'form',
 				labelWidth: 70,
-				items : [{
-					xtype : 'combo',
-					fieldLabel : "灭菌炉名称",
-					valueField : 'sterilizerName',
-					displayField : 'sterilizerName',
-					store : sterilizerJsonStore,
-					triggerAction : 'all',
-					mode : 'remote',
-					forceSelection : true,
-					name : "sterilizerName",
-					id : "sterilizerName",
-					allowBlank : false,
-					editable : false,
-					readOnly:true,
-					anchor : '98%'
+				items: [{
+					xtype: 'combo',
+					fieldLabel: "灭菌炉名称",
+					valueField: 'sterilizerName',
+					displayField: 'sterilizerName',
+					store: sterilizerJsonStore,
+					triggerAction: 'all',
+					mode: 'remote',
+					forceSelection: true,
+					name: "sterilizerName",
+					id: "sterilizerName",
+					allowBlank: false,
+					editable: false,
+					readOnly: true,
+					anchor: '98%'
 				}]
 			}, {
-				columnWidth : .5,
-				layout : 'form',
+				columnWidth: .5,
+				layout: 'form',
 				labelWidth: 70,
-				cls:'edit-5char-labelwidth',
-				items : [{
-					xtype : 'datefieldWithMin',
-					fieldLabel : '开始时间',
-					id : 'startDate',
-					name : 'startDate',
-					editable : 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',
-					selectOnFocus :true,
-					format : 'Y-m-d',
-//					value : new Date(),
-					allowBlank : false,
-					anchor : '95%',
-					listeners:{"change": dateChange}
+				cls: 'edit-5char-labelwidth',
+				items: [{
+					xtype: 'datefieldWithMin',
+					fieldLabel: '开始时间',
+					id: 'startDate',
+					name: 'startDate',
+					editable: 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',
+					selectOnFocus: true,
+					format: 'Y-m-d',
+					//					value : new Date(),
+					allowBlank: false,
+					anchor: '95%',
+					listeners: { "change": dateChange }
 				}]
 			}, {
-				columnWidth : .5,
-				layout : 'form',
-				labelWidth : 70,
-				items : [{
-					xtype : 'numberfield',
-					fieldLabel : '炉次',
-					id : 'sterilizingFrequency_start',
-					name : 'sterilizingFrequency_start',
-					editable:false,
+				columnWidth: .5,
+				layout: 'form',
+				labelWidth: 70,
+				items: [{
+					xtype: 'numberfield',
+					fieldLabel: '炉次',
+					id: 'sterilizingFrequency_start',
+					name: 'sterilizingFrequency_start',
+					editable: false,
 					allowBlank: false,
-					anchor : '95%'
+					anchor: '95%'
 				}]
-			},{
-				columnWidth : .5,
-				layout : 'form',
+			}, {
+				columnWidth: .5,
+				layout: 'form',
 				labelWidth: 70,
-				cls:'edit-5char-labelwidth',
-				items : [{
-					xtype : 'datefieldWithMin',
-					fieldLabel : '截止时间',
-					id : 'endDate',
-					name : 'endDate',
-					editable : 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',
-					selectOnFocus :true,
-					format : 'Y-m-d',
-//					value : new Date(),
-					allowBlank : false,
-					anchor : '95%',
-					listeners:{"change": dateChange}
+				cls: 'edit-5char-labelwidth',
+				items: [{
+					xtype: 'datefieldWithMin',
+					fieldLabel: '截止时间',
+					id: 'endDate',
+					name: 'endDate',
+					editable: 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',
+					selectOnFocus: true,
+					format: 'Y-m-d',
+					//					value : new Date(),
+					allowBlank: false,
+					anchor: '95%',
+					listeners: { "change": dateChange }
 				}]
 			}, {
-				columnWidth : .5,
-				layout : 'form',
-				labelWidth : 70,
-				items : [{
-					xtype : 'numberfield',
-					fieldLabel : '炉次',
-					id : 'sterilizingFrequency_end',
-					name : 'sterilizingFrequency_end',
-					editable:false,
+				columnWidth: .5,
+				layout: 'form',
+				labelWidth: 70,
+				items: [{
+					xtype: 'numberfield',
+					fieldLabel: '炉次',
+					id: 'sterilizingFrequency_end',
+					name: 'sterilizingFrequency_end',
+					editable: false,
 					allowBlank: false,
-					anchor : '95%'
+					anchor: '95%'
 				}]
-			},{
-				columnWidth : .5,
-				layout : 'form',
-				labelWidth : 70,
-				items : [{
-					xtype : 'combo',
-					fieldLabel : '类型',
-					id : 'type',
-					name : 'type',
-					valueField : 'value',
-					displayField : 'value',
-					store : typeStore,
-					value :recallRange_same_sterilizingNumber,
-					forceSelection : true,
-					mode : 'local',
-					triggerAction : 'all',
-					value :recallType_tousse,
-					editable : false,
-					anchor : '95%'
+			}, {
+				columnWidth: .5,
+				layout: 'form',
+				labelWidth: 70,
+				items: [{
+					xtype: 'combo',
+					fieldLabel: '类型',
+					id: 'type',
+					name: 'type',
+					valueField: 'value',
+					displayField: 'value',
+					store: typeStore,
+					value: recallRange_same_sterilizingNumber,
+					forceSelection: true,
+					mode: 'local',
+					triggerAction: 'all',
+					value: recallType_tousse,
+					editable: false,
+					anchor: '95%'
 				}]
 			}, {
-				columnWidth : .5,
-				layout : 'form',
-				labelWidth : 70,
-				items : [{
-					xtype : 'combo',
-					fieldLabel : '召回范围',
-					id : 'recallRange',
-					name : 'recallRange',
-					valueField : 'value',
-					displayField : 'value',
-					store : recallTypeStore,
-					forceSelection : true,
-					mode : 'local',
-					value :recallRange_same_sterilizingNumber,
-					triggerAction : 'all',
-					editable : false,
-					anchor : '95%'
+				columnWidth: .5,
+				layout: 'form',
+				labelWidth: 70,
+				items: [{
+					xtype: 'combo',
+					fieldLabel: '召回范围',
+					id: 'recallRange',
+					name: 'recallRange',
+					valueField: 'value',
+					displayField: 'value',
+					store: recallTypeStore,
+					forceSelection: true,
+					mode: 'local',
+					value: recallRange_same_sterilizingNumber,
+					triggerAction: 'all',
+					editable: false,
+					anchor: '95%'
 				}]
 			}, {
-				columnWidth : 1,
-				layout : 'form',
-				labelWidth : 70,
-				items : [{
-					xtype : 'textarea',
-					height : 45,
-					fieldLabel : '召回原因',
-					id : 'recallExecuse',
-					name : 'recallExecuse',
-					allowBlank : true,
-					anchor : '95%'
+				columnWidth: 1,
+				layout: 'form',
+				labelWidth: 70,
+				items: [{
+					xtype: 'textarea',
+					height: 45,
+					fieldLabel: '召回原因',
+					id: 'recallExecuse',
+					name: 'recallExecuse',
+					allowBlank: true,
+					anchor: '95%'
 				}]
 			}]
 		}, {
-			layout : 'fit',
-			items : [recallTousseColumnTree]
+			layout: 'fit',
+			items: [recallTousseColumnTree]
 		}],
-		buttons : [{
-			id : 'searchTousses',
-			text : '搜索器械包',
-			hidden:id != null && id != 'undefined',
-			handler : searchTousses
-		},{
-			id : 'saveBtn',
-			text : '保存',
-			hidden:id != null && id != 'undefined',
-			disabled : true,//默认初始为禁用状态
-			handler : save
+		buttons: [{
+			id: 'searchTousses',
+			text: '搜索器械包',
+			hidden: id != null && id != 'undefined',
+			handler: searchTousses
 		}, {
-			text : '取消',
-			id : 'saveAndNewBtn',
-			handler : cancel
+			id: 'saveBtn',
+			text: '保存',
+			hidden: id != null && id != 'undefined',
+			disabled: true,//默认初始为禁用状态
+			handler: save
+		}, {
+			text: '取消',
+			id: 'saveAndNewBtn',
+			handler: cancel
 		}]
 	});
-	
-	if(id != null && id != 'undefined'){
+
+	if (id != null && id != 'undefined') {
 		formObj.form.load({
-			url : WWWROOT + '/disinfectSystem/recallRecordAction!loadRecallRecord.do',
-			method : 'GET',
-			waitMsg : '正在加载数据，请稍候',
-			params : {id : id},
-			success : function(form, action) {
+			url: WWWROOT + '/disinfectSystem/recallRecordAction!loadRecallRecord.do',
+			method: 'GET',
+			waitMsg: '正在加载数据，请稍候',
+			params: { id: id },
+			success: function (form, action) {
 				var startDate = action.result.data.startDate;
 				var endDate = action.result.data.endDate;
 				var start = new Date(startDate.time);
 				var end = new Date(endDate.time);
 				top.Ext.getCmp('startDate').setValue(start.format('Y-m-d'));
 				top.Ext.getCmp('endDate').setValue(end.format('Y-m-d'));
-				recallTousseColumnTree.loader.url=WWWROOT + '/disinfectSystem/recallRecordAction!loadRecallRecordItems.do?id='+id;
+				recallTousseColumnTree.loader.url = WWWROOT + '/disinfectSystem/recallRecordAction!loadRecallRecordItems.do?id=' + id;
 				recallTousseColumnTree.loader.load(recallTousseColumnTree.root);
 			},
-			failure : function(form, action) {}
+			failure: function (form, action) { }
 		});
 	} else {
 		setStartDate(top.Ext, 'yyyy/MM/dd', 'startDate');  //（开始时间，取服务器时间 cjr）
 		setStartDate(top.Ext, 'yyyy/MM/dd', 'endDate');  //（截止时间，取服务器时间 cjr）
 	}
 
-	recallRecordWin = new top.Ext.Window( {
-		id : 'recallRecordWin',
-		layout : 'fit',
-		title : entityName+'信息',
-		width : 940,//(GGSRMYY-94 器械包召回功能的改进)
-		border : false,
-		modal : true,
-		autoHeight : true,
-		plain : true,
-		items : [ formObj ]
+	recallRecordWin = new top.Ext.Window({
+		id: 'recallRecordWin',
+		layout: 'fit',
+		title: entityName + '信息',
+		width: 940,//(GGSRMYY-94 器械包召回功能的改进)
+		border: false,
+		modal: true,
+		autoHeight: true,
+		plain: true,
+		items: [formObj]
 	});
 	recallRecordWin.show();
 }
-function searchTousses(){
+function searchTousses() {
 	var searchBtn = this;
 	if (!formObj.form.isValid()) {
 		showResult('请正确填写表单各值');
@@ -451,7 +451,7 @@
 	isNeedClickSearch = false;
 }
 function save() {
-	if (isNeedClickSearch){
+	if (isNeedClickSearch) {
 		showResult('日期已经改变,请重新搜索器械包');
 		return false;
 	}
@@ -463,27 +463,27 @@
 		return false;
 	}
 	var treeData = getTreeData();
-	if(treeData.length==0){
+	if (treeData.length == 0) {
 		showResult("请先选择要召回的包");
 		saveBtn.enable();
 		return false;
 	}
 	top.Ext.getCmp('treeInfo').setValue(treeData);
 	formObj.form.submit({
-		url : WWWROOT + '/disinfectSystem/recallRecordAction!saveRecallRecord.do',
-		method : 'POST',
-		waitMsg : '正在保存数据，请稍候',
-		waitTitle : '提交表单',
-		success : function(form, action) {
+		url: WWWROOT + '/disinfectSystem/recallRecordAction!saveRecallRecord.do',
+		method: 'POST',
+		waitMsg: '正在保存数据，请稍候',
+		waitTitle: '提交表单',
+		success: function (form, action) {
 			showResult(action.result.msg);
-			if(action.result.msg=='保存成功'){
+			if (action.result.msg == '保存成功') {
 				recallRecordWin.close();
 				grid.dwrReload();
 			} else {
 				saveBtn.enable();
 			}
 		},
-		failure : function(form, action) {
+		failure: function (form, action) {
 		}
 	});
 }
@@ -497,18 +497,18 @@
 function deleteRecallRecord(grid) {
 	var records = grid.getSelectionModel().getSelections();
 	if (records.length == 0) {
-		showResult("请选择要删除的"+entityName+"信息！");
+		showResult("请选择要删除的" + entityName + "信息！");
 		return false;
 	}
 	var ids = null;
-	for ( var i = 0, len = records.length; i < len; i++) {
+	for (var i = 0, len = records.length; i < len; i++) {
 		//已关闭状态下的召回信息不能删
-		if(records[i].data['status'] == '已关闭'){
+		if (records[i].data['status'] == '已关闭') {
 			showResult("已关闭的召回信息不能删除！");
 			return false;
 		}
 		//已申请状态下的召回信息不能删
-		if(records[i].data['status'] == '已申请'){
+		if (records[i].data['status'] == '已申请') {
 			showResult("已转换的召回信息不能删除！");
 			return false;
 		}
@@ -519,24 +519,24 @@
 		}
 	}
 	Ext.Ajax.request({
-		url : WWWROOT + '/disinfectSystem/recallRecordAction!validateDeleteRecallRecord.do',
-		params : {ids : ids},
-		success : function(response, options) {
+		url: WWWROOT + '/disinfectSystem/recallRecordAction!validateDeleteRecallRecord.do',
+		params: { ids: ids },
+		success: function (response, options) {
 			var resultObj = Ext.decode(response.responseText);
-			if(resultObj.msg!=null&&resultObj.msg.length!=0){
+			if (resultObj.msg != null && resultObj.msg.length != 0) {
 				showResult(resultObj.msg);
-			}else{
-				top.Ext.MessageBox.confirm("请确认","是否确定要删除选中的"+entityName+"信息？",
-					function(button, text) {
-						if ("yes" == button){
+			} else {
+				top.Ext.MessageBox.confirm("请确认", "是否确定要删除选中的" + entityName + "信息？",
+					function (button, text) {
+						if ("yes" == button) {
 							Ext.Ajax.request({
-								url : WWWROOT + '/disinfectSystem/recallRecordAction!deleteRecallRecord.do',
-								params : {ids : ids},
-								success : function(response, options) {
+								url: WWWROOT + '/disinfectSystem/recallRecordAction!deleteRecallRecord.do',
+								params: { ids: ids },
+								success: function (response, options) {
 									showResult(response.responseText);
 									grid.dwrReload();
 								},
-								failure : function(response, options) {
+								failure: function (response, options) {
 									showResult(response.responseText);
 								}
 							});
@@ -545,61 +545,61 @@
 				);
 			}
 		},
-		failure : function(response, options) {
+		failure: function (response, options) {
 			showResult(response.responseText);
 		}
 	});
 }
 
-function exchangeRecalledToussesForApplication(grid){
+function exchangeRecalledToussesForApplication(grid) {
 	var records = grid.getSelectionModel().getSelections();
 	if (records.length == 0) {
 		showResult("请选择要转换的召回记录信息！");
 		return false;
 	}
-	if(records.length > 1){
+	if (records.length > 1) {
 		showResult("一次只能转换一条召回记录申请单！");
 		return false;
 	}
 	var status = records[0].data.status;
-	if(status != "已关闭"){
+	if (status != "已关闭") {
 		showResult("只有已关闭状态下的召回信息才能转换！");
 		return false;
 	}
 	var id = records[0].data.id;
-	top.Ext.MessageBox.confirm("请确认","是否确定要转换选中的召回信息？",
-			function(button, text) {
-				if ("yes" == button){
-					Ext.Ajax.request({
-						url : WWWROOT + '/disinfectSystem/recallRecordAction!exchangeRecalledToussesForApplication.do',
-						params : {id : id},
-						success : function(response, options) {
-							var resultObj = Ext.decode(response.responseText);
-							showResult(resultObj.message);
-							grid.dwrReload();
-						},
-						failure : function(response, options) {
-							showResult(response.responseText);
-						}
-					});
-				}
+	top.Ext.MessageBox.confirm("请确认", "是否确定要转换选中的召回信息？",
+		function (button, text) {
+			if ("yes" == button) {
+				Ext.Ajax.request({
+					url: WWWROOT + '/disinfectSystem/recallRecordAction!exchangeRecalledToussesForApplication.do',
+					params: { id: id },
+					success: function (response, options) {
+						var resultObj = Ext.decode(response.responseText);
+						showResult(resultObj.message);
+						grid.dwrReload();
+					},
+					failure: function (response, options) {
+						showResult(response.responseText);
+					}
+				});
 			}
-		);
+		}
+	);
 }
 function shutDownRecallRecord(grid) {
 	var records = grid.getSelectionModel().getSelections();
 
 	if (records.length == 0) {
-		showResult("请选择要关闭的"+entityName+"信息！");
+		showResult("请选择要关闭的" + entityName + "信息！");
 		return false;
 	}
 	var ids = null;
-	for ( var i = 0, len = records.length; i < len; i++) {
-		if(records[i].data['status'] == '已关闭'){
+	for (var i = 0, len = records.length; i < len; i++) {
+		if (records[i].data['status'] == '已关闭') {
 			showResult("选中的行中存在已经关闭的召回信息，不能关闭！");
 			return false;
 		}
-		if(records[i].data['status'] == '已申请'){
+		if (records[i].data['status'] == '已申请') {
 			showResult("选中的行中存在已经转换的召回信息，不能关闭！");
 			return false;
 		}
@@ -609,17 +609,17 @@
 			ids = ids + ';' + records[i].data['id'];
 		}
 	}
-	top.Ext.MessageBox.confirm("请确认","是否确定要关闭选中的"+entityName+"信息？",
-		function(button, text) {
-			if ("yes" == button){
+	top.Ext.MessageBox.confirm("请确认", "是否确定要关闭选中的" + entityName + "信息？",
+		function (button, text) {
+			if ("yes" == button) {
 				Ext.Ajax.request({
-					url : WWWROOT + '/disinfectSystem/recallRecordAction!shutDownRecallRecord.do',
-					params : {ids : ids},
-					success : function(response, options) {
+					url: WWWROOT + '/disinfectSystem/recallRecordAction!shutDownRecallRecord.do',
+					params: { ids: ids },
+					success: function (response, options) {
 						showResult(response.responseText);
 						grid.dwrReload();
 					},
-					failure : function(response, options) {
+					failure: function (response, options) {
 						showResult(response.responseText);
 					}
 				});
@@ -628,147 +628,147 @@
 	);
 }
 
-var loadFormData = function(grid) {
+var loadFormData = function (grid) {
 	var records = grid.getSelectionModel().getSelections();
 	if (records.length == 0) {
-		showResult("请选择要修改的"+entityName+"信息！");
+		showResult("请选择要修改的" + entityName + "信息！");
 		return false;
 	}
 	if (records.length > 1) {
-		showResult("一次只能修改一个"+entityName+"信息！");
+		showResult("一次只能修改一个" + entityName + "信息！");
 		return false;
 	}
 	id = records[0].data['id'];
 	var type = records[0].data['type'];
-	if(type == '器械包'){
+	if (type == '器械包') {
 		addAndEditRecallRecord(id);
-	}else{
+	} else {
 		recallDiposableGoods(id);
 	}
 };
 
-function callModifyFunction(){
+function callModifyFunction() {
 	loadFormData(grid);
 }
 
-function renderCallModifyFunction(v, p, record){
+function renderCallModifyFunction(v, p, record) {
 	return "<a href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
 }
 
-function renderColor(v, p, record){
+function renderColor(v, p, record) {
 	var status = record.data['status'];
 	var color = "white";
-	if("已发布" == status){//待发货 黄色
+	if ("已发布" == status) {//待发货 黄色
 		color = "yellow";
 	}
-	return "<p style=\"background-color:"+color+"\">" + v + "</p>";
+	return "<p style=\"background-color:" + color + "\">" + v + "</p>";
 }
 
-Ext.onReady(function() {
+Ext.onReady(function () {
 	Ext.QuickTips.init();
 	var columns = [
-	    /*{header : "序号",width : 100,dataIndex : 'id',renderer:renderCallModifyFunction},*/
-	    {header : "物品类型",width : 100,dataIndex : 'type',renderer:renderCallModifyFunction},
-	    {header : "状态",width : 100,dataIndex : 'status', renderer : renderColor},
-	    {header : "发布日期",width : 120,dataIndex : 'publishDate', renderer : myDateFormatByMinute},
-	    {header : "灭菌炉名称",width : 100,dataIndex : 'sterilizerName'},
-	    {header : "召回范围",width : 100,dataIndex : 'recallRange'},
-	    {id:'recallExecuse',header : "召回原因",width : 100,dataIndex : 'recallExecuse'}
+		/*{header : "序号",width : 100,dataIndex : 'id',renderer:renderCallModifyFunction},*/
+		{ header: "物品类型", width: 100, dataIndex: 'type', renderer: renderCallModifyFunction },
+		{ header: "状态", width: 100, dataIndex: 'status', renderer: renderColor },
+		{ header: "发布日期", width: 120, dataIndex: 'publishDate', renderer: myDateFormatByMinute },
+		{ header: "灭菌炉名称", width: 100, dataIndex: 'sterilizerName' },
+		{ header: "召回范围", width: 100, dataIndex: 'recallRange' },
+		{ id: 'recallExecuse', header: "召回原因", width: 100, dataIndex: 'recallExecuse' }
 	];
-	
+
 	var filters = new Ext.grid.GridFilters({
-		filters : [
-			{type:'string',dataIndex:'type'},
-			{type:'string',dataIndex:'status'},
-			{type:'string',dataIndex:'sterilizerName'},
-			{type:'date',dataIndex:'publishDate'},
-			{type:'string',dataIndex:'recallExecuse'},
-			{type:'string',dataIndex:'recallRange'}
+		filters: [
+			{ type: 'string', dataIndex: 'type' },
+			{ type: 'string', dataIndex: 'status' },
+			{ type: 'string', dataIndex: 'sterilizerName' },
+			{ type: 'date', dataIndex: 'publishDate' },
+			{ type: 'string', dataIndex: 'recallExecuse' },
+			{ type: 'string', dataIndex: 'recallRange' }
 		]
 	});
 
 	var readerDetail = [
-	    {name : 'id'},
-	    {name : 'type'},
-	    {name : 'status'},
-	    {name : 'publishDate'},
-	    {name : 'recallRange'},
-	    {name : 'recallExecuse'},
-	    {name : 'sterilizerName'}
+		{ name: 'id' },
+		{ name: 'type' },
+		{ name: 'status' },
+		{ name: 'publishDate' },
+		{ name: 'recallRange' },
+		{ name: 'recallExecuse' },
+		{ name: 'sterilizerName' }
 	];
 
 	var tbar = [{
-		text : '召回器械包',
-		hidden : SSTS_RecallRecord_Create,
-		iconCls : 'btn_ext_application_add',
-		handler : function() {
+		text: '召回器械包',
+		hidden: SSTS_RecallRecord_Create,
+		iconCls: 'btn_ext_application_add',
+		handler: function () {
 			addAndEditRecallRecord();
 		}
-	}, '-',{
-		text : '召回一次性物品',
-		hidden : SSTS_RecallRecord_Create,
-		iconCls : 'btn_ext_application_add',
-		handler : function() {
+	}, '-', {
+		text: '召回一次性物品',
+		hidden: SSTS_RecallRecord_Create,
+		iconCls: 'btn_ext_application_add',
+		handler: function () {
 			recallDiposableGoods(null);
 		}
 	}, {
-		text : '修改',
-		hidden : true,//现在召回信息不支持修改
-		iconCls : 'btn_ext_application_edit',
-		id : 'editTbar',
-		handler : function() {
+		text: '修改',
+		hidden: true,//现在召回信息不支持修改
+		iconCls: 'btn_ext_application_edit',
+		id: 'editTbar',
+		handler: function () {
 			loadFormData(grid);
 		}
 	}, '-', {
-		text : '删除',
-		hidden : SSTS_RecallRecord_Delete,
-		iconCls : 'btn_ext_application_del',
-		handler : function() {
+		text: '删除',
+		hidden: SSTS_RecallRecord_Delete,
+		iconCls: 'btn_ext_application_del',
+		handler: function () {
 			deleteRecallRecord(grid);
 		}
 	}, '-', {
-		text : '关闭',
-		hidden : SSTS_RecallRecord_CLOSE,
-		iconCls : 'btn_remove',
-		handler : function() {
+		text: '关闭',
+		hidden: SSTS_RecallRecord_CLOSE,
+		iconCls: 'btn_remove',
+		handler: function () {
 			shutDownRecallRecord(grid);
 		}
 	}, '-', {
-		text : '转换申请单',
-		hidden : SSTS_RecallRecord_EXCHANGE,
-		iconCls : 'Arrowrotateclockwise',
-		handler : function() {
+		text: '转换申请单',
+		hidden: SSTS_RecallRecord_EXCHANGE,
+		iconCls: 'Arrowrotateclockwise',
+		handler: function () {
 			exchangeRecalledToussesForApplication(grid);
 		}
 	}];
-	Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {};
+	Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function () { };
 
 	grid = new Ext.ux.ForgonPageGrid({
-			tbar : tbar,
-			pageSize : 20,
-			defaultSortField : 'id',
-			title : entityName+'信息列表',
-			defaultSortDirection : 'DESC',
-			isCheckboxSelectionModel : true,
-			rememberSelected : false,
-			isShowSearchField : true,
-			columns : columns,
-			plugins : filters,
-			autoExpandColumn : 'recallExecuse',
-			frame : false
-		}, 
+		tbar: tbar,
+		pageSize: 20,
+		defaultSortField: 'id',
+		title: entityName + '信息列表',
+		defaultSortDirection: 'DESC',
+		isCheckboxSelectionModel: true,
+		rememberSelected: false,
+		isShowSearchField: true,
+		columns: columns,
+		plugins: filters,
+		autoExpandColumn: 'recallExecuse',
+		frame: false
+	},
 		readerDetail,
 		RecallRecordTableManager.findRecallRecordTableList,
 		null
 	);
 
 	var vp = new Ext.Viewport({
-		layout : 'border',
-		items : [{
-			region : 'center',
-			margins : '0 0 0 0',
-			layout : 'fit',
-			items : grid
+		layout: 'border',
+		items: [{
+			region: 'center',
+			margins: '0 0 0 0',
+			layout: 'fit',
+			items: grid
 		}]
 	});
 });
\ No newline at end of file