Index: ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/menu/menuconfigure.js =================================================================== diff -u -r34849 -r34851 --- ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34849) +++ ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34851) @@ -141,7 +141,8 @@ children:[ {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查表定义",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SatisfactionSurveyTable_Menu,text:"满意度调查表",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true} + {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查明细报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyDetailView.jsp',hrefTarget:linkTarget,leaf:true} ] }; DisinfectsystemTreeData[11] = { @@ -574,18 +575,19 @@ singleClickExpand:singleClickExpandTree, hidden:SSTS_WorkLoad_Menu, children:[ - {hidden :!(sstsConfig.enableNewYearWorkloadReport) || SSTS_YearWorkload,text:"年度消毒中心指标工作量统计(新)",href:WWWROOT+'/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.jsp',hrefTarget:linkTarget,leaf:true}, - //{hidden :SSTS_YearWorkload,text:"年度消毒中心指标工作量统计",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心工作人员绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!(sstsConfig.enableCSSDWorkloadReportForTangshanWorkersHospital && supplyRoomUser),text:"消毒供应室工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/cssdWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :!(sstsConfig.enableNewYearWorkloadReport) || SSTS_YearWorkload,text:"消毒供应中心年度工作量统计报表(新)",href:WWWROOT+'/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_YearWorkload,text:"消毒供应中心年度工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心员工绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心员工工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :!((sstsConfig.hasOwnProperty('enableWorkloadScoreStatisticReport')) && sstsConfig.enableWorkloadScoreStatisticReport),text:"工作量积分统计报表",href:WWWROOT+'/disinfectsystem/reportforms/workloadScoreStatisticView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :!sstsConfig.enableCSSDWorkloadReportForTangshanWorkersHospital,text:"消毒供应室工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/cssdWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_USERECORD_TOTAL,text:"使用记录录入统计报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordTotalView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_USERECORD_Item,text:"使用记录录入明细报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordItemView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_USERECORD_OperatorTotal,text:"使用记录人员汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_USERECORD_ForGoods,text:"使用记录物品分类汇总表",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsView.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}, {hidden :SSTS_TousseWorkLoadTotalReport,text:(sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/tousseWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true}, - //{hidden :SSTS_CleaningAreaWorkloadForUser,text:'清洗区人员工作量统计报表',href:WWWROOT+'/disinfectsystem/reportforms/cleaningAreaWorkloadForUser.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_CleaningAreaWorkloadForUser,text:'清洗区人员工作量统计报表',href:WWWROOT+'/disinfectsystem/reportforms/cleaningAreaWorkloadForUser.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WaitPackingTaskReport,text:'待装配任务工作表',href:WWWROOT+'/disinfectsystem/reportforms/waitPackingTaskReport.jsp',hrefTarget:linkTarget,leaf:true} ] @@ -596,31 +598,31 @@ 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 :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_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.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_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 :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: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_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 :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}, @@ -639,22 +641,22 @@ {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/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/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_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_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_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_TousseApplySummary,text:"各部门器械包申请汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseApplySummary.jsp',hrefTarget:linkTarget,leaf:true} ] Index: ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/print/printConfig.js =================================================================== diff -u -r34849 -r34851 --- ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/print/printConfig.js (.../printConfig.js) (revision 34849) +++ ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/print/printConfig.js (.../printConfig.js) (revision 34851) @@ -1,12 +1,4 @@ -var printerNameMapping = { - '模板-普通小标签' : 'ZDesigner GK888t', - '模板-外器小标签' : 'ZDesigner GK888t', - '模板-外部代理灭菌小标签' : 'ZDesigner GK888t', - '模板-科室' : 'ZDesigner GK888t (包内标签)', - '模板-用户' : 'ZDesigner GK888t (包内标签)', - '模板-固定条码' : 'ZDesigner GK888t (包内标签)' -}; -var appropriationInListConfig = { +var appropriationInListConfig = { headerFooter : [ // 页眉名称 {label : "河北省唐山工人医院调拨入库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]}, @@ -263,15 +255,15 @@ // 页眉名称 {label : "河北省唐山工人医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, // 标题 - {label : "供应室发货单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]}, - {label : "部门：", dataIndex : 'depart', fontSize : 11, position : ["45","2%","90%",5]}, - {label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["45","75%","90%",5]}, - {label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["45","35%","90%",5]}, - {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["60","35%","90%",5]}, - {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["60","2%","90%",5]}, - {label : "主管:", dataIndex : '', fontSize : 11, position : ["8cm","5%","90%",5]}, - {label : "发货人:", dataIndex : 'sender', fontSize : 11, position : ["8cm","25%","90%",5]}, - {label : "签收人:", dataIndex : '', fontSize : 11, position : ["8cm","50%","90%",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]}, {barcodes : [ {codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"], styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, @@ -281,23 +273,23 @@ } ]} ], - currentPageNumber : {label : "第#页", fontSize : 11, position : ["8cm","80%","90%",5]}, - totalPageAmount : {label : "共&页", fontSize : 11, position : ["8cm","85%","90%",5]}, + currentPageNumber : {label : "第#页", fontSize : 11, position : ["11cm","75%","90%",5]}, + totalPageAmount : {label : "共&页", fontSize : 11, position : ["11cm","81%","90%",5]}, goodsTable :{ - rowHeight : 20, - position : ["75","1%","88%","5.5cm"], + rowHeight : 25, + position : ["100","1%","97%","6.5cm"], headRepeat : true, columns : [ {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}, - {header : "失效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11} -// {header : "单价", dataIndex : 'price', width : '10%', align : 'right', fontSize : 11}, -// {header : "金额", dataIndex : 'totalPrice', width : '10%', align : 'right', fontSize : 11} +// {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : 105, align : 'center', fontSize : 11}, +// {header : "失效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11}, + {header : "单价", dataIndex : 'price', width : '10%', align : 'right', fontSize : 11}, + {header : "金额", dataIndex : 'totalPrice', width : '10%', align : 'right', fontSize : 11} ] } } @@ -1108,9 +1100,6 @@ tableHtml += "
"+barcode; tableHtml += ""; tableHtml += "器械总数量:"+ret.amount+"件"; - if(tousseDefinitionObj.currentDateTime && tousseDefinitionObj.currentDateTime !== ''){ - tableHtml += "
打印日期: "+tousseDefinitionObj.currentDateTime+""; - } tableHtml += ""; tableHtml += ""; @@ -1135,8 +1124,6 @@ invoiceTousse : invoiceComboPrintConfig, // 发货单（消毒物品） invoiceDisinfectGoods : invoiceComboPrintConfig, - //外部代理灭菌申请单打印 - foreignProxyDisinfectionApplication:batchPrintInvoicesConfig, // 申请单 application : applicationPrintConfig, // 消毒物品申请单 Index: ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/HIS.xml =================================================================== diff -u -r34849 -r34851 --- ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/HIS.xml (.../HIS.xml) (revision 34849) +++ ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/HIS.xml (.../HIS.xml) (revision 34851) @@ -89,21 +89,12 @@ - - - - - - + Index: ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/config.js =================================================================== diff -u -r34849 -r34851 --- ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/config.js (.../config.js) (revision 34849) +++ ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/config.js (.../config.js) (revision 34851) @@ -1,112 +1,14 @@ -var sstsConfig = { - //是否使用旧版发货(默认不使用旧版) - useOldInvoiceVersion:false, - //使用记录审核时检查外来器械包的植入物使用数量并进行提醒，为true时使用记录审核时检查外来器械包植入物使用数量并进行提醒和拦截，没有填写植入物使用数量则不允许审核。 - checkAndRemindTheAmountOfImplantsUsedInTheForeignEquipmentPackageDuringTheUseRecordReview:false, - //是否查询并显示发货物品查询报表一次性物品和外来器械供应商true为显示 - showSupplierNameInInvoiceItemQueryReport:true, - //质量监测记录是否责任环节带出监测项，true为是 - respondibilityPartBringInspectItem:true, - //是否开启按天收费，true为开户，更新时间如下 - isBorrowChargeByDayAndShow:{open:true,updateTime:'2022-02-15 00:00:00'}, - //科室申领是否显示修改历史记录，true表示显示 - isShowUpdateDetail:true, - //报表中的发货数量值扣减掉退货数量，值为TRUE为扣减退货数量后的数值 - sendAmountOfReportsSubstractReturnGoodsAmount:true, - //自定义装配界面是否显示选择申请科室，true为显示，但不是必选项 - selectDepartInCustomPacking:true, - //是否启用器械包定义所属科室属性，true启用 - enableTousseDefinitionBelongDepart:true, - //启用器械包定义所属科室过滤 - enableTousseDefinitionBelongDepartFilter:true, - //打印回收清单功能，打印机物品范围可选值：'器械包'、消毒物品、敷料包、'全部' - recyclingRecordListPrintTousseType:'全部', - //是否按科室分组打印回收清单，当配置为true时不能再配置recyclingRecordListFilterByAssetBelong为true, - printRecyclingDetailWithDepartGroup:true, - //是否启用发货汇总单查看功能，true为启用 - enableDeliverySummaryView:true, - //申领界面不显示整包申请的消毒物品的材料明细，true不显示 - hideMaterialsListOfDisinfectionGoodsApplyEntire:true, - //发货单是否合并打印，如果为true,则把一次性物品，消毒物品、器械包打印到一张单 - mergePrintInvoiceGoods:true, - //申请单上一次性物品名字的显示，true表示名字规格申领规格 - disposableGoodShowAppSpAndSp:true, - //发货管理时间选择combo，是否显示上午和下午，true为显示。 - showMorAndAf:true, - //是否允许处理科室的用户替申请科室归还物品true为允许 - allowInsteadReturn:true, - //隐藏申请单搜索出来的一次性物品的参考价true隐藏 - hideDiposableGoodsPrice:true, - //一次性物品定义是否启用固定条码功能，为true:一次性物品定义界面：1）显示打印固定条码按钮2）显示固定条码3）显示是否使用固定条码选项 - isInitiateDisposableGoodsFixedBarcode:true, - //是否统计一次性物品发放数量（年度消毒供应中心工作是报表true:统计一次性物品发放数量 - statisticDisposableGoodsSendAmount:true, - //是否隐藏灭菌管理-外部代理灭菌里的申请人(只有为true时才隐藏) - hideCssdForeignProxyDisinfectionApplicant:true, - //发货界面是否启用保存并打印按钮，true为启用 - enableSaveAndPrintWhenInvoice:true, - //科室申领列表是否显示当天已终止的申请单，true为显示 - isShowEndedGoodsApplication:true, - //是否允许外来器械包部分发货，true为允许 - allowPartlyInvoiceForeignTousse:true, - //回收人默认用登录用户true默认 - recyclingUserDefault:true, - //回收界面回收人默认是否默认为上一次回收的回收人，true为默认 - recyclePageRecyclingUserDefaultLastRecyclingUser:true, - //回收界面清点人默认为当前登录人，false为不默认 - recyclePageCheckUserDefaultCurrentUser:false, - //回收界面清点 人默认为上一次回收的清点人，true为是 - recyclePageOperatorDefaultLastOperator:true, - //灭菌员是否扫描条码录入灭菌员信息 - sterilizationScanUser:true, - //PDA上启用借物 - enablePDABorrowModule:true, - //在器械包信息列表中，是否显示签收项 - showSignedItems:true, - //待回收列表，扫描没有回收申请单的科室，是否新建回收申请单，true为新建 - newRecyclingApplicationWhenScanNoApplicationDepart:true, - //灭菌装载是否启用首尾条码扫描，true为启用 - enableBeginEndBarcodeScan:true, - //篮筐名称右侧是否显示放大镜图标 - showBasketLoadMaterialAmount:true, - //回收时自动加载清洗装载状态的篮筐 - loadWashLoadingStatusBasketsWhenRecycling:true, - //当有丢失报损时允许不补充材料即可装配 - allowPackingWhenUnSupplementMaterial:true, - //保存并新建回收时自动加载上次的清洗篮筐 - loadWashBasketsAfterSaveAndCreateNewRecyclingRecord:true, - //科室申领界面隐藏器械包价格:true为隐藏 - hideToussePriceColumn:true, - //科室申领隐藏一次性物品价格true为隐藏 - hideDisposablePriceColumn:true, - //按包统计显示消毒物品true按包 - showDisinfectionByPackage:true, - //科室申请列表是否显示当天已终止的申请单true为显示 - isShowEndeGoodsApplication: true, - //在器械包视图显示包装类型、灭菌程序、所属任务组，true,显示 - showTaskGroupAndPackageTypeAndSterilingMethod: true, - //添加回收申请是否加载申领模板true:显示 - isLoadApplyTemplateForAddRecycleRecord: true, - //启用根据科室加载模板true:是 - isOpenLoadTemplateByUnit: true, - //回收界面添加质量检测记录，:true可以添加 - recycleAddQualityMonitoring: true, - //是否禁用使用记录快速回收，true为禁用 - disableUseRecordQuickRecycling: true, - //是否禁用科室同步 - hiddenOrgunitSyncButton: true, - //是否禁用人员同步 - hiddenUserSyncButton: true, +var sstsConfig = { // 回收时科室显示结算科室 showSettleAccountsDepartInRecycling : false, // 审核器械包必须入篮筐（一级供应室） - mustScanBasketForTousseReview : true, + mustScanBasketForTousseReview : false, // 审核器械包必须入篮筐（二级供应室） mustScanBasketForTousseReviewOf2ndSupplyRoom : false, // 申请表单的类型：1 ： 通用申请单（组合申请单），2：分开的申请单 applicationFormType : 1, //在界面上是否隐藏一次性物品的包装规格信息 - //hidePackageSpec : true, + hidePackageSpec : false, // 申请界面是否显示器械包或消毒物品的的单位 showTousseUnitColumn : true, // 条码类型：1：一维码， 2：二维码 @@ -140,17 +42,17 @@ //使用记录模块的使用记录登记表单，洗手护士输入框是否为空 useRecordWashHandNurseAllowBlank : true, //审核界面，审核人是否不能为空。 - reviewPageReviewerNotEmpty : false, + reviewPageReviewerNotEmpty : true, //自定义装配后是否保留装配数量 - packAmountProcessTypeInDirectPackingView: false, + packAmountProcessTypeInDirectPackingView: true, //自定义装配后是否保留灭菌日期 disinfectionDateProcessTypeInDirectPackingView : true, // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个 - useRecordAuditMode : 2, + useRecordAuditMode : 1, hideApplyDepartColumn : false, // 隐藏申请科室 hideSettleDepartColumn : true,// 隐藏结算科室 //回收界面回收人是否强制不能为空 - recyclePageRecyclingUserNotNull :false, + recyclePageRecyclingUserNotNull : true, //回收一键入筐 recycleAllTousseIntoBasket : true, //退出回收模块后不记住回收界面的过滤条件 @@ -167,10 +69,8 @@ printRecyclingConfigFormVersion : 2, //是否显示打印过滤选择框 showPrintFilter: true, - //打印发货单的版本，如果为2则表示批量打印使用分组并下拉菜单 - printInvoiceVersion:2, //清洗筐是否装配完成才能回收 - recycleClassifyBasketAfterPacked : true, + recycleClassifyBasketAfterPacked : false, // 是否显示装配界面的打印按钮 packingView_currentTaskGroup_showPrintBtn: true, //是否启用聚合包功能 @@ -192,10 +92,8 @@ //是否是加强版的“消毒供应中心员工工作量统计报表表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是 strengthenStatisticalWorkload : true, - //是否启用新的年度消毒中心工作量统计报表，true为启用 - enableNewYearWorkloadReport:true, //是否禁用整筐发货 - disableScanBasketInvoice : true, + disableScanBasketInvoice : false, //科室申领中，是否启用打印选中物品 enablePrintSelectedTousseItem : true, //是否显示按器械包分组选择框 @@ -228,23 +126,14 @@ signModeOfPDASignModule:3, //PDA按器械包进行科室签收的版本 departmentSignByTousseVersionForPDA:2, - //是否选择灭菌炉分组 - selectSterilizerGroupInPDA:true, //是否启用外来器械默认申请科室配置 enableForeignTousseApplyDepartment:true, // 外来器械拆包名字样式 splitForeignTousseNameStyle:1, //是否启用自定义回收的篮筐序号。目前就外来器械拆包有用 enableClassifyBasketSequence:true, - //多套外来器械可以入同一个篮筐，拆包下只能入一个 - multiForeignTousseIntoSameBasket:true, //禁用外来器械 disableForeignTousse:false, - //外来器械申请单是否允许申请多套外来器械 - allowApplyMultipleForeignTousse:true, - //是否启用外来器械申请的桌面图标 - //enableForeignTousseApplicationDesktopIcon:true, - desktopShortcutIconsConfig:["外来器械申请","外部代理灭菌"], //禁用一次性物品 disableDisposableGoods:false, //禁用自定义表单 @@ -255,8 +144,6 @@ showDisinfectionByPackage:true, //是否允许部分回收 enablePartRecycle:true, - //回收时允许保存未入筐的消毒包 - recyclingAllowsSaveOfNonBasketDisinfectionTousse:true, //是否启用加急功能 enableUrgentFunction:true, //是否显示设备接口菜单 Index: ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/timer.xml =================================================================== diff -u -r34849 -r34851 --- ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/timer.xml (.../timer.xml) (revision 34849) +++ ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/timer.xml (.../timer.xml) (revision 34851) @@ -3,53 +3,12 @@ - - - - - - - autoWasteOutdateTousseInstances - - - - - - - - - 0 0 1 * * ? - - - - - - - - - - - - - - - - - - - timingAutoSignInvoice - - - - - - - - - 0 0 2 * * ? - - + + + + + + + \ No newline at end of file