Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/print/recyclingDetailPrintConfig.js
===================================================================
diff -u -r32582 -r37198
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/print/recyclingDetailPrintConfig.js (.../recyclingDetailPrintConfig.js) (revision 32582)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/print/recyclingDetailPrintConfig.js (.../recyclingDetailPrintConfig.js) (revision 37198)
@@ -18,12 +18,12 @@
"textOfTousseAmountColumn": "数量", //物品数量列的标题
"amountOfTousseNameAndAmountColumnGroups": 1 //设置物品名称和数量列的数量，即一行显示几种物品
},
- "showDepartGroupColumn": true,
- "departGroups": [
+ "showRecyclingDepartGroupColumn": true,
+ "recyclingDepartGroups": [
{
- "id": 19548918,
- "departGroupName": "东莞儿童医院",
- "showDepartGroupName": "新院总部"
+ "id": 38980389,
+ "recyclingDepartGroupName": "打印回收清单",
+ "showRecyclingDepartGroupName": "新院总部"
}
]
}
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/print/printConfig.js
===================================================================
diff -u -r32582 -r37198
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/print/printConfig.js (.../printConfig.js) (revision 32582)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/print/printConfig.js (.../printConfig.js) (revision 37198)
@@ -166,7 +166,7 @@
// 在器械包和一次性物品不合并打印的情况下，消毒物品打印方式：
// 1：优先与一次性物品合并打印，如果无一次性物品则与器械包合并打印， 2：优先与器械包一起合并打印，如果没有器械包则与一次性物品合并打印 ，3：单独打印
disinfectGoodsPrintMode : 2,
- rowsPerPage : 9,
+ rowsPerPage : 35,
headerContent : [
// 页眉名称
{label : "东莞市儿童医院", dataIndex : '', fontSize : 12, position : ["5","1%","90%",5]},
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/spring/timer.xml
===================================================================
diff -u -r32009 -r37198
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/spring/timer.xml (.../timer.xml) (revision 32009)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/spring/timer.xml (.../timer.xml) (revision 37198)
@@ -23,10 +23,32 @@
+
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js
===================================================================
diff -u -r37052 -r37198
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 37052)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 37198)
@@ -1,6 +1,48 @@
var sstsConfig = {
// 回收时科室显示结算科室
showSettleAccountsDepartInRecycling : false,
+ //外来器械申请单只允许选择已有的外来器械包定义
+ onlySelectExistedForeignTousse : true,
+ //添加超大超重包
+ pageSizeArrayConfig : [['小包'],['中包'],['大包'],['超大包'],['超大超重包']],
+ //增加位置功能
+ haveRinserPosition : true,
+ haveSterilizerPosition : true,
+ //在“科室申领”的“批量打印发货计划”中，点击打印分组后：如果这个分组内的申请单物品已经有打印过就弹出提示框“部分申请单已打印，是否重复打印”。
+ reprintTodayPrintedTousseItem : true,
+ //外来器械在申请和装配增加重量字段
+ foreignTousseAddWeight : true,
+ //生物监测结束时是否需要提示。
+ biologicalMonitoringWarning : true,
+ //发货时针对有植入物的器械包，是否要提示生物监测的情况。即提示该器械包灭菌的灭菌记录的生物监测结果情况。
+ biologicalMonitoringEnable : true,
+ //打开设备接口日志
+ //enableDetailedDeviceInformation : true,
+ //灭菌炉接口，是否采用灭菌开始时间来匹配接口文件的数据，用来匹配接口文件和系统中的灭菌记录的对应关系
+ sterilizaMatchPatternForDate : true,
+ //开启护理质量指标统计报表
+ enableNurseWorkload : true,
+ nursingQualityIndexReportConfiguration : true,
+
+ nursingQualityIndexReportConfiguration:{
+ "compareReportsSettings":{
+ "showDescriptionColumnOfDataIndex":true,
+ "compareColumnsSettingsOfDataIndex":[
+ {"columnName":"numeratorOfRatio","columnTitle":"发生数"},
+ {"columnName":"denorminatorOfRatio","columnTitle":"总数"},
+ {"columnName":"valueOfDataIndex","columnTitle":"指标数值"}
+ ]
+ },
+ "dataIndexsArray":[
+ {"dataIndexNameForDisplay":"无菌物品合格率","dataIndexSource":"复用性灭菌物品合格率"},
+ {"dataIndexNameForDisplay":"清洗器械总件数","dataIndexSource":"器械清洗总件数"},
+ {"dataIndexNameForDisplay":"清洗器械合格率","dataIndexSource":"器械清洗合格率"},
+ {"dataIndexNameForDisplay":"包装合格率","dataIndexSource":"包装合格率"},
+ {"dataIndexNameForDisplay":"湿包发生率","dataIndexSource":"湿包发生率"}
+ ]
+ },
+ //登录进首页后，检查器械材料的库存并弹出库存告警提示
+ enableTousseMaterialStorageAlertWindow : false,
// 审核器械包必须入篮筐（一级供应室）
mustScanBasketForTousseReview : false,
// 审核器械包必须入篮筐（二级供应室）
@@ -48,7 +90,7 @@
//自定义装配后是否保留灭菌日期
disinfectionDateProcessTypeInDirectPackingView : true,
//使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
- useRecordAuditMode : 3,
+ useRecordAuditMode : 2,
hideApplyDepartColumn : false, // 隐藏申请科室
hideSettleDepartColumn : true,// 隐藏结算科室
//回收界面回收人是否强制不能为空
@@ -104,7 +146,9 @@
//是否在点击批量打印后显示未打印的名单
isShowNoPrintList : true,
//是否显示核对人
- showInvoiceAssistantSender : false,
+ showInvoiceAssistantSender : true,
+ //核对员字段是否必填项
+ invoiceAssistantSenderRequired:true,
//是否显示发货计划下送责任人
showInvoicePersonInCharge : false,
// 聚合包按大包发货
@@ -127,6 +171,8 @@
departmentSignByTousseVersionForPDA:2,
//是否启用外来器械默认申请科室配置
enableForeignTousseApplyDepartment:true,
+ //启动清洗耗材管理
+ //enableRinserConsumptiveMaterialConsumptionFunction : true,
// 外来器械拆包名字样式
splitForeignTousseNameStyle:1,
//是否启用自定义回收的篮筐序号。目前就外来器械拆包有用
@@ -252,13 +298,11 @@
//PDA端病人使用记录是否启用特殊感染类型
enableSpecialInfectionOfUseRecordWithPDAFunction:true,
//是否启用扫码登录
- enableScanBarcodeLogin:false,
+ //enableScanBarcodeLogin:false,
//丢失报损没有补充也能装配
allowPackingWhenUnSupplementMaterial:true,
//回收丢失报损备注功能
enableRecycleMaterialErrorDamageRemark:true,
- //装配丢失报损备注功能
- enablePackingMaterialErrorDamageRemark:true,
//回收数量与申请数量不一致的回收记录的背景颜色
backgroundColorOfRecyclingRecordWhichRecyclingAmountNotEqualToAppplyAmount : {"greaterThanColor":"#98FB98","lessThanColor":"#87CEEB","greaterAndLessThanColor":"#CC99CC"},
//回收页面扫描物品唯一条码回收时限制只能在对应的申请单进行回收
@@ -272,9 +316,14 @@
enableShowForeignTousseApplicationReportSummaryOfMaterials:true,
//sterilizaMatchPatternForDate:true,
//外来器械申请单统计报表扩展列配置
-extendedColumnConfigOfForeignTousseApplicationReport:["receiveMan"," returnMan","returnTime","returneeOfSupplier"],
+extendedColumnConfigOfForeignTousseApplicationReport:["receiveMan"," returnMan","returnTime","AccountDepart"],
+departColumnConfigOfForeignTousseApplicationReport:{"columnName":"病人所属科室","fieldName":"patientArea"},
//未进行确认沟通前不隐藏待装配任务
doNotHidePackingTaskBeforeConfirmingCommunication:true,
+//是否启用根据器械包加急合并申请单的功能；
+ enableAccordingTousseIsUrgentToMergeTheApplicationFunction:true,
+//是否启用急用物品处理周期统计报表
+ enableUrgentNeedGoodsProcessingCycleReport:true,
//提取诊疗号的正则表达式
regExpForExtractingClinicNumber:"[0-9]+"
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js
===================================================================
diff -u -r35830 -r37198
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 35830)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 37198)
@@ -1,12 +1,21 @@
var linkTarget = 'mainFrame';
var singleClickExpandTree=true;
+var viewport = '';
//是否禁用虚拟篮筐(未启用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 hasForeignTousseSizeSetting = false;
+if(sstsConfig.hasOwnProperty('foreignTousseSizeSetting')){
+ hasForeignTousseSizeSetting = true;
+}
+var enableOperatingRoomInstrumentSetUsageAndApportionmentExpenseReport = false;
+if(sstsConfig.hasOwnProperty('enableOperatingRoomInstrumentSetUsageAndApportionmentExpenseReport') && sstsConfig.enableOperatingRoomInstrumentSetUsageAndApportionmentExpenseReport){
+ enableOperatingRoomInstrumentSetUsageAndApportionmentExpenseReport = true;
+}
var isDeviceMaintenanceCus = false;
if(sstsConfig.hasOwnProperty('isDeviceMaintenanceCus') && sstsConfig.isDeviceMaintenanceCus){
isDeviceMaintenanceCus = true;
@@ -26,7 +35,9 @@
}
}
-DisinfectsystemTreeData =[{
+//高级视图-消毒供应管理树型目录菜单数组(更换为数组格式,以便于方便以后有新菜单需求插入到中间)
+var DisinfectsystemTreeData = [];
+DisinfectsystemTreeData.push({
text:"科室申领",
singleClickExpand:singleClickExpandTree,
hidden:SSTS_RecycApplication_Folder,
@@ -39,7 +50,8 @@
{hidden :SSTS_Invoice_Sign,text:"物品签收",leaf:true}
]
-},{
+});
+DisinfectsystemTreeData.push({
text:"回收清点",
singleClickExpand:singleClickExpandTree,
hidden:SSTS_RecycRecord_Menu,
@@ -53,88 +65,109 @@
}},
{hidden :SSTS_RecycRecord_Menu,text:"器械交接",href:WWWROOT+'/disinfectsystem/recycle/tousseTransition/tousseTransitionView.jsp',hrefTarget:linkTarget,leaf:true}
]
-},{
+});
+DisinfectsystemTreeData.push({
text:"回收分类",
singleClickExpand:singleClickExpandTree,
hidden : true,
children:[
{hidden :true,text:"器械分类记录",href:WWWROOT+'/disinfectsystem/becleanitem/becleanitem.jsp',hrefTarget:linkTarget,leaf:true}
]
-},{
+});
+DisinfectsystemTreeData.push({
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] = {
+//装配菜单位于消毒供应管理的索引位置
+var packingMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length;
+DisinfectsystemTreeData.push({
text:"装配管理",
singleClickExpand:singleClickExpandTree,
hidden:SSTS_Packing_Manager,
children:[]
-};
-
-DisinfectsystemTreeData[5] = {
- text:"审核打包",
+});
+var reviewViewText;
+var reviewViewText2;
+if(sstsConfig.nameSchemeOfReviewModule == 2){
+ reviewViewText = "包装管理";
+ reviewViewText2 = "包装";
+}else{
+ reviewViewText = "审核打包";
+ reviewViewText2 = "审核";
+}
+//审核菜单位于消毒供应管理的索引位置
+var reviewMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length;
+DisinfectsystemTreeData.push({
+ text:reviewViewText,
singleClickExpand:singleClickExpandTree,
hidden:SSTS_Tousse_Review_Manager,
children:[]
-};
+});
-DisinfectsystemTreeData[6] = {
+//灭菌菜单位于消毒供应管理的索引位置
+var sterilizationMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length;
+DisinfectsystemTreeData.push({
text:"灭菌管理",
singleClickExpand:singleClickExpandTree,
hidden:SSTS_Sterilization_Manager,
children:[
]
-};
-DisinfectsystemTreeData[7] = {
+});
+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},
{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/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] = {
+DisinfectsystemTreeData.push({
text:"使用记录",
singleClickExpand:singleClickExpandTree,
- hidden:SSTS_UseRecord_Menu,
+ hidden:SSTS_UseRecord_Menu && SSTS_DepartmentUseRecord_Menu,
children:[
- {hidden :SSTS_UseRecord_Menu,text:"使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
+ {hidden :SSTS_UseRecord_Menu,text:sstsConfig.enableDepartmentUseRecord ? "病人使用记录" : "使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_DepartmentUseRecord_Menu,text:"科室使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?departmentUseRecord=true',hrefTarget:linkTarget,leaf:true}
]
-};
+});
-DisinfectsystemTreeData[9] = {
+DisinfectsystemTreeData.push({
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] = {
+DisinfectsystemTreeData.push({
text:"满意度调查",
singleClickExpand:singleClickExpandTree,
hidden:SSTS_SatisfactionSurvey_Menu,
@@ -144,8 +177,8 @@
{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] = {
+});
+DisinfectsystemTreeData.push({
text:"运作监控管理",
singleClickExpand:singleClickExpandTree,
hidden:SSTS_supplyRoomOperate_View,
@@ -154,41 +187,51 @@
{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}
- ]
- };
-DisinfectsystemTreeData[14] = {
- text:"收费记录管理",
- singleClickExpand:singleClickExpandTree,
- hidden:SSTS_chargeRecordManage_MENU,
- children:[
- {hidden :SSTS_chargeRecordManage_MENU,text:"收费记录管理",href:WWWROOT+'/disinfectsystem/chargeRecord/chargeRecord.jsp',hrefTarget:linkTarget,leaf:true}
- ]
- };
-DisinfectsystemTreeData[15] = {
- text:"库位管理",
- singleClickExpand:singleClickExpandTree,
- hidden:SSTS_storageLocationManager && SSTS_storageLocationLook && SSTS_tousseAccess,
- children:[
- {hidden :SSTS_storageLocationManager,text:"库位管理",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationManageView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :SSTS_storageLocationLook,text:"库存查看",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationLookView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :SSTS_tousseAccess,text:"物品存取",href:WWWROOT+'/disinfectsystem/storageLocationManage/goodsAccess.jsp',hrefTarget:linkTarget,leaf:true}
- ]
- };
+});
+DisinfectsystemTreeData.push({
+ 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.push({
+ text:"培训管理",
+ singleClickExpand:singleClickExpandTree,
+ hidden:SSTS_TrainingManage_Menu,
+ children:[
+ {hidden :SSTS_TrainingManage_Menu,text:"培训管理",href:WWWROOT+'/knowledge/view.do?moduleId=trainingManage',hrefTarget:linkTarget,leaf:true}
+ ]
+});
+DisinfectsystemTreeData.push({
+ text:"收费记录管理",
+ singleClickExpand:singleClickExpandTree,
+ hidden:SSTS_chargeRecordManage_MENU,
+ children:[
+ {hidden :SSTS_chargeRecordManage_MENU,text:"收费记录管理",href:WWWROOT+'/disinfectsystem/chargeRecord/chargeRecord.jsp',hrefTarget:linkTarget,leaf:true}
+ ]
+});
+DisinfectsystemTreeData.push({
+ text:"库位管理",
+ singleClickExpand:singleClickExpandTree,
+ hidden:SSTS_storageLocationManager && SSTS_storageLocationLook && SSTS_tousseAccess,
+ children:[
+ {hidden :SSTS_storageLocationManager,text:"库位管理",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationManageView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_storageLocationLook,text:"库存查看",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationLookView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_tousseAccess,text:"物品存取",href:WWWROOT+'/disinfectsystem/storageLocationManage/goodsAccess.jsp',hrefTarget:linkTarget,leaf:true}
+ ]
+});
+DisinfectsystemTreeData.push({
+ text:"器械维修管理",
+ singleClickExpand:singleClickExpandTree,
+ hidden:!sstsConfig.enableInstrumentRepairManagement,
+ children:[
+ {hidden :false,text:"器械维修记录",href:WWWROOT+'/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.jsp',hrefTarget:linkTarget,leaf:true}
+ ]
+});
+
+/**设置"装配管理"菜单的下一级子菜单(各任务组装配、自定义装配、历史装配记录)、"审核打包"菜单的下一级子菜单(各任务组) begin */
DWREngine.setAsync(false);
PackingTableManager.getAllTaskGroup(setTaskGroup);
function setTaskGroup(taskGroup){
@@ -199,32 +242,43 @@
link1.href = encodeURI(WWWROOT+'/disinfectsystem/packing/packingView.jsp?taskGroup='+taskGroup[i]);
link1.hrefTarget = linkTarget;
link1.leaf = true;
- DisinfectsystemTreeData[4].children[i] = link1;
+ DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[i] = link1;
var link2 = new Object();
link2.hidden = false;
link2.text = taskGroup[i];
link2.href = encodeURI(WWWROOT+'/disinfectsystem/packing/reviewView.jsp?taskGroup='+taskGroup[i]);
link2.hrefTarget = linkTarget;
link2.leaf = true;
- DisinfectsystemTreeData[5].children[i] = link2;
+ DisinfectsystemTreeData[reviewMenuIndexOfDisinfectsystemTree].children[i] = link2;
}
var directPackingLink = new Object();
directPackingLink.hidden = SSTS_CustomPacking_Manager;
directPackingLink.text = '自定义装配';
directPackingLink.href = WWWROOT+'/disinfectsystem/packing/directPacking.jsp';
directPackingLink.hrefTarget = linkTarget;
directPackingLink.leaf = true;
- DisinfectsystemTreeData[4].children[taskGroup.length] = directPackingLink;
+ DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[taskGroup.length] = directPackingLink;
var historyPackingLink = new Object();
historyPackingLink.hidden = SSTS_HistoryPacking_Manager;
historyPackingLink.text = '历史装配记录';
historyPackingLink.href = WWWROOT+'/disinfectsystem/packing/historyPackingView.jsp';
historyPackingLink.hrefTarget = linkTarget;
historyPackingLink.leaf = true;
- DisinfectsystemTreeData[4].children[taskGroup.length+1] = historyPackingLink;
+ DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[taskGroup.length+1] = historyPackingLink;
+
+ var packageListLink = new Object();
+ packageListLink.hidden = SSTS_Tousse_List;
+ packageListLink.text = '包装记录';
+ packageListLink.href = WWWROOT+'/disinfectsystem/packing/packageList.jsp';
+ packageListLink.hrefTarget = linkTarget;
+ packageListLink.leaf = true;
+ DisinfectsystemTreeData[reviewMenuIndexOfDisinfectsystemTree].children[taskGroup.length] = packageListLink;
}
+/**设置"装配管理"菜单的下一级子菜单(各任务组装配、自定义装配、历史装配记录)、"审核打包"菜单的下一级子菜单(各任务组) end */
+
+/**设置"灭菌管理"菜单的下一级子菜单(各灭菌炉组装配、灭菌交接、灭菌物品装载、当天灭菌记录管理、历史灭菌记录管理、代理灭菌管理、外部代理灭菌管理) begin */
DWREngine.setAsync(true);
if(sterilerGroupList.length >0){
for(var i=0;i