Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r33616 -r33718
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 33616)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 33718)
@@ -120,12 +120,18 @@
 	    
     ]
 });
+var hideInvoicePlanMenu = SSTS_Invoice_Menu;
+if(!SSTS_Invoice_Menu){
+	hideInvoicePlanMenu = sstsConfig.enableBorrowInvoicePlanSeperateSend;
+}
 DisinfectsystemTreeData.push({
 	text:"发货管理",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_Invoice_Manager,
 	children:[
-        {hidden :SSTS_Invoice_Menu,text:"发货计划管理",href:WWWROOT+'/disinfectsystem/invoice/invoicePlanExtractedView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+        {hidden :hideInvoicePlanMenu,text:"发货计划管理",href:WWWROOT+'/disinfectsystem/invoice/invoicePlanExtractedView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+		{hidden :!hideInvoicePlanMenu,text:"申领发货",href:WWWROOT+'/disinfectsystem/invoice/invoicePlanExtractedView.jsp?editMode=true&invoiceType=' + encodeURIComponent("申领发货"),hrefTarget:linkTarget,leaf:true},
+		{hidden :!hideInvoicePlanMenu,text:"借物单发货",href:WWWROOT+'/disinfectsystem/invoice/invoicePlanExtractedView.jsp?editMode=true&invoiceType=' + encodeURIComponent("借物单发货"),hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_Invoice_Menu || !sstsConfig.enableExpensiveGoods,text:"高值耗材发货",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_OperationReservationDelivery_Menu,text:"手术预约管理",href:WWWROOT+'/disinfectsystem/invoice/operationReservationView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_OperationReservationDelivery_Menu,text:"手术预约发货",href:WWWROOT+'/disinfectsystem/invoice/operationReservationInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
@@ -645,7 +651,7 @@
 	  	{hidden :SSTS_USERECORD_ForGoods,text:"使用记录物品分类汇总表",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品分类汇总表(病人所在科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品汇总表(病人所在科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
-	  	{hidden :!sstsConfig.enableUseRecordByChiefSurgeonDoctorsAccountingDepartment || SSTS_USERECORD_TypeForDoctorAccountDepart ,text:"使用记录物品分类汇总表(主刀医生核算科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordTypeForDoctorAccountingDepartView.jsp',hrefTarget:linkTarget,leaf:true},
+	  	{hidden :false ,text:"使用记录物品分类汇总表(主刀医生核算科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordTypeForDoctorAccountingDepartView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :!sstsConfig.enableUseRecordByChiefSurgeonDoctorsAccountingDepartment || SSTS_USERECORD_SumForDoctorAccountDepart,text:"使用记录物品汇总表(主刀医生核算科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForDoctorAccountingDepartView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_WashingMachineStoveUseCountReport,text:"清洗机使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washingMachineStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_SterilizingStoveUseCountReport,text:"灭菌炉使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -662,7 +668,7 @@
 	children:[
 	    //“临床护理质量管理与控制指标”报表暂时屏蔽，等客户现场确认不用后，应该把相应的业务代码全部删除
 	    //{hidden :true,text:"临床护理质量管理与控制指标",href:WWWROOT+'/disinfectsystem/reportforms/qualityControlOfClinic.jsp',hrefTarget:linkTarget,leaf:true},
-	    {hidden :SSTS_QualityControlOfClinic,text:"供应室护理质量指标统计表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomQualityQuota.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :false,text:"供应室护理质量指标统计表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomQualityQuota.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_QuotaReport,text:"十八项指标分析报表",href:WWWROOT+'/disinfectsystem/reportforms/quotaReportView.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_WorkQualityCountReport,text:"工作质量持续收集统计报表",href:WWWROOT+'/disinfectsystem/reportforms/workQualityCollectionView.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.jsp',hrefTarget:linkTarget,leaf:true},