Index: ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/print/printConfig.js =================================================================== diff -u -r34258 -r34267 --- ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/print/printConfig.js (.../printConfig.js) (revision 34258) +++ ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/print/printConfig.js (.../printConfig.js) (revision 34267) @@ -253,9 +253,9 @@ var batchPrintInvoicesConfig = { headerFooter : [ // 页眉名称 - {label : "大连中心医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, + {label : "大连中心医院", dataIndex : '', fontSize : 12, 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]}, Index: ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/menu/menuconfigure.js =================================================================== diff -u -r33176 -r34267 --- ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 33176) +++ ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34267) @@ -141,8 +141,7 @@ 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/departSatisfyDetailView.jsp',hrefTarget:linkTarget,leaf:true} + {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true} ] }; DisinfectsystemTreeData[11] = { @@ -575,9 +574,9 @@ 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.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 :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}, @@ -643,17 +642,17 @@ {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/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_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/dlzxyy/config.js =================================================================== diff -u -r33152 -r34267 --- ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/config.js (.../config.js) (revision 33152) +++ ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/config.js (.../config.js) (revision 34267) @@ -1,4 +1,4 @@ -var sstsConfig = { +var sstsConfig = { // 回收时科室显示结算科室 showSettleAccountsDepartInRecycling : false, // 审核器械包必须入篮筐（一级供应室） @@ -8,13 +8,11 @@ // 申请表单的类型：1 ： 通用申请单（组合申请单），2：分开的申请单 applicationFormType : 1, //在界面上是否隐藏一次性物品的包装规格信息 - hidePackageSpec : false, - // 申请界面是否显示器械包或消毒物品的的单位 - showTousseUnitColumn : true, + hidePackageSpec : false, // 条码类型：1：一维码， 2：二维码 barcodeType : 1, // 申请器械包时是否自动归还待归还物品 - autoReturnTousse : false, + autoReturnTousse : true, // 是否隐藏进入审核列表按钮 hideEnterReviewListButton : false, // 是否自动补全用户名 @@ -23,20 +21,16 @@ autoFillUserNameLength:6, //装配界面的配包人是否默认为上一次装配的配包人 packingPageOperatorDefaultLastOperator : true, - //审核界面的审核人是否默认为上一次审核的审核人 - reviewPageReviewerDefaultLastReviewer : true, // 是否支持部分终止申请单中的物品 enableTerminatePartOfApplication : true, //安卓上,录入灭菌及查看灭菌记录界面,单独添加的器械包组默认展开 expandAddTousseGroupInAndroidSterileView : true, //限制入库单填写的一次性物品为能申领的物品 restrictGodownEntryDiposableGoods : true, - //提交申请单前显示申请的物品清单 - showAppliedGoodsBeforeSubmit : false, //是否审核时打印标签，为true时点审核按钮才打印标签；否则在装配时打印标签 printLabelWhenReviewing : false, //在材料管理界面是否启用“是否统计工作量”属性 - enableStatisticWorkLoad : true, + // enableStatisticWorkLoad : true, //使用记录模块的使用记录登记表单，巡回护士输入框是否为空 useRecordCircuitNurseAllowBlank : true, //使用记录模块的使用记录登记表单，洗手护士输入框是否为空 @@ -48,15 +42,15 @@ //自定义装配后是否保留灭菌日期 disinfectionDateProcessTypeInDirectPackingView : true, // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个 - useRecordAuditMode : 1, + useRecordAuditMode : 3, hideApplyDepartColumn : false, // 隐藏申请科室 hideSettleDepartColumn : true,// 隐藏结算科室 //回收界面回收人是否强制不能为空 recyclePageRecyclingUserNotNull : true, //回收一键入筐 recycleAllTousseIntoBasket : true, //退出回收模块后不记住回收界面的过滤条件 - notRememberFilterConditionWhenExitRecyclingModule:true, + notRememberFilterConditionWhenExitRecyclingModule:false, //是否显示按照时间查询 showTimeSearch : true, //科室申领时间过滤,开始日期是否为当天 @@ -70,34 +64,68 @@ //是否显示打印过滤选择框 showPrintFilter: true, //清洗筐是否装配完成才能回收 - recycleClassifyBasketAfterPacked : false, + recycleClassifyBasketAfterPacked : true, // 是否显示装配界面的打印按钮 packingView_currentTaskGroup_showPrintBtn: true, - //是否启用聚合包功能 - enableComboTousse: true, - //如果配置为不需要在单位前加上最小申请数量时,则用原单位,否则加上最小申请数量与斜杠 - notNeedMinApplyAmountBeforeUnit : true, //科室申领列表自动刷新间隔时间(单位:秒) autoRefreshApplicationDataIntervalSeconds : 600, //在灭菌视图界面是否显示“生物监测的状态”属性 showBiologicalMonitoringStatus : true, - //是否显示辅助发货按钮 - showAuxiliaryInvoiceBtn : true, //公司名称 "dingxiang"显示主页显示丁香的logo companyName : "dingxiang", //是否显示包实例科室(待灭菌与待灭菌装载的表格) showDepartOfTousseInstanceSterile : true, - //对申请单的物品申请数量是否启用干预功能 - enableInterfereApplyAmount : true, - - //是否是加强版的“消毒供应中心员工工作量统计报表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是 - strengthenStatisticalWorkload : true, + //是否是加强版的“消毒供应中心工作量统计报表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是 + //strengthenStatisticalWorkload : true, //是否禁用整筐发货 disableScanBasketInvoice : false, //科室申领中，是否启用打印选中物品 enablePrintSelectedTousseItem : true, //是否显示按器械包分组选择框 isShowTousseGroup : true, + //是否显示辅助发货按钮 + showAuxiliaryInvoiceBtn: true, + //外来器械申请单在回收页面被查阅过后允许修改 + enableModifyForeignTousseApplicationAfterViewedlnRecyclingModule: true, + //打印标识牌时,是否在单独的一行打印标识牌的编号 + printIdNumberOnSeperateRow: true, + //启用打印待接收外来器械包功能 + enableTheFunctionOfPrintingOfForeignTousseToBeReceived: true, + //不补充允许装配 + allowPackingWhenUnSupplementMaterial: true, + //装配时显示灭菌炉与炉次 + showSterilizer: true, + //装配时显示灭菌人 + showSterileField: true, + //PDA预回收 + prepareRecycleVersion: 1, + //第一次登录是否强制修改密码 + needForceModifyPwdWhenFirstTime: true, + //用户登录成功后如果检查密码不符合复杂度要求，则强制用户修改密码 + orceUserChangePwdWhenNotMeetPwdComplexityReq: true, + //设置密码的复杂度参数 + needBeStrongPwdWhenModifyPwd: + {'minPwdLength':8, + 'containLetter':true, + 'containUppercaseLetter':false, + 'containUpperCaseLetter':false, + 'containSpecialChar':false, + 'containNumber':true, + 'passwordNotContainLoginName':false, + 'passwordComplexityReq1':true, + 'windowsPasswordComplexityReq':false}, + //聚合包功能 + enableComboTousse: true, + //聚合包按大包发货 + comboTousseSendByWrapperTousse: true, + //待回收页面是否启用器械包分组过滤 + enableTousseGroupFilterlnAwaitRecycling: true, + //外来器械申请单是否允许申请多套外来器械 + allowApplyMultipleForeignTousse: true, + //辅助发货的物品类型 + auxiliaryInvoiceTousseTypes: "敷料包,普通器械包,外来器械包,外部代理灭菌包,消毒物品", + //桌面快捷图标配置 + desktopShortcutIconsConfig:["外来器械申请","外部代理灭菌"], //装配界面,扫描清洗篮筐后是否默认自动勾选篮筐内的器械包 packingView_autoSelectTousseWhenScanBasket: true, //外部代理灭菌装配时是否必须入篮筐 @@ -108,12 +136,6 @@ showInvoiceAssistantSender : false, //是否显示发货计划下送责任人 showInvoicePersonInCharge : false, - // 聚合包按大包发货 - comboTousseSendByWrapperTousse: true, - //是否允许回收数量减小的部分超过待装配数量 - allowDecreaseRecyclingAmountGreatUnPackingAmount : true, - //回收时，申请数量与回收数量不一致，是否要确认 - confirmRecyclingAmount:false, //器械包定义是否批量修改 tousseDefinitionCanBatchEdit : true, //禁用基数限制 @@ -132,16 +154,12 @@ splitForeignTousseNameStyle:1, //是否启用自定义回收的篮筐序号。目前就外来器械拆包有用 enableClassifyBasketSequence:true, - //禁用外来器械 - disableForeignTousse:false, - //禁用一次性物品 - disableDisposableGoods:true, - //禁用自定义表单 - closeFormDefinition:true, - //禁用培训管理 - hideTrainingManage:true, - //包装区工作量及不合格率月报，按包统计并显示消毒物品 - showDisinfectionByPackage:true, //是否允许部分回收 - enablePartRecycle:true + enablePartRecycle:true, + //隐藏预回收时间 + hiddenPreRecyclingTime:true, + //隐藏预回收人 + hiddenRecyclingPeople:true, + //隐藏预回收确认人 + hiddenPreRecyclingConfirmPeople:true } \ No newline at end of file