Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r27343 -r27788
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 27343)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 27788)
@@ -1084,10 +1084,12 @@
 		});
 	}
 //展示器械包图片信息
-function getAndShowTousseInfoDiv(tousseName,tousseDefinitionId) {
+function getAndShowTousseInfoDiv(tousseName,tousseDefinitionID) {
     currentImageType = "器械包图片";
-    var materialId = "";
-    var materialToolbar = [{
+	var materialId = "";
+	var currentPage = 1;
+
+	var materialToolbar = [{
         text : '查看器械包图片',
         handler : function(){
            currentImageType = "器械包图片";
@@ -1100,11 +1102,12 @@
            loadImage('',tousseName,currentImageType,tousseDefinitionId);
         }
     }];
+
     var materialStore = new top.Ext4.data.Store({
         proxy : {
         	type : 'ajax',
             url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do',
-            extraParams : {tousseName : tousseName,tousseDefinitionId:tousseDefinitionId},
+            extraParams : {tousseName : tousseName,tousseDefinitionId:tousseDefinitionID},
             reader : {
     			type : 'json'
     		}
@@ -1129,9 +1132,6 @@
              {header : "材料名称",width : 100,flex: 1, menuDisabled: true,dataIndex : 'name',renderer:gridItemRender}, 
              {header : "数量",width : 40, menuDisabled: true,dataIndex : 'count',renderer:gridItemRender}
         ],
-//	viewConfig: {
-//            forceFit: true
-//        },
         plugins: [{
             ptype: 'rowexpander',
             rowBodyTpl : new top.Ext4.XTemplate(
@@ -1159,131 +1159,16 @@
                  var materialDefinitionId = record.data['materialDefinitionId'];
                  var materialName = record.data['name'];
                  if (materialDefinitionId != '') {
-                     materialId = materialDefinitionId;
-                     loadImage(materialDefinitionId,materialName,currentImageType);
+					materialId = materialDefinitionId;
+					var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(currentImageType)+'&number='+currentPage;
+					openFullSizeWindowWithName(url,false,currentImageType);
                  }
              }
         }
     });
     
-     top.Ext4.QuickTips.init();//别忘记加这句
-//     materialGrid.on('mouseover', function(e) {// 添加mouseover事件
-//        var index = materialGrid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置
-//        if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false）
-//            var record = this.getStore().getAt(index);
-//            var rowEl = Ext4.fly(e.getTarget());
-//            rowEl.set({'ext:qtip':'<b>'+record.data['name']+'</b>','ext:qwidth':300,'ext:qtitle':'<b><font style="color: green;">材料名称（点击查看图片）:</font><b></br>'},false);
-//        }
-//     }); 
-    
-//    materialGrid.on('rowclick', function(grid, index, e){
-//        currentImageType = "材料图片";
-//        var selectionModel = grid.getSelectionModel().getSelections();
-//        if(selectionModel.length > 0) {
-//            var materialDefinitionId = selectionModel[0].data['materialDefinitionId'];
-//            var materialName = selectionModel[0].data['name'];
-//            if (materialDefinitionId != '') {
-//                materialId = materialDefinitionId;
-//                loadImage(materialDefinitionId,materialName,currentImageType);
-//            }
-//        }
-//    });
-    
-    /////////////////////////////////////////图片预览
-    
-    var imagePanel = new top.Ext4.Panel({
-        id : 'imagePanel',
-        height :500,
-		border : false,
-		autoScroll: true,
-		layout : 'fit',
-        bbar : [{
-        	xtype:'tbtext',
-        	id:'pageName'
-        },'->',{
-            xtype : 'button',
-            text : '<<',
-            tooltip:'上一页',
-            handler : function(){
-                if (page - 1 <= 0) {
-                    showResult('已是第一页' , null , sstsConfig.messagePauseTimeOnReviewPage);
-                    return;
-                }
-                page = page - 1;
-                
-                var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?materialId='+materialId+'&tousseId='+tousseDefinitionId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page+'&imageType='+currentImageType;
-                var image = top.Ext4.getCmp('browseImage');
-                image.setSrc('');
-                image.setSrc(url);// 覆盖原来的图片
-                var element = top.Ext4.getCmp("toolbarPage");
-                element.update('第 ' + page + ' 页');
-            }
-        },{
-        	xtype:'tbtext',
-        	id:'toolbarPage'
-        },{
-        	xtype:'tbtext',
-        	id:'toolbarTotalPage'
-        },{
-            xtype : 'button',
-            text : '>>',
-            tooltip:'下一页',
-            handler : function() {
-                if (page + 1 > totalPage) {
-                    showResult('已是最后一页' , null , sstsConfig.messagePauseTimeOnReviewPage);
-                    return;
-                }
-                page = page + 1;
-                
-                var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?materialId='+materialId+'&tousseId='+tousseDefinitionId +'&name=' + encodeURIComponent(tousseName) + '&page=' + page +'&imageType='+currentImageType;;
-                var image = top.Ext4.getCmp('browseImage');
-                image.setSrc('');
-                image.setSrc(url);// 覆盖原来的图片
-                var element = top.Ext4.getCmp("toolbarPage");
-                element.update('第 ' + page + ' 页');
-            }
-        }],
-        items : [{
-    	    xtype : 'image',
-    	    id : 'browseImage',
-    	    fieldLabel : "预览图片",
-    	    //title:'双击预览图片',
-    	    src : Ext.BLANK_IMAGE_URL
-    	}]
-    });
-    
-    /////////////////////////////////////////图片预览
-    
-    var window = new top.Ext4.Window({
-        id : 'packageImg',
-        title : tousseName + '信息',
-        width : 800,
-        height :450,
-        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
-        }]
-    });
-    //材料
-    //top.Ext.getCmp('materialGrid').setTitle('[' + tousseName + '] 包含的材料');
-    materialStore.on("beforeload", function(thiz, options) {
-        thiz.proxy.extraParams["tousseInstanceId"] = id;
-    });
-    materialStore.load();
-    window.show();
-    //图片
-    loadImage('',tousseName,currentImageType,tousseDefinitionId);  
+	var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(currentImageType)+'&number='+currentPage;
+	openFullSizeWindowWithName(url,false,currentImageType);
 }
 	var columns = [
 	     {header : "器械包名称",width : 120,dataIndex : 'tousseDefinition.name',renderer:showTousseInfoDiv,sortable:false},