Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r24730 -r24838 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 24730) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 24838) @@ -835,7 +835,7 @@ materialStore.load(); } - function loadImage(materialId,name,imageType){ + function loadImage(materialId,name,imageType,tousseId){ page = 1; totalPage = 0; //加载当前包图片总页数 @@ -844,7 +844,8 @@ params : { name : name, imageType:imageType, - materialId:materialId + materialId:materialId, + tousseId:tousseId }, success : function(result){ var pageCount = top.Ext4.decode(result.responseText); @@ -855,7 +856,7 @@ } //加载图片 - var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?materialId='+materialId+'&name=' + encodeURIComponent(name) + '&page=' + page + '&imageType='+imageType +'&time='+new Date(); + var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?materialId='+materialId+'&tousseId='+tousseId +'&name=' + encodeURIComponent(name) + '&page=' + page + '&imageType='+imageType +'&time='+new Date(); var image = top.Ext4.getCmp('browseImage'); image.setSrc(''); image.setSrc(url);// 覆盖原来的图片 @@ -901,13 +902,13 @@ text : '查看器械包图片', handler : function(){ currentImageType = "器械包图片"; - loadImage('',tousseName,currentImageType); + loadImage('',tousseName,currentImageType,tousseDefinitionId); } },{ text : '查看装配教学图片', handler : function(){ currentImageType = "器械包装配教学图片"; - loadImage('',tousseName,currentImageType); + loadImage('',tousseName,currentImageType,tousseDefinitionId); } }]; var materialStore = new top.Ext4.data.Store({ @@ -1021,7 +1022,7 @@ } page = page - 1; - var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?materialId='+materialId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page+'&imageType='+currentImageType; + 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);// 覆盖原来的图片 @@ -1045,7 +1046,7 @@ } page = page + 1; - var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?materialId='+materialId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page +'&imageType='+currentImageType;; + 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);// 覆盖原来的图片 @@ -1093,7 +1094,7 @@ materialStore.load(); window.show(); //图片 - loadImage('',tousseName,currentImageType); + loadImage('',tousseName,currentImageType,tousseDefinitionId); } var columns = [ {header : "器械包名称",width : 150,dataIndex : 'tousseDefinition.name',renderer:showTousseInfoDiv,sortable:false},