Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
===================================================================
diff -u -r31137 -r32823
--- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 31137)
+++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 32823)
@@ -1,5 +1,5 @@
 //展示器械包信息
-function getAndShowTousseInfoDiv(tousseName,tousseDefinitionId , imageType) {
+function getAndShowTousseInfoDiv(tousseName, tousseDefinitionId, imageType) {
 	var objectId = tousseDefinitionId;
 	var objectName = tousseName;
 	var curPage = 0;
@@ -8,20 +8,20 @@
 	var IMAGE_TYPE_MATERIAL = "材料图片";
 	var IMAGE_TYPE_SPECIFICATION = "器械包说明书";
 	var curImageType = IMAGE_TYPE_TOUSSE;
-	if(imageType){
+	if (imageType) {
 		curImageType = imageType;
 	}
-	
+
 	var toolbarPage = new top.Ext4.Toolbar.TextItem({
-		text : '第0页'
+		text: '第0页'
 	});
 	var toolbarTotalPage = new top.Ext4.Toolbar.TextItem({
-		text : '共0页'
+		text: '共0页'
 	});
-	var img_tbar = [ {
-		text : '上一张',
-		handler : function() {
-			if(totalPage == 0){
+	var img_tbar = [{
+		text: '上一张',
+		handler: function () {
+			if (totalPage == 0) {
 				showResult('没有图片');
 				return;
 			}
@@ -32,11 +32,11 @@
 			--curPage;
 			loadCurrentImage();
 		}
-	},toolbarPage,
-	toolbarTotalPage,{
-		text : '下一张',
-		handler : function() {
-			if(totalPage == 0){
+	}, toolbarPage,
+		toolbarTotalPage, {
+		text: '下一张',
+		handler: function () {
+			if (totalPage == 0) {
 				showResult('没有图片');
 				return;
 			}
@@ -48,167 +48,167 @@
 			loadCurrentImage();
 		}
 	}];
-	
+
 	var imagePanel = new top.Ext4.Panel({
-		id : 'imagePanel',
-		height :500,
-		border : false,
+		id: 'imagePanel',
+		height: 500,
+		border: false,
 		autoScroll: true,
-		bbar : img_tbar,
-		layout : 'fit',
-		items : [{
-		    xtype : 'image',
-		    id : 'browseImage',
-		    fieldLabel : "预览图片",
-		    src : Ext4.BLANK_IMAGE_URL
+		bbar: img_tbar,
+		layout: 'fit',
+		items: [{
+			xtype: 'image',
+			id: 'browseImage',
+			fieldLabel: "预览图片",
+			src: Ext4.BLANK_IMAGE_URL
 		}]
 	});
-	
-	function loadCurrentImage(){
+
+	function loadCurrentImage() {
 		var image = top.Ext4.getCmp('browseImage');
-		var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + (objectId || "") 
-		+ '&name=' + encodeURIComponent(objectName) + '&page=' + curPage + '&imageType=' + encodeURIComponent(curImageType) +'&time='+new Date().getTime();
+		var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + (objectId || "")
+			+ '&name=' + encodeURIComponent(objectName) + '&page=' + curPage + '&imageType=' + encodeURIComponent(curImageType) + '&time=' + new Date().getTime();
 		image.setSrc(url);// 覆盖原来的图片  
-		
+
 		var element = top.Ext4.get(toolbarPage.el);
-	    element.update('第' + curPage + '页');
-	}	
-	function clearImage(){
+		element.update('第' + curPage + '页');
+	}
+	function clearImage() {
 		totalPage = 0;
 		curPage = 0;
 		var image = top.Ext4.getCmp('browseImage');
 		image.setSrc('');
 		var element = top.Ext4.get(toolbarTotalPage.el);
-	    element.update('共' + totalPage + '页');
+		element.update('共' + totalPage + '页');
 		var element2 = top.Ext4.get(toolbarPage.el);
-	    element2.update('第' + curPage + '页');
+		element2.update('第' + curPage + '页');
 	}
-	function getTitle(){
-		if(curImageType==IMAGE_TYPE_TOUSSE){
+	function getTitle() {
+		if (curImageType == IMAGE_TYPE_TOUSSE) {
 			return '器械包[' + objectName + '] 图片';
-		}else if(curImageType==IMAGE_TYPE_MATERIAL){
+		} else if (curImageType == IMAGE_TYPE_MATERIAL) {
 			return '材料[' + objectName + '] 图片';
-		}else if(curImageType==IMAGE_TYPE_SPECIFICATION){
+		} else if (curImageType == IMAGE_TYPE_SPECIFICATION) {
 			return '器械包[' + objectName + '] 说明书';
-		}else{
+		} else {
 			return '';
 		}
 	}
-    function loadImageCount(){
-    	clearImage();
+	function loadImageCount() {
+		clearImage();
 		Ext.Ajax.request({
-			url : WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do",
-			params : {
-				id : objectId,
-				name : objectName,
-				imageType : curImageType
+			url: WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do",
+			params: {
+				id: objectId,
+				name: objectName,
+				imageType: curImageType
 			},
-			success : function(result){
+			success: function (result) {
 				top.Ext4.getCmp('imagePanel').setTitle(getTitle());
 				var pageJson = Ext.decode(result.responseText);
 				totalPage = parseInt(pageJson.count);
 				curPage = 0;
-				if(totalPage > 0){
+				if (totalPage > 0) {
 					curPage = 1;
 				}
 				var element = top.Ext4.get(toolbarTotalPage.el);
-			    element.update('共' + totalPage + '页');
-			    loadCurrentImage();
+				element.update('共' + totalPage + '页');
+				loadCurrentImage();
 			},
-			failure : function(){
+			failure: function () {
 				loadCurrentImage();
 			}
 		});
-    }
-	
+	}
+
 	var materialStore = new Ext4.data.Store({
-		proxy : {
-			type : 'ajax',
-			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do',
-			extraParams : {tousseName : tousseName,tousseDefinitionId:tousseDefinitionId},
-			reader : {
-				type : 'json'
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do',
+			extraParams: { tousseName: tousseName, tousseDefinitionId: tousseDefinitionId },
+			reader: {
+				type: 'json'
 			}
 		},
-		fields : [
-				    {name : 'materialDefinitionId'},
-				    {name : 'name'},
-				    {name : 'count'}
-				]		
+		fields: [
+			{ name: 'materialDefinitionId' },
+			{ name: 'name' },
+			{ name: 'count' }
+		]
 	});
-	
+
 	var materialToolbar = [{
-		text : '查看器械包图片',
-		handler : function(){
+		text: '查看器械包图片',
+		handler: function () {
 			curImageType = IMAGE_TYPE_TOUSSE;
 			objectName = tousseName;
-            objectId =tousseDefinitionId;
-            loadImageCount();
+			objectId = tousseDefinitionId;
+			loadImageCount();
 		}
-	},{
-		text : '查看说明书图片',
-		handler : function(){
+	}, {
+		text: '查看说明书图片',
+		handler: function () {
 			curImageType = IMAGE_TYPE_SPECIFICATION;
 			objectName = tousseName;
-            objectId =tousseDefinitionId;
-            loadImageCount();
+			objectId = tousseDefinitionId;
+			loadImageCount();
 		}
 	}];
-	
+
 	var materialGrid = new top.Ext4.grid.Panel({
-		id :'materialGrid',
-	    store: materialStore,
-	    columns: [
-	         {hidden : true, dataIndex : 'materialDefinitionId'},     
-	         {header : "材料名称",width : 190, menuDisabled: true,dataIndex : 'name'}, 
-	      	 {header : "数量",width : 40, menuDisabled: true,dataIndex : 'count'}
-	    ],
-	    viewConfig: {
-	        forceFit: true
-	    },
-	    autoExpandColumn : 'materialAmount',
-	    width:400,
-	    height:150,
-	    frame:false,
-	    title:'材料列表',
-	    tbar : materialToolbar
+		id: 'materialGrid',
+		store: materialStore,
+		columns: [
+			{ hidden: true, dataIndex: 'materialDefinitionId' },
+			{ header: "材料名称", width: 190, menuDisabled: true, dataIndex: 'name' },
+			{ header: "数量", width: 40, menuDisabled: true, dataIndex: 'count' }
+		],
+		viewConfig: {
+			forceFit: true
+		},
+		autoExpandColumn: 'materialAmount',
+		width: 400,
+		height: 150,
+		frame: false,
+		title: '材料列表',
+		tbar: materialToolbar
 	});
-	
-    materialGrid.on('itemclick', function(grid, record, item, columnIndex, e, eOpts){
-        var materialDefinitionId = record.data['materialDefinitionId'];
-        if (materialDefinitionId != '') {
-        	curImageType = IMAGE_TYPE_MATERIAL;
-        	objectName = record.data['name'];
-            objectId =materialDefinitionId;
-            loadImageCount();
-        }
-    }, this);
-	
-    
+
+	materialGrid.on('itemclick', function (grid, record, item, columnIndex, e, eOpts) {
+		var materialDefinitionId = record.data['materialDefinitionId'];
+		if (materialDefinitionId != '') {
+			curImageType = IMAGE_TYPE_MATERIAL;
+			objectName = record.data['name'];
+			objectId = materialDefinitionId;
+			loadImageCount();
+		}
+	}, this);
+
+
 	var window = new top.Ext4.Window({
-		id : 'packageImg',
-		title : tousseName + '信息',
-		width : 800,
-		height :380,
-		border : false,
+		id: 'packageImg',
+		title: tousseName + '信息',
+		width: 800,
+		height: 380,
+		border: false,
 		autoScroll: true,
-		layout : 'border',
-		modal : true,
-		items : [{
-			region : 'center',
-			layout : 'fit',
-			width : '30%',
-			items : materialGrid
-		},{
-			region : 'west',
-			layout : 'fit',
-		    width : '70%',
-			items : imagePanel
+		layout: 'border',
+		modal: true,
+		items: [{
+			region: 'center',
+			layout: 'fit',
+			width: '30%',
+			items: materialGrid
+		}, {
+			region: 'west',
+			layout: 'fit',
+			width: '70%',
+			items: imagePanel
 		}]
 	});
 	//材料
 	top.Ext4.getCmp('materialGrid').setTitle('[' + tousseName + '] 包含的材料');
-	materialStore.on("beforeload", function(store, operation, eOpts) {
+	materialStore.on("beforeload", function (store, operation, eOpts) {
 		store.proxy.extraParams["tousseName"] = tousseName;
 	});
 	materialStore.load();