Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r15498 -r15579
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 15498)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 15579)
@@ -154,6 +154,35 @@
SSTS_RecycApplication_Create =true;
}
+
+//一次性物品申请权限
+var SSTS_DisposableGoods_Create = true;
+
+SSTS_DisposableGoods_Create = false;
+if('${isBeApplication}'=='false'){
+ SSTS_DisposableGoods_Create =true;
+}
+
+
+//器械包申请权限
+var SSTS_PACKAGE_Create = true;
+
+SSTS_PACKAGE_Create = false;
+if('${isBeApplication}'=='false'){
+ SSTS_PACKAGE_Create =true;
+}
+
+
+//消毒物品申请权限
+var SSTS_Disinfection_Create = true;
+
+SSTS_Disinfection_Create = false;
+if('${isBeApplication}'=='false'){
+ SSTS_Disinfection_Create =true;
+}
+
+
+
var SSTS_RecycApplication_Update = true;
SSTS_RecycApplication_Update = false;
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r15547 -r15579
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 15547)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 15579)
@@ -3269,10 +3269,11 @@
return inoviceButton+returnButton;
}
},
- {header : "预回收人",width : 65 * fontSizeScale,dataIndex : 'prepareRecycleOperator'},
- {header : "预回收确认人",width : 85 * fontSizeScale,dataIndex : 'prepareRecycleComfirmor'},
- {header : "预回收时间",width : 130 * fontSizeScale,dataIndex : 'prepareRecycleDateTime'}
-
+ {header : "预回收人",width : 65 * fontSizeScale,dataIndex : 'prepareRecycleOperator',hidden : sstsConfig.hiddenRecyclingPeople},
+ {header : "预回收确认人",width : 85 * fontSizeScale,dataIndex : 'prepareRecycleComfirmor',hidden : sstsConfig.hiddenPreRecyclingConfirmPeople},
+ {header : "预回收时间",width : 130 * fontSizeScale,dataIndex : 'prepareRecycleDateTime',hidden : sstsConfig.hiddenPreRecyclingTime},
+ {header : "回收时间",width : 130 * fontSizeScale,dataIndex : 'recyclingTime',hidden : !sstsConfig.showRecyclingTime}
+
];
var readerDetail = [
@@ -3301,7 +3302,8 @@
{name : 'invoiceStatus'},
{name : 'prepareRecycleOperator'},
{name : 'prepareRecycleComfirmor'},
- {name : 'prepareRecycleDateTime'}
+ {name : 'prepareRecycleDateTime'},
+ {name : 'recyclingTime'},
];
var filters = new Ext.grid.GridFilters({
@@ -3451,10 +3453,10 @@
openApplication("",comboApplicationForm);
}
},{
- text : '申请器械包',
+ text : sstsConfig.packageName || '申请器械包',
iconCls : 'btn_ext_add_tousse',
- tooltip : '申请器械包',
- hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
+ tooltip : sstsConfig.packageName || '申请器械包',
+ hidden : SSTS_PACKAGE_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
handler : function() {
invoicePlanForTousseType = invoicePlanForTousseType_Tousse;//器械包
//新打开申请对话框时,相关参数调整及清除
@@ -3468,7 +3470,7 @@
text : '申请一次性物品',
iconCls : 'btn_ext_add_tousse',
tooltip : '申请一次性物品',
- hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
+ hidden : SSTS_DisposableGoods_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
handler : function() {
invoicePlanForTousseType = invoicePlanForTousseType_Diposable;//一次性物品
//新打开申请对话框时,相关参数调整及清除
@@ -3482,7 +3484,7 @@
text : '申请消毒物品',
tooltip : '申请内容物不固定的消毒物品',
iconCls : 'btn_ext_add_foreignTousse',
- hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
+ hidden : SSTS_Disinfection_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
handler : function() {
invoicePlanForTousseType = invoicePlanForTousseType_Tousse;//消毒物品也属器械包的类型
//新打开申请对话框时,相关参数调整及清除
Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js
===================================================================
diff -u -r15511 -r15579
--- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js (.../config.js) (revision 15511)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js (.../config.js) (revision 15579)
@@ -51,5 +51,15 @@
//打印发货单的版本,如果为2,则表示批量打印使用分组打印方式,并有下拉菜单,目前除配置为2以外的其他值都使用以前的单科室的多单打印
printInvoiceVersion:2,
//回收人默认用登录用户
- recyclingUserDefault:false
+ recyclingUserDefault:false,
+ //申请器械包为按钮【申请复用物品】(江门市人民医院)
+ packageName:'申请复用物品',
+ //显示预回收时间
+ hiddenPreRecyclingTime : true,
+ //显示预回收人
+ hiddenRecyclingPeople : true,
+ //显示预回收确认人
+ hiddenPreRecyclingConfirmPeople : true,
+ //显示回收时间
+ showRecyclingTime : true
}
\ No newline at end of file
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r15564 -r15579
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 15564)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 15579)
@@ -5,6 +5,9 @@
+
+
+