Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r24143 -r24195 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 24143) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 24195) @@ -1,6 +1,12 @@ Ext4.require('Ext4.tab.*'); Ext4.require(['Ext4.data.*', 'Ext4.grid.*']); +//记住最后选择的器械包图片名称、类型、视频名称、包定义id;用于查看材料图片后再次查询器械包 +var lastSelectTousseName; +var lastSelectimageTypeTousse; +var lastSelectVedioName; +var lastSelectTdId; + var packingToussesArray = []; // 装配的器械包数组,用于Selenium自动化测试 var packedToussesArray = [];// 用于一次打印所有装配的包 var tousseesToPrint = []; @@ -504,6 +510,10 @@ var vedioName = idCardTaskNode.get('uuid_vedioNames'); var td_id = idCardTaskNode.get('tousseID'); loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id); + lastSelectTousseName = tousseName; + lastSelectimageTypeTousse = imageType_tousse; + lastSelectVedioName = vedioName; + lastSelectTdId = td_id; var tousseType = idCardTaskNode.get('tousseType'); var isPrint = idCardTaskNode.get('isPrint'); var isReview = idCardTaskNode.get('isReview'); @@ -763,7 +773,7 @@ } },{ header: '操作', - width : 70, + width : 120, align:'center', sortable: true, renderer: function(v,p,record,rowIndex, columnIndex, store){ @@ -1047,6 +1057,17 @@ loadGoodsImage(curSelMaterialName,IMAGE_TYPE_MATERIAL_FUNCTIONCHECK,curSelMaterialId,1,"",""); } }, + { + xtype : 'button', + id : 'btn_viewTousseImage', + name : 'btn_viewTousseImage', + text : '查看器械包图片', + handler : function(){ + if(lastSelectTousseName && lastSelectTdId){ + loadGoodsImage(lastSelectTousseName ,lastSelectimageTypeTousse ,'',1 ,lastSelectVedioName ,lastSelectTdId); + } + } + }, {xtype:'button',text:'<<',tooltip :"上一页", handler : function(){ var imageName = Ext4.getCmp('imageName').getText(); var imageType = Ext4.getCmp('imageType').getValue(); @@ -3725,6 +3746,10 @@ var td_id = record.get('tousseID'); updateNoteWindow(record); loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id); + lastSelectTousseName = tousseName; + lastSelectimageTypeTousse = imageType_tousse; + lastSelectVedioName = vedioName; + lastSelectTdId = td_id; if(packingPageAutoSetSterilizationProgramAfterSelectTousse){ Ext4.getCmp('sterilingType').setValue(sterilingMethod); //根据灭菌程序设置灭菌方式的值 @@ -4038,6 +4063,10 @@ updateNoteWindow(record); loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id); + lastSelectTousseName = tousseName; + lastSelectimageTypeTousse = imageType_tousse; + lastSelectVedioName = vedioName; + lastSelectTdId = td_id; if(packingPageAutoSetSterilizationProgramAfterSelectTousse){ Ext4.getCmp('sterilingType').setValue(sterilingMethod); //根据灭菌程序设置灭菌方式的值