Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r34674 -r34727
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 34674)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 34727)
@@ -730,6 +730,8 @@
+
+
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r34724 -r34727
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 34724)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 34727)
@@ -1032,7 +1032,7 @@
{hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFlow_Hidden_Manager,text:"流程定义管理",href:WWWROOT+'/systemmanage/workFlow/workFlow.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFloAuthorization_Hidden_Manager,text:"流程审批权限代理配置",href:WWWROOT+'/systemmanage/workFlow/workFlowAuthorize/workFlowApprovalAuthorization.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_UsedDoctor_manager,text:"常用医生设置",href:WWWROOT+'/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :!sstsConfig.enableTousseOfExclusiveDoctorFunction,text:"医生专用器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_TousseExclusiveDoctor_Menu,text:"医生专用器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :!(!SSTS_Handover_manager && sstsConfig.enableHandoverModule),text:"交接模块管理",href:WWWROOT+'/disinfectsystem/basedatamanager/handover/handoverView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_ResponsibilityPart_manager,text:"责任环节",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=responsibilityPart',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_DefectiveMessageRegisterType_manager,text:"缺陷信息登记类型分组",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=defectiveMessageRegisterType',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorView.js
===================================================================
diff -u -r34720 -r34727
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorView.js (.../tousseExclusiveDoctorView.js) (revision 34720)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorView.js (.../tousseExclusiveDoctorView.js) (revision 34727)
@@ -2,10 +2,21 @@
var doctorGrid;
var pageSize = 20;
//修改器械包专属医生
-function modify(v, data) {
- showAddOrEditWindow(data);
+function modify() {
+ setTimeout(function () {
+ var records = doctorGrid.getSelectionModel().getSelection();
+ showAddOrEditWindow(records[0].data);
+ }, 300);
}
+function renderLink(v, p, record) {
+ if (SSTS_TousseExclusiveDoctor_manager) {
+ return v;
+ } else {
+ return "" + v + "";
+ }
+}
+
//更改分页按钮的状态
function changePageTool() {
var pageNowForList = Ext4.getCmp('pageNowForList').getValue();
@@ -31,18 +42,20 @@
var columns = [
{ header: "tousseDefinitionId", dataIndex: 'tousseDefinitionId', hidden: true },
{ header: "userId", dataIndex: 'userId', hidden: true },
- { header: "器械包名称", dataIndex: 'tousseName', width: 150, renderer: modifyRecord },
+ { header: "器械包名称", dataIndex: 'tousseName', width: 150, renderer: renderLink },
{ header: "医生名称", dataIndex: 'userName', width: document.body.clientWidth - 200, sortable: false }
];
var tbar = [{
text: '添加',
iconCls: 'btn_ext_application_add',
+ hidden: SSTS_TousseExclusiveDoctor_manager,
handler: function () {
showAddOrEditWindow();
}
}, {
text: '修改',
iconCls: 'btn_ext_application_edit',
+ hidden: SSTS_TousseExclusiveDoctor_manager,
handler: function () {
var selectedRecords = doctorGrid.getSelectionModel().getSelection();
var selectedCount = doctorGrid.getSelectionModel().getCount();
@@ -57,6 +70,7 @@
}, '-', {
text: '删除',
iconCls: 'btn_ext_application_del',
+ hidden: SSTS_TousseExclusiveDoctor_manager,
handler: function () {
deleteConfig(doctorGrid);
}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorView.jsp
===================================================================
diff -u -r34720 -r34727
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorView.jsp (.../tousseExclusiveDoctorView.jsp) (revision 34720)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorView.jsp (.../tousseExclusiveDoctorView.jsp) (revision 34727)
@@ -52,6 +52,17 @@
width: 20px;
}
+
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r34698 -r34727
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 34698)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 34727)
@@ -2361,6 +2361,16 @@
/**
+ * 《医生专用器械包配置》权限
+ */
+ var SSTS_TousseExclusiveDoctor_Menu = true;
+
+ if (!notInWhiteList(sstsConfig, 'enableTousseOfExclusiveDoctorFunction')) {
+ SSTS_TousseExclusiveDoctor_Menu = false;
+ }
+
+
+/**
* 《自定义报表》菜单
*/
var SSTS_CustomizeReport = true;