Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js =================================================================== diff -u -r31264 -r33679 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 31264) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 33679) @@ -143,6 +143,7 @@ store.baseParams['sterilingMethods'] = selectedSterilingMethods; store.baseParams['appFormType'] = selectedAppFormType; store.baseParams['tousseGroupIds'] = tousseGroupIds; + store.baseParams['invoiceType'] = invoiceType; //刷新列表界面 store.load(); // } @@ -240,21 +241,42 @@ * @returns {Ext.form.ComboBox|Ext4.form.ComboBox} */ function createAppFormCombo() { - var appFormModel = sstsConfig.appFormModel || [ - ['全部申请单', ''] - ,['通用申请单', '通用申请单'] - ,['器械包申请单', '器械包申请单'] - ,['回收申请单', '回收申请单'] - ,['一次性物品申请单', '一次性物品申请单'] - ,['消毒物品申请单', '消毒物品申请单'] - ,['外来器械包申请单', '外来器械包申请单'] - ,['自定义器械包申请单', '自定义器械包申请单'] - ,['借物单', '借物单'] - ,['代理灭菌单', '代理灭菌单'] - ,['外部器械包代理灭菌申请单', '外部器械包代理灭菌申请单'] - ]; - if(sstsConfig.enableGoodsReservateion){ - appFormModel.push(['物品预约单', '物品预约单']); + var appFormModel = []; + if(invoiceType == TYPE_APPLICATION){ + appFormModel = sstsConfig.appFormModel || [ + ['全部申请单', ''] + ,['通用申请单', '通用申请单'] + ,['器械包申请单', '器械包申请单'] + ,['回收申请单', '回收申请单'] + ,['一次性物品申请单', '一次性物品申请单'] + ,['消毒物品申请单', '消毒物品申请单'] + ,['外来器械包申请单', '外来器械包申请单'] + ,['自定义器械包申请单', '自定义器械包申请单'] + ,['代理灭菌单', '代理灭菌单'] + ,['外部器械包代理灭菌申请单', '外部器械包代理灭菌申请单'] + ]; + if(sstsConfig.enableGoodsReservateion){ + appFormModel.push(['物品预约单', '物品预约单']); + } + }else if(invoiceType == TYPE_BORROWINGSINGLE){ + appFormModel = [['借物单', '借物单']]; + }else { + appFormModel = sstsConfig.appFormModel || [ + ['全部申请单', ''] + ,['通用申请单', '通用申请单'] + ,['器械包申请单', '器械包申请单'] + ,['回收申请单', '回收申请单'] + ,['一次性物品申请单', '一次性物品申请单'] + ,['消毒物品申请单', '消毒物品申请单'] + ,['外来器械包申请单', '外来器械包申请单'] + ,['自定义器械包申请单', '自定义器械包申请单'] + ,['借物单', '借物单'] + ,['代理灭菌单', '代理灭菌单'] + ,['外部器械包代理灭菌申请单', '外部器械包代理灭菌申请单'] + ]; + if(sstsConfig.enableGoodsReservateion){ + appFormModel.push(['物品预约单', '物品预约单']); + } } var appFormStore = new Ext.data.SimpleStore({ data: appFormModel, @@ -269,6 +291,11 @@ listeners: { select: function (combo, record, index) { refreshList(); + }, + render:function(){ + if(invoiceType == '借物单发货'){ + Ext.getCmp('appFormType').setValue('借物单'); + } } } }; 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 += '
  • '; + returnContent += '

    '; + returnContent += ''+item['title']+'
    • '; + } if(itemId != 'packing' && itemId !='sterilizationRecord'){ //SZYK-26:reviewModuleVersion审核版本 Index: ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js =================================================================== diff -u -r33108 -r33679 --- ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js (.../config.js) (revision 33108) +++ ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/config.js (.../config.js) (revision 33679) @@ -309,7 +309,9 @@ //发货计划列表隐藏未打印的一次性物品申请单 hideUnprintedDisposableGoodsInvoicePlan:true, //发货计划待发货物品变色规则。 - colorChangeRuleOfInvoicPlanToSendGoodsList:2 + colorChangeRuleOfInvoicPlanToSendGoodsList:2, + //启用借物单单独发货功能 + enableBorrowInvoicePlanSeperateSend:true } \ No newline at end of file Index: ssts-web/src/main/webapp/homepage/portalPage.jsp =================================================================== diff -u -r32893 -r33679 --- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 32893) +++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 33679) @@ -5,6 +5,8 @@ <%@page import="com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO,net.sf.json.JSONObject"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@page import="com.forgon.disinfectsystem.common.*"%> +<%@page import="com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan"%> +<%@page import="com.forgon.disinfectsystem.entity.invoicemanager.Invoice"%> <%@ page import="com.forgon.tools.SpringBeanManger,com.forgon.directory.vo.LoginUserData,com.forgon.portal.action.PortalPageAction"%> <%@ page import="java.util.Date"%> <%@ include file="/common/taglibs.jsp"%> @@ -250,6 +252,10 @@ var tabsTempId = 1; var isDrag = false; //是否为拖拽 var personalDesktopTitle = "个人桌面"; +//发货计划 +var TYPE_CUSTOM = '<%=Invoice.TYPE_CUSTOM%>';//自定义发货 +var TYPE_APPLICATION = '<%=Invoice.TYPE_APPLICATION%>';//申领发货 +var TYPE_BORROWINGSINGLE = '<%=Invoice.TYPE_BORROWINGSINGLE%>';//借物单发货 var recyclingWindow = null; /** Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp =================================================================== diff -u -r31240 -r33679 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 31240) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 33679) @@ -6,6 +6,7 @@ <%@page import="java.util.Calendar"%> <%@page import="com.forgon.disinfectsystem.packing.service.PackingManager,com.forgon.tools.SpringBeanManger"%> <%@page import="com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan"%> +<%@page import="com.forgon.disinfectsystem.entity.invoicemanager.Invoice"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation"%> <%@page import="com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager"%> <%@ page contentType="text/html; charset=UTF-8"%> @@ -43,6 +44,8 @@ var param_depart = '${param.depart}'; var param_departCode = '${param.departCode}'; var fontSize = '${fontSize}'; + var param_invoiceType = '${param.invoiceType}'; + var invoiceType = param_invoiceType || ''; @@ -144,6 +147,10 @@ if (notInWhiteList(sstsConfig, 'biologicalMonitoringWarning')) { biologicalMonitoringWarning = false; } + //发货计划 + var TYPE_CUSTOM = '<%=Invoice.TYPE_CUSTOM%>';//自定义发货 + var TYPE_APPLICATION = '<%=Invoice.TYPE_APPLICATION%>';//申领发货 + var TYPE_BORROWINGSINGLE = '<%=Invoice.TYPE_BORROWINGSINGLE%>';//借物单发货