Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r14017 -r14024 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 14017) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 14024) @@ -464,127 +464,6 @@ return "" + v + ""; } -//展示器械包信息 -function getAndShowTousseInfoDiv(tousseName) { - - - var imagePanel = new top.Ext4.Panel({ - id : 'imagePanel', - height :500, - border : false, - autoScroll: true, - layout : 'fit', - items : [{ - xtype : 'image', - id : 'browseImage', - fieldLabel : "预览图片", - src : Ext4.BLANK_IMAGE_URL - /* - autoEl : { - id : 'imageBrowse', - tag : 'img', - src : Ext4.BLANK_IMAGE_URL, - style : 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);', - complete : 'off' - } - */ - }] - }); - - function loadMaterialImage(id,name){ - top.Ext4.getCmp('imagePanel').setTitle('材料[' + name + '] 图片'); - var url = WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getImage.do?id='+id+'&materialName='+name+'&number='+1; - var image = top.Ext4.getCmp('browseImage'); - image.setSrc(''); - image.setSrc(url);// 覆盖原来的图片 - } - - function loadTousseInstanceImage(){ - var url = WWWROOT + "/disinfectSystem/recyclingApplicationAction!getImage.do?name=" + tousseName+'&imageType=器械包图片'; - var image = top.Ext4.getCmp('browseImage'); - image.setSrc(''); - image.setSrc(url);// 覆盖原来的图片 - } - - var materialStore = new Ext4.data.Store({ - proxy : { - type : 'ajax', - url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do', - extraParams : {tousseName : tousseName}, - reader : { - type : 'json' - } - }, - fields : [ - {name : 'materialDefinitionId'}, - {name : 'name'}, - {name : 'count'} - ] - }); - - var materialToolbar = [{ - text : '查看器械包图片', - handler : loadTousseInstanceImage - }]; - - 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 - }); - - materialGrid.on('itemclick', function(grid, record, item, columnIndex, e, eOpts){ - var materialDefinitionId = record.data['materialDefinitionId']; - if (materialDefinitionId != '') { - var materialName = record.data['name']; - loadMaterialImage(materialDefinitionId, materialName); - } - }, this); - - var window = new top.Ext4.Window({ - 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 - } ] - }); - //材料 - top.Ext4.getCmp('materialGrid').setTitle('[' + tousseName + '] 包含的材料'); - materialStore.on("beforeload", function(store, operation, eOpts) { - store.proxy.extraParams["tousseName"] = tousseName; - }); - materialStore.load(); - window.show(); - loadTousseInstanceImage(); -} - function removeGridItem(){ var rows = top.Ext4.getCmp('recyclingApplicationGrid').getSelectionModel().getSelections();// 返回值为 if (rows) {