Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r20103 -r20147 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 20103) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 20147) @@ -2874,65 +2874,67 @@ } var tableContent; - grid.on('mouseover', function(e) {// 添加mouseover事件 - var index = grid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置 - if (index !== false) {// 当取到了正确的列时,(因为如果传入的target列没有取到的时候会返回false) - var record = this.getStore().getAt(index); - var BorrowName = ''; - var BorrowAmount = ''; - var isDiposableApplicationForm = (record.data['type']==diposableGoodsApplicationForm); - tableContent = record.data['htmlContent'];// - if(!tableContent){ - var content = ""; - DWREngine.setAsync(false); - InvoicePlanTableManager.findApplicationItemVOListByInvoicePlanId(record.data['id'],function(voItems){ - for(var i=0;i"; - } - var recyclingAmount = voItems[i].recyclingAmount; + if (mouseHoverEventOfApply != '否') { + grid.on('mouseover', function(e) {// 添加mouseover事件 + var index = grid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置 + if (index !== false) {// 当取到了正确的列时,(因为如果传入的target列没有取到的时候会返回false) + var record = this.getStore().getAt(index); + var BorrowName = ''; + var BorrowAmount = ''; + var isDiposableApplicationForm = (record.data['type']==diposableGoodsApplicationForm); + tableContent = record.data['htmlContent'];// + if(!tableContent){ + var content = ""; + DWREngine.setAsync(false); + InvoicePlanTableManager.findApplicationItemVOListByInvoicePlanId(record.data['id'],function(voItems){ + for(var i=0;i"; + } + var recyclingAmount = voItems[i].recyclingAmount; - content += "" : ">"; - content +=" " + tousseName +"" + voItems[i].amountDisplay+"" + recyclingAmount+"" + voItems[i].invoiceAmount+"" + BorrowAmount; - // content +=" " + tousseName +"" + voItems[i].amount+"" + recyclingAmount+"" + voItems[i].invoiceAmount+""+BorrowAmount; - //一次性物品加编号 - if(isDiposableApplicationForm){ - var code = voItems[i].externalCode; - if(code == null || code.length <= 0){ - code = " "; + content += "" : ">"; + content +=" " + tousseName +"" + voItems[i].amountDisplay+"" + recyclingAmount+"" + voItems[i].invoiceAmount+"" + BorrowAmount; + // content +=" " + tousseName +"" + voItems[i].amount+"" + recyclingAmount+"" + voItems[i].invoiceAmount+""+BorrowAmount; + //一次性物品加编号 + if(isDiposableApplicationForm){ + var code = voItems[i].externalCode; + if(code == null || code.length <= 0){ + code = " "; + } + content +=""+ code +""; } - content +=""+ code +""; - } - content +=""; - //消毒物品加材料 - var material = voItems[i].material; - if(material != null && material.length > 0){ - var materialArray = material.split("@&"); - for ( var j = 0; j < materialArray.length; j++) { - var materialItems = materialArray[j].split("#&"); - content +="   " + materialItems[0] +"" + materialItems[1]+""; - content +="" + (materialItems[2] == "null" ? " " : materialItems[2]) + " "; + content +=""; + //消毒物品加材料 + var material = voItems[i].material; + if(material != null && material.length > 0){ + var materialArray = material.split("@&"); + for ( var j = 0; j < materialArray.length; j++) { + var materialItems = materialArray[j].split("#&"); + content +="   " + materialItems[0] +"" + materialItems[1]+""; + content +="" + (materialItems[2] == "null" ? " " : materialItems[2]) + " "; + } } } + }); + DWREngine.setAsync(true); + tableContent = (""+BorrowName); + if(isDiposableApplicationForm){ + tableContent += ""; } - }); - DWREngine.setAsync(true); - tableContent = ("

物品名称

申请数量

回收数量

已发货数量

编码

"+BorrowName); - if(isDiposableApplicationForm){ - tableContent += ""; + tableContent += "" + content + "

物品名称

申请数量

回收数量

已发货数量

编码


"; + record.set("htmlContent",tableContent); } - tableContent += "" + content + "
"; - record.set("htmlContent",tableContent); + e.getTarget().setAttribute('data-qtip', tableContent); + e.getTarget().setAttribute('data-qwidth', 450); + e.getTarget().setAttribute('data-qtitle', ' 申请物品列表:'); } - e.getTarget().setAttribute('data-qtip', tableContent); - e.getTarget().setAttribute('data-qwidth', 450); - e.getTarget().setAttribute('data-qtitle', ' 申请物品列表:'); - } - }); - + }); + } + var viewport = new Ext.Viewport({ layout : 'border', items : [{