Index: ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/menu/menuconfigure.js =================================================================== diff -u -r34271 -r34311 --- ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34271) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34311) @@ -374,14 +374,6 @@ {hidden :SSTS_ExpensiveGoodsWorkFlowFinishedApprovalTask_Hidden_Manager,text:"我的已办任务",href:WWWROOT+'/systemmanage/workFlow/workFlowFinishedApprovalTask.jsp',hrefTarget:linkTarget,leaf:true} ] },{ - text:"采购计划", - singleClickExpand:singleClickExpandTree, - hidden:SSTS_PurchasePlan_Manager, - children:[ - {hidden :SSTS_PurchasePlan_Manager,text:"采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_ExpensiveGoods_Hidden_Menu||SSTS_ExpensiveGoodsPurcahsePlan_Hidden_Manager,text:"高值耗材采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true} - ] -},{ text:"合同管理", singleClickExpand:singleClickExpandTree, hidden:SSTS_Contract_Manager, @@ -410,8 +402,8 @@ children:[ {hidden :sstsConfig.hiddSyncGodownEntryMenu,text:"同步入库单",href:encodeURI(WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=入库单'),hrefTarget:linkTarget,leaf:true}, {hidden :sstsConfig.hiddSyncGodownOutEntryMenu,text:"同步退库单",href:encodeURI(WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=退库单'),hrefTarget:linkTarget,leaf:true}, - {hidden :sstsConfig.hiddSyncGodownReturnEntryMenu,text:"同步退货单",href:encodeURI(WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=退货单'),hrefTarget:linkTarget,leaf:true}, - {hidden :sstsConfig.hiddSyncHisMaterialDefinitionMenu,text:"材料同步管理",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/materialDefinition/syncMaterialDefinition.jsp'),hrefTarget:linkTarget,leaf:true} + {hidden :sstsConfig.hiddSyncGodownReturnEntryMenu,text:"同步退货单",href:encodeURI(WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=退货单'),hrefTarget:linkTarget,leaf:true} + //{hidden :sstsConfig.hiddSyncHisMaterialDefinitionMenu,text:"材料同步管理",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/materialDefinition/syncMaterialDefinition.jsp'),hrefTarget:linkTarget,leaf:true} ] },{ @@ -598,34 +590,34 @@ //{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 :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_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}, {hidden :SSTS_WashWorkloadReport,text:"清洗区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/washWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashMaterialTypeWorkloadReport,text:"清洗区材料类型工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_PackingUnqualifieReport,text:"包装区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/packingUnqualifieReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizationWorkloadReport,text:"灭菌区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_sterilizationAreaWorkLoadReport,text:"灭菌区工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationAreaWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_tousseSterilizationInspectSituation,text:"器械消毒灭菌检查情况报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseSterilizationInspectSituation.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_tousseSterilizationInspectSituation,text:"器械消毒灭菌检查情况报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseSterilizationInspectSituation.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :hideDeviceMaintenaceReport,text:"设备维护报表",href:WWWROOT+'/disinfectsystem/reportforms/deviceMaintenanceView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :hideDeviceMaintenaceCusReport,text:"设备维护报表",href:WWWROOT+'/disinfectsystem/reportforms/deviceMaintenanceCusReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_QualityMonitoringReport,text:"质量监测报表",href:WWWROOT+'/disinfectsystem/reportforms/qualityMonitoringView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_QualityMonitoringReport,text:qualityMonthViewName,href:WWWROOT+'/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_QualityMonitoringReport,text:"器械清洗不合格部位数量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialWashUnqualifiedPositionView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_QualityMonitoringReport,text:"器械清洗不合格评估方法数量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialWashUnqualifiedAssessMethodView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enableMaterialWashUnUnqualifiedReport,text:"器械材料清洗不合格统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washUnUnqualifiedReportView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_YearWashReportChart,text:"清洗不合格率环比折线图报表",href:WWWROOT+'/disinfectsystem/reportforms/yearWashReportChartView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失汇总统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialMissTotalView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialMissItemView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损汇总统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageTotalView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageItemView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :!sstsConfig.enableMaterialWashUnUnqualifiedReport,text:"器械材料清洗不合格统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washUnUnqualifiedReportView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_YearWashReportChart,text:"清洗不合格率环比折线图报表",href:WWWROOT+'/disinfectsystem/reportforms/yearWashReportChartView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失汇总统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialMissTotalView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialMissItemView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损汇总统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageTotalView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageItemView.jsp',hrefTarget:linkTarget,leaf:true}, // {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失报损分类统计月报",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageMissMonthView.jsp',hrefTarget:linkTarget,leaf:true}, // {hidden :SSTS_SterilizationRecordInfoReport,text:"灭菌情况报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}, // {hidden :SSTS_WashAndDisinfectRecordInfoReport,text:"清洗情况报表",href:WWWROOT+'/disinfectsystem/reportforms/washAndDisinfectRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enableTousseOverloadReport,text:"器械包实际负载组合统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseOverLoad.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enableTousseMorrowSend,text:"器械包次日下送率统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseMorrowSend.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enableNurseWorkload,text:"护理工作质量指标报表",href:WWWROOT+'/disinfectsystem/reportforms/nurseWorkload.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :!sstsConfig.enableTousseOverloadReport,text:"器械包实际负载组合统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseOverLoad.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :!sstsConfig.enableTousseMorrowSend,text:"器械包次日下送率统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseMorrowSend.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :!sstsConfig.enableNurseWorkload,text:"护理工作质量指标报表",href:WWWROOT+'/disinfectsystem/reportforms/nurseWorkload.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.showSterilizerQualityReport,text:"灭菌物品质量监测统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizerQuality.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.showUnqualifiedPretreatmentReport,text:"预处理不合格报表",href:WWWROOT+'/disinfectsystem/reportforms/unqualifiedPretreatmentReport.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :!sstsConfig.showUnqualifiedPretreatmentReport,text:"预处理不合格报表",href:WWWROOT+'/disinfectsystem/reportforms/unqualifiedPretreatmentReport.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizationOmitReport,text:'灭菌遗漏检查表',href:WWWROOT+'/disinfectsystem/reportforms/sterilizationOmitReport.jsp',hrefTarget:linkTarget,leaf:true} ] },{ @@ -635,27 +627,27 @@ children:[ {hidden :SSTS_DepartmentMonthly,text:"核算月报",href:WWWROOT+'/disinfectsystem/reportforms/departmentMonthlyView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_DepartmentMonthlyDetail,text:"明细核算月报",href:WWWROOT+'/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_EOGoodsDetailReport,text:"发货物品统计月报(按灭菌程序)",href:WWWROOT+'/disinfectsystem/reportforms/EOGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_GodownEntryStatistic,text:"消耗物品月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsInventoryView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_EOGoodsDetailReport,text:"发货物品统计月报(按灭菌程序)",href:WWWROOT+'/disinfectsystem/reportforms/EOGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_GodownEntryStatistic,text:"消耗物品月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsInventoryView.jsp',hrefTarget:linkTarget,leaf:true}, // {hidden :SSTS_GodownEntryStatistic,text:"一次性物品三类查询报表",href:WWWROOT+'/disinfectsystem/reportforms/goodsAmountSummaryByGradeView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_GodownEntryStatistic,text:"入/退库物品统计报表(按供应商)",href:WWWROOT+'/disinfectsystem/reportforms/godownEntrySummaryView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_GodownEntryStatistic,text:"一次性物品发货量对比报表",href:WWWROOT+'/disinfectsystem/reportforms/invoiceAmountContrastChartView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_MaterialStockReport,text:"材料库存统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialStockReportView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_GodownEntryStatistic,text:"入/退库物品统计报表(按供应商)",href:WWWROOT+'/disinfectsystem/reportforms/godownEntrySummaryView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_GodownEntryStatistic,text:"一次性物品发货量对比报表",href:WWWROOT+'/disinfectsystem/reportforms/invoiceAmountContrastChartView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_MaterialStockReport,text:"材料库存统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialStockReportView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_ReturnGoodsDetailReport,text:"签收统计报表",href:WWWROOT+'/disinfectsystem/reportforms/signGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ReturnGoodsDetailReport,text:"退货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/returnGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_GoodsDistributeReportChart,text:"物品发放分布饼图",href:WWWROOT+'/disinfectsystem/reportforms/goodsDistributeReportChartView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseDeliverReport,text:"器械包发货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseDeliverStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_DisposableGoodsDeliverReport,text:"一次性物品发放表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsDeliverStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, - //{hidden :SSTS_ForeignTousseReport,text:"外来器械申请单统计报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ForeignTousseReport,text:"外来器械申请单统计报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_ApparatusInfusionisType,text:"各类型输液器报表",href:WWWROOT+'/disinfectsystem/reportforms/apparatusInfusionisTypeView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_TousseMaterialMonthCheckReport,text:"消毒供应中心器械月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_TousseMaterialMonthCheckReport,text:"消毒供应中心器械月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_BorrowReport,text:"借还物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/borrowReportView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_ForeignTousseSterilizationMonitorAndDelivery,text:"含植入物器械包灭菌监测及发放情况报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_ForeignTousseSterilizationMonitorAndDelivery,text:"含植入物器械包灭菌监测及发放情况报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.jsp',hrefTarget:linkTarget,leaf:true}, // {hidden :SSTS_ForeignTousseAfterUseDelivery,text:"外来器械使用后交接报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_UrgentNeedGoodsProcessingCycle,text:"急用物品处理周期统计报表",href:WWWROOT+'/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_TousseSpecificationSizeStatistics,text:"器械包规格大小统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseSpecificationSizeStatistics.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_TousseSpecificationSizeStatistics,text:"器械包规格大小统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseSpecificationSizeStatistics.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseApplySummary,text:"各部门器械包申请汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseApplySummary.jsp',hrefTarget:linkTarget,leaf:true} ] }, Index: ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js =================================================================== diff -u -r34297 -r34311 --- ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js (.../printConfig.js) (revision 34297) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js (.../printConfig.js) (revision 34311) @@ -255,15 +255,15 @@ // 页眉名称 {label : "东莞市横沥医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, // 标题 - {label : "材料出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]}, + {label : "领用物品出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]}, {label : "部门：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]}, {label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["55","75%","90%",5]}, {label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["55","35%","90%",5]}, {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["80","35%","90%",5]}, - {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]}, - {label : "主管:", dataIndex : '', fontSize : 11, position : ["10cm","5%","90%",5]}, - {label : "领料人:", dataIndex : '', fontSize : 11, position : ["10cm","40%","90%",5]}, - {label : "发料人:", dataIndex : 'sender', fontSize : 11, position : ["10cm","75%","90%",5]}, + {label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["80","2%","90%",5]}, + {label : "发货人:", dataIndex : 'sender', fontSize : 11, position : ["10cm","5%","90%",5]}, + {label : "送货人:", dataIndex : '', fontSize : 11, position : ["10cm","40%","90%",5]}, + {label : "领料人:", dataIndex : '', fontSize : 11, position : ["10cm","75%","90%",5]}, {barcodes : [ {codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"], styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, @@ -283,7 +283,7 @@ {header : "序号", dataIndex : 'serialNumber', width : '10%', align : 'center', fontSize : 11}, {header : "名称", dataIndex : 'name', width : '30%', align : 'left', fontSize : 11}, {header : "规格", dataIndex : 'specification', width : '15%', align : 'center', fontSize : 11}, - {header : "包装规格", dataIndex : 'packageSpec', width : '15%', align : 'center', fontSize : 11}, + //{header : "包装规格", dataIndex : 'packageSpec', width : '15%', align : 'center', fontSize : 11}, {header : "单位", dataIndex : 'unit', width : '5%', align : 'center', fontSize : 11}, {header : "数量", dataIndex : 'amount', width : '5%', align : 'right', fontSize : 11}, // {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : 105, align : 'center', fontSize : 11}, @@ -299,7 +299,7 @@ // 页眉名称 {label : "东莞市横沥医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, // 标题 - {label : "材料出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]}, + {label : "领用物品出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]}, {label : "部门：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]}, {label : "单号：", dataIndex : 'serialNumber', fontSize : 11, position : ["55","35%","90%",5]}, {label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["55","75%","90%",5]}, Index: ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js =================================================================== diff -u -r34271 -r34311 --- ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js (.../config.js) (revision 34271) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js (.../config.js) (revision 34311) @@ -12,7 +12,9 @@ // 条码类型：1：一维码， 2：二维码 barcodeType : 1, // 申请器械包时是否自动归还待归还物品 - autoReturnTousse : false, + autoReturnTousse : true, + //申请器械包时是否要求强制归还待归还物品 + //forceReturnTousseWhenCreateInvoicePlan:true, // 是否隐藏进入审核列表按钮 hideEnterReviewListButton : false, // 是否自动补全用户名 @@ -33,8 +35,6 @@ useRecordCircuitNurseAllowBlank : true, //使用记录模块的使用记录登记表单，洗手护士输入框是否为空 useRecordWashHandNurseAllowBlank : true, - //自定义装配后是否保留灭菌日期 - disinfectionDateProcessTypeInDirectPackingView : true, // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个 useRecordAuditMode : 2, hideApplyDepartColumn : false, // 隐藏申请科室 @@ -60,7 +60,7 @@ // 是否显示装配界面的打印按钮 packingView_currentTaskGroup_showPrintBtn: true, //是否启用聚合包功能 - //enableComboTousse: true, + enableComboTousse: true, //科室申领列表自动刷新间隔时间(单位:秒) autoRefreshApplicationDataIntervalSeconds : 600, //在灭菌视图界面是否显示“生物监测的状态”属性 @@ -88,7 +88,7 @@ //是否显示发货计划下送责任人 showInvoicePersonInCharge : false, // 聚合包按大包发货 - //comboTousseSendByWrapperTousse: true, + comboTousseSendByWrapperTousse: true, //是否允许回收数量减小的部分超过待装配数量 allowDecreaseRecyclingAmountGreatUnPackingAmount : true, //器械包定义是否批量修改 @@ -154,7 +154,17 @@ 'windowsPasswordComplexityReq': false }, // 是否启用回收申请单不发货科室配置 - enableRecyclingApplicationNotInvoice: true + enableRecyclingApplicationNotInvoice: true, + // 如果一个用户属于多个科室， 登录完系统需不需要弹出切换科室选项的小窗 + defaultShowOrgChange:true, + //使用记录转换申请单后的合并规则。 + useRecordConvertRecyclingApplicationMergeRegular:"depart", + //一次性物品库存不足时，是否允许申领 + allowApplyDisposableGoodsWhenUnderstock:false, + //是否隐藏同步退库单菜单 + hiddSyncGodownOutEntryMenu:true, + //是否隐藏同步退货单菜单 + hiddSyncGodownReturnEntryMenu:true //标识牌打印显示包名和编号 //printIdCardNameWithIdNumber:true // ==========================================================================================================================================================