Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r33363 -r33679 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 33363) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 33679) @@ -1,6 +1,7 @@ var warningWindow; //系统告警win var unReturnWarningWindow; //未归还告警win var packingMenu ; +var invoicePlanMenu; var comboToussePackingMenu ; var reviewPackingMenu ; var sterilizationRecordMenu ; @@ -288,6 +289,7 @@ var reviewPackingImg = getById('reviewPackingImg'); var sterilizationRecordImg = getById('sterilizationRecordImg'); var useRecordImg = getById('useRecordImg'); + var invoicePlanImg = getById('invoicePlanImg'); if((packingImg || comboToussePackingImg || reviewPackingImg || sterilizationRecordImg) || (useRecordImg && hasTwoUseRecordOperation)){ @@ -395,6 +397,28 @@ addIconTips(amount,"invoicePlan",'invoicePlanTip'); }); }); + invoicePlanMenu = new Ext4.menu.Menu({ + floating: true + }); + invoicePlanMenu.add({ + text :TYPE_APPLICATION, + url : '/disinfectsystem/invoice/invoicePlanExtractedView.jsp?editMode=true&invoiceType=' + encodeURIComponent(TYPE_APPLICATION) + },{ + text :TYPE_CUSTOM, + url : '/disinfectsystem/invoice/customInvoiceForm.jsp?editMode=true' + },{ + text :TYPE_BORROWINGSINGLE, + url : '/disinfectsystem/invoice/invoicePlanExtractedView.jsp?editMode=true&invoiceType=' + encodeURIComponent(TYPE_BORROWINGSINGLE) + }); + invoicePlanImg.on('mouseenter', function(e) { + invoicePlanMenu.showAt(e.getXY()); + }); + invoicePlanMenu.on('click',function(menu,item,e){ + if(isUndefinedOrNull(item)){ + return; + } + addTab('invoicePlan',item.text,item.url); + }); } //借物管理 @@ -949,6 +973,13 @@ if(itemId == 'goodsReceipt' && (sstsConfig.signModuleVersion == 2)){ return returnContent; } + + //发货计划 + if(itemId == 'invoicePlan' && sstsConfig.enableBorrowInvoicePlanSeperateSend){ + returnContent += '