Index: ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/config.js =================================================================== diff -u -r27538 -r27976 --- ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/config.js (.../config.js) (revision 27538) +++ ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/config.js (.../config.js) (revision 27976) @@ -1,22 +1,18 @@ var sstsConfig = { // 禁用标识牌功能 - disableIdCard : true, + disableIdCard : false, // 回收时科室显示结算科室 - //showSettleAccountsDepartInRecycling : true, + showSettleAccountsDepartInRecycling : false, // 审核器械包必须入篮筐(一级供应室) mustScanBasketForTousseReview : false, // 审核器械包必须入篮筐(二级供应室) mustScanBasketForTousseReviewOf2ndSupplyRoom : false, // 申请表单的类型:1 : 通用申请单(组合申请单),2:分开的申请单 - applicationFormType : 1, - //在界面上是否隐藏一次性物品的包装规格信息 - hidePackageSpec : false, - // 申请界面是否显示器械包或消毒物品的的单位 - showTousseUnitColumn : true, + applicationFormType : 2, // 条码类型:1:一维码, 2:二维码 barcodeType : 1, // 申请器械包时是否自动归还待归还物品 - autoReturnTousse : false, + autoReturnTousse : true, // 打印发货计划设置页的版本,默认为1 printRecyclingConfigFormVersion : 2, // 是否显示科室分组选择框 @@ -33,8 +29,8 @@ autoFillUserName:true, // 自动补全用户名的长度 autoFillUserNameLength:4, - //PDA的签收模式,值为3:支持发货单签收和器械包签收两种模式。点击签收或科室签收模块名称时,弹出菜单让用户选择其中一种后,进入到模块 - signModeOfPDASignModule:3, + // PDA上是否启用器械包签收功能 + //enablePDATousseSign : true, //装配界面的配包人是否默认为上一次装配的配包人 packingPageOperatorDefaultLastOperator : true, //审核界面的审核人是否默认为上一次审核的审核人 @@ -43,20 +39,10 @@ enableTerminatePartOfApplication : true, //安卓上,录入灭菌及查看灭菌记录界面,单独添加的器械包组默认展开 expandAddTousseGroupInAndroidSterileView : true, - //限制入库单填写的一次性物品为能申领的物品 - restrictGodownEntryDiposableGoods : true, - //提交申请单前显示申请的物品清单 - showAppliedGoodsBeforeSubmit : false, - //是否审核时打印标签,为true时点审核按钮才打印标签;否则在装配时打印标签 - printLabelWhenReviewing : false, - //在材料管理界面是否启用“是否统计工作量”属性 - enableStatisticWorkLoad : true, //使用记录模块的使用记录登记表单,巡回护士输入框是否为空 useRecordCircuitNurseAllowBlank : true, //使用记录模块的使用记录登记表单,洗手护士输入框是否为空 useRecordWashHandNurseAllowBlank : true, - //审核界面,审核人是否不能为空。 - reviewPageReviewerNotEmpty : true, //自定义装配后是否保留灭菌日期 disinfectionDateProcessTypeInDirectPackingView : true, // 使用记录审核方式, 1: 审核和转换按钮分开; 2:审核和转换按钮合并为1个 @@ -66,13 +52,9 @@ hideApplyDepartColumn : false, // 隐藏申请科室 hideSettleDepartColumn : true,// 隐藏结算科室 //回收界面回收人是否强制不能为空 - recyclePageRecyclingUserNotNull : true, + recyclePageRecyclingUserNotNull : false, //清洗筐是否装配完成才能回收 recycleClassifyBasketAfterPacked : false, - //是否启用聚合包功能 - enableComboTousse: true, - //如果配置为不需要在单位前加上最小申请数量时,则用原单位,否则加上最小申请数量与斜杠 - notNeedMinApplyAmountBeforeUnit : true, //科室申领列表自动刷新间隔时间(单位:秒) autoRefreshApplicationDataIntervalSeconds : 600, //在灭菌视图界面是否显示“生物监测的状态”属性 @@ -89,16 +71,24 @@ disableScanBasketInvoice : false, //科室申领中,是否启用打印选中物品 enablePrintSelectedTousseItem : true, - //是否在点击批量打印后显示未打印的名单 - isShowNoPrintList : true, //是否显示核对人 showInvoiceAssistantSender : false, //是否显示发货计划下送责任人 showInvoicePersonInCharge : false, - // 聚合包按大包发货 - comboTousseSendByWrapperTousse: true, //是否允许回收数量减小的部分超过待装配数量 allowDecreaseRecyclingAmountGreatUnPackingAmount : true, - //禁用基数限制 - disableCardinalNumLimit:true + //是否启用“外来器械申请”的桌面图标 + enableForeignTousseApplicationDesktopIcon: true, + //外部代理灭菌装配时是否必须入篮筐 + mustScanBasketForForeignProxy : false, + //是否在个人桌面显示外部代理灭菌的图标 + showForeignProxySterilizationDesktopIcon: true, + //科室申领打开申请单,是否显示回收数量列 + isShowRecyclingAmount:true, + //使用记录审核方式 + useRecordAuditMode:3, + //是否根据科室加载模板 + isOpenLoadTemplateByUnit:true, + //使用记录合并,根据科室进行合并 + useRecordConvertRecyclingApplicationMergeRegular:"depart" } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/menu/menuconfigure.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/menu/menuconfigure.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/menu/menuconfigure.js (revision 27976) @@ -0,0 +1,755 @@ +var linkTarget = 'mainFrame'; +var singleClickExpandTree=true; +//是否禁用虚拟篮筐(未启用disableLoadToVirtualBasket配置项目或该配置项的值为true时,则禁用,否则启用虚拟篮筐) +var disableLoadToVirtualBasket = true; +var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980'; +var qualityMonthViewName = "质量监测项统计月报"; +if(sstsConfig.hasOwnProperty('isQualityMonthViewSpecial') && sstsConfig.isQualityMonthViewSpecial){ + qualityMonthViewName = "质量监测项统计分析报表"; +} +var isDeviceMaintenanceCus = false; +if(sstsConfig.hasOwnProperty('isDeviceMaintenanceCus') && sstsConfig.isDeviceMaintenanceCus){ + isDeviceMaintenanceCus = true; +} +if(sstsConfig.hasOwnProperty('disableLoadToVirtualBasket') && !sstsConfig.disableLoadToVirtualBasket){ + disableLoadToVirtualBasket = false; +} +var hideDeviceMaintenaceReport = true; +var hideDeviceMaintenaceCusReport = true; +if(SSTS_DeviceMaintenanceReport == false){ + if(isDeviceMaintenanceCus == true){ + hideDeviceMaintenaceReport = true; + hideDeviceMaintenaceCusReport = false; + }else{ + hideDeviceMaintenaceReport = false; + hideDeviceMaintenaceCusReport = true; + } +} + +DisinfectsystemTreeData =[{ + text:"科室申领", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_RecycApplication_Folder, + children:[ + {hidden :SSTS_RecycApplication_Menu,text:"全部申请单",href:WWWROOT+'/disinfectsystem/recyclingApplication/goodsApplicationView.jsp?listType=all',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Application_ShowTodoOnly_Menu,text:"待处理申请单",href:WWWROOT+'/disinfectsystem/recyclingApplication/goodsApplicationView.jsp?listType=todoList',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ForeignTousseApplication_Menu,text:"外来器械包申请",href:WWWROOT+'/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp?borrowing=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_borrow_Menu,text:"借物单管理",href:WWWROOT+'/disinfectsystem/borrow/borrowingTousseView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_borrowRecord_Menu,text:"科室互借管理",href:WWWROOT+'/disinfectsystem/borrowRecord/borrowRecordView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Sign,text:"物品签收",leaf:true} + + ] +},{ + text:"回收清点", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_RecycRecord_Menu, + children:[ + {hidden :SSTS_RecycRecord_Menu,text:"回收清点",href:'javascript:void(0);',leaf:true,listeners:{ + click:function(node, e){ + var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980'; + top.recyclingWindow = openFullSizeWindowWithName(url,null,"recyclingWindow"); + return; + } + }}, + {hidden :SSTS_RecycRecord_Menu,text:"器械交接",href:WWWROOT+'/disinfectsystem/recycle/tousseTransition/tousseTransitionView.jsp',hrefTarget:linkTarget,leaf:true} + ] +},{ + text:"回收分类", + singleClickExpand:singleClickExpandTree, + hidden : true, + children:[ + {hidden :true,text:"器械分类记录",href:WWWROOT+'/disinfectsystem/becleanitem/becleanitem.jsp',hrefTarget:linkTarget,leaf:true} + ] +},{ + text:"清洗消毒", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_Wash_Menu, + children:[ + {hidden :SSTS_WashRecord_Menu,text:"清洗消毒记录",href:WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_WashTransitionRecord_Menu,text:"清洗交接记录",href:WWWROOT+'/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.jsp?',hrefTarget:linkTarget,leaf:true} + ] +}]; + +var index = DisinfectsystemTreeData.length; + +DisinfectsystemTreeData[4] = { + text:"装配管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_Packing_Manager, + children:[] +}; + +DisinfectsystemTreeData[5] = { + text:"审核打包", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_Tousse_Review_Manager, + children:[] +}; + +DisinfectsystemTreeData[6] = { + text:"灭菌管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_Sterilization_Manager, + children:[ + + ] +}; +DisinfectsystemTreeData[7] = { + 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 :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}, + {hidden :SSTS_OperationReservationDelivery_Menu,text:"手术预约汇总发货",href:WWWROOT+'/disinfectsystem/invoice/operationReservationMergeInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_CustomDelivery_Manager,text:"自定义发货",href:WWWROOT+'/disinfectsystem/invoice/customInvoiceForm.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Menu,text:"快速发货",href:WWWROOT+'/disinfectsystem/invoice/expressInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Menu,text:"科室发货计划设置",href:WWWROOT+'/disinfectsystem/invoice/invoiceDepartmentView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Menu,text:"发货单管理",href:WWWROOT+'/disinfectsystem/invoice/invoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Menu,text:"材料发货管理",href:WWWROOT+'/disinfectsystem/invoice/materialInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :true,text:"发货单批量打印",href:WWWROOT+'/disinfectsystem/invoice/invoicePrintView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_DeliverGoodsQuqery,text:"发货物品查询",href:WWWROOT+'/disinfectsystem/reportforms/invoiceQueryView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_OperationReservationInvoice,text:"手术排班物品查询",href:WWWROOT+'/disinfectsystem/reportforms/operationReservationInvoiceView.jsp?',hrefTarget:linkTarget,leaf:true} + ] +}; + +DisinfectsystemTreeData[8] = { + text:"使用记录", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_UseRecord_Menu, + children:[ + {hidden :SSTS_UseRecord_Menu,text:"使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true} + ] +}; + +DisinfectsystemTreeData[9] = { + text:"器械包返消", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_TousseReturnDisinfect_Menu, + children:[ + {hidden :SSTS_TousseReturnDisinfect_Menu,text:"器械包返消",href:WWWROOT+'/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_TousseReturnDisinfectionReport,text:"器械包返消统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseReturnDisinfectionView.jsp',hrefTarget:linkTarget,leaf:true} + ] + }; + +DisinfectsystemTreeData[10] = { + text:"满意度调查", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_SatisfactionSurvey_Menu, + 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} + ] +}; +DisinfectsystemTreeData[11] = { + text:"运作监控管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_supplyRoomOperate_View, + children:[ + {hidden :SSTS_supplyRoomOperate_Menu,text:"消毒供应中心运作监控",href:WWWROOT+'/homepage/supplyRoomOperate.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_supplyRoomOperate_Menu,text:"消毒供应中心未完成工作列表",href:WWWROOT+'/homepage/supplyRoomUnfinishedWork.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_TousseOperateCountReport,text:"科室运作监控",href:WWWROOT+'/disinfectsystem/reportforms/tousseOperate.jsp',hrefTarget:linkTarget,leaf:true} + ] +}; +DisinfectsystemTreeData[12] = { + text:"档案管理", + singleClickExpand:singleClickExpandTree, + hidden:(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive || SSTS_StaffArchive_Menu, + children:[ + {hidden :SSTS_StaffArchive_Menu,text:"人员档案管理",href:WWWROOT+'/disinfectsystem/staffArchives/staffArchiveView.jsp',hrefTarget:linkTarget,leaf:true} + ] + }; +DisinfectsystemTreeData[13] = { + text:"培训管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_TrainingManage_Menu, + children:[ + {hidden :SSTS_TrainingManage_Menu,text:"培训管理",href:WWWROOT+'/knowledge/view.do?moduleId=trainingManage',hrefTarget:linkTarget,leaf:true} + ] + }; + +DWREngine.setAsync(false); +PackingTableManager.getAllTaskGroup(setTaskGroup); +function setTaskGroup(taskGroup){ + for(var i=0;i0){ + for(var i=0;i